Merge branch 'master' into 104923-table-empty-state-reprise

.buildkite/scripts/bootstrap.sh

@@ -5,7 +5,7 @@ set -euo pipefail
 source .buildkite/scripts/common/util.sh
 
 echo "--- yarn install and bootstrap"
-yarn kbn bootstrap --verbose
+yarn kbn bootstrap
 
 ###
 ### upload ts-refs-cache artifacts as quickly as possible so they are available for download

.buildkite/scripts/build_kibana_plugins.sh

@@ -18,8 +18,7 @@ node scripts/build_kibana_platform_plugins \
   --scan-dir "$XPACK_DIR/test/licensing_plugin/plugins" \
   --scan-dir "$XPACK_DIR/test/usage_collection/plugins" \
   --scan-dir "$XPACK_DIR/test/security_functional/fixtures/common" \
-  --scan-dir "$XPACK_DIR/examples" \
-  --verbose
+  --scan-dir "$XPACK_DIR/examples"
 
 echo "--- Archive built plugins"
 shopt -s globstar

.buildkite/scripts/lifecycle/build_status.js

@@ -7,11 +7,11 @@ const { BuildkiteClient } = require('kibana-buildkite-library');
     console.log(status.success ? 'true' : 'false');
     process.exit(0);
   } catch (ex) {
+    console.error('Buildkite API Error', ex.message);
     if (ex.response) {
-      console.error('HTTP Error Response Body', ex.response.data);
       console.error('HTTP Error Response Status', ex.response.status);
+      console.error('HTTP Error Response Body', ex.response.data);
     }
-    console.error(ex);
     process.exit(1);
   }
 })();

.buildkite/scripts/lifecycle/ci_stats_complete.js

@@ -4,7 +4,11 @@ const { CiStats } = require('kibana-buildkite-library');
   try {
     await CiStats.onComplete();
   } catch (ex) {
-    console.error(ex);
+    console.error('CI Stats Error', ex.message);
+    if (ex.response) {
+      console.error('HTTP Error Response Status', ex.response.status);
+      console.error('HTTP Error Response Body', ex.response.data);
+    }
     process.exit(1);
   }
 })();

.buildkite/scripts/lifecycle/ci_stats_start.js

@@ -4,7 +4,11 @@ const { CiStats } = require('kibana-buildkite-library');
   try {
     await CiStats.onStart();
   } catch (ex) {
-    console.error(ex);
+    console.error('CI Stats Error', ex.message);
+    if (ex.response) {
+      console.error('HTTP Error Response Status', ex.response.status);
+      console.error('HTTP Error Response Body', ex.response.data);
+    }
     process.exit(1);
   }
 })();

.eslintrc.js

@@ -1656,5 +1656,24 @@ module.exports = {
         '@typescript-eslint/prefer-ts-expect-error': 'error',
       },
     },
+
+    /**
+     * Disallow `export *` syntax in plugin/core public/server/common index files and instead
+     * require that plugins/core explicitly export the APIs that should be accessible outside the plugin.
+     *
+     * To add your plugin to this list just update the relevant glob with the name of your plugin
+     */
+    {
+      files: [
+        'src/core/{server,public,common}/index.ts',
+        'src/plugins/*/{server,public,common}/index.ts',
+        'src/plugins/*/*/{server,public,common}/index.ts',
+        'x-pack/plugins/*/{server,public,common}/index.ts',
+        'x-pack/plugins/*/*/{server,public,common}/index.ts',
+      ],
+      rules: {
+        '@kbn/eslint/no_export_all': 'error',
+      },
+    },
   ],
 };

.github/workflows/sync-main-branch.yml

@@ -0,0 +1,26 @@
+# Synchronize all pushes to 'master' branch with 'main' branch to facilitate migration
+name: "Sync main branch"
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  sync_latest_from_upstream:
+    runs-on: ubuntu-latest
+    name: Sync latest commits from master branch
+
+    steps:
+      - name: Checkout target repo
+        uses: actions/checkout@v2
+        with:
+          ref: main
+
+      - name: Sync upstream changes
+        id: sync
+        uses: aormsby/[email protected]
+        with:
+          target_sync_branch: main
+          target_repo_token: ${{ secrets.KIBANAMACHINE_TOKEN }}
+          upstream_sync_branch: master
+          upstream_sync_repo: elastic/kibana

docs/apm/correlations.asciidoc

@@ -12,34 +12,33 @@ piece of hardware, like a host or pod. Or, perhaps a set of users, based on IP
 address or region, is facing increased latency due to local data center issues.
 
 To find correlations, select a service on the *Services* page in the {apm-app}
-and click **View correlations**.
+then select a transaction group from the *Transactions* tab.
 
 NOTE: Queries within the {apm-app} are also applied to the correlations.
 
 [discrete]
 [[correlations-latency]]
 ==== Find high transaction latency correlations
 
-The correlations on the *Latency* tab help you discover which attributes are
-contributing to increased transaction latency. 
+The correlations on the *Latency correlations* tab help you discover which
+attributes are contributing to increased transaction latency. 
 
 [role="screenshot"]
 image::apm/images/correlations-hover.png[Latency correlations]
 
 The progress bar indicates the status of the asynchronous analysis, which
 performs statistical searches across a large number of attributes. For large
-time ranges and services with high transaction throughput this might take some
-time. To improve performance, reduce the time range on the service overview
-page.
+time ranges and services with high transaction throughput, this might take some
+time. To improve performance, reduce the time range.
 
 The latency distribution chart visualizes the overall latency of the
-transactions in the service. If there are attributes that have a statistically
-significant correlation with slow response times, they are listed in a table
-below the chart. The table is sorted by correlation coefficients that range from
-0 to 1. Attributes with higher correlation values are more likely to contribute
-to high latency transactions. By default, the attribute with the highest
-correlation value is added to the chart. To see the latency distribution for
-other attributes, hover over their row in the table.
+transactions in the transaction group. If there are attributes that have a
+statistically significant correlation with slow response times, they are listed
+in a table below the chart. The table is sorted by correlation coefficients that
+range from 0 to 1. Attributes with higher correlation values are more likely to
+contribute to high latency transactions. By default, the attribute with the
+highest correlation value is added to the chart. To see the latency distribution
+for other attributes, hover over their row in the table.
 
 If a correlated attribute seems noteworthy, use the **Filter** quick links:
 

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

@@ -9,6 +9,10 @@
 ```typescript
 readonly links: {
         readonly settings: string;
+        readonly apm: {
+            readonly kibanaSettings: string;
+            readonly supportedServiceMaps: string;
+        };
         readonly canvas: {
             readonly guide: string;
         };

docs/discover/search-for-relevance.asciidoc

@@ -1,6 +1,5 @@
 [[discover-search-for-relevance]]
 == Search for relevance
-Sometimes you might be unsure which documents best match your search.
 {es} assigns a relevancy, or score to each document, so you can
 can narrow your search to the documents with the most relevant results.
 The higher the score, the better it matches your query.
@@ -12,25 +11,23 @@ the <<gs-get-data-into-kibana, sample flights data set>>, or you can use your ow
 .  In *Discover*, open the index pattern dropdown, and select that data you want to work with.
 +
 For the sample flights data, set the index pattern to *kibana_sample_data_flights*.
-.  In the query bar, click  *KQL*, and then turn it off.
-+
-You're now using the <<lucene-query, Lucene query syntax>>.
+
 .  Run your search.  For the sample data, try:
 +
 ```ts
 Warsaw OR Venice OR Clear
 ```
 . If you don't see any results, expand the <<set-time-filter,time range>>, for example to *Last 7 days*.
 . From the list of *Available fields*, add `_score` and any other fields you want to the document table.
-. To sort the `_score` column in descending order, hover over its header, and then click twice on
-the arrow icon
-image:images/double-arrow.png[Double arrow icon to indicate sorting] so it changes to
+. To sort the `_score` column in descending order, hover over its header, and set
+the sort icon to
 image:images/downward-arrow.png[Downward pointing arrow to indicate descending sorting].
 +
 At this point, you're doing a multi-column sort: first by `Time`, and then by `_score`.
-. To turn off sorting for the `Time` field, hover over its header, and then click the down arrow.
+. To turn off sorting for the `Time` field, hover over its header, and set the sort icon to
+image:images/double-arrow.png[Arrow on both ends of the icon indicates sorting is off].
 +
 Your table now sorts documents from most to least relevant.
 +
 [role="screenshot"]
-image::images/discover-search-for-relevance.png["Example of a search for relevance"]
+image::images/discover-search-for-relevance.png["Documents are sorted from most relevant to least relevant."]

docs/settings/reporting-settings.asciidoc

@@ -285,7 +285,7 @@ With Security enabled, Reporting has two forms of access control: each user can
 
 [NOTE]
 ============================================================================
-The `xpack.reporting.roles` settings are for a deprecated system of access control in Reporting. It does not allow API Keys to generate reports, and it doesn't allow {kib} application privileges. We recommend you explicitly turn off reporting's deprecated access control feature by adding `xpack.reporting.roles.enabled: false` in kibana.yml. This will enable application privileges for reporting, as described in <<grant-user-access, granting users access to reporting>>.
+The `xpack.reporting.roles` settings are for a deprecated system of access control in Reporting. It does not allow API Keys to generate reports, and it doesn't allow {kib} application privileges. We recommend you explicitly turn off reporting's deprecated access control feature by adding `xpack.reporting.roles.enabled: false` in kibana.yml. This will enable you to create custom roles that provide application privileges for reporting, as described in <<grant-user-access, granting users access to reporting>>.
 ============================================================================
 
 [[xpack-reporting-roles-enabled]] `xpack.reporting.roles.enabled`::

docs/user/discover.asciidoc

@@ -78,7 +78,7 @@ If you are using the sample data, this value was set when you added the data.
 If you  are using your own data, and it does not have a time field, the range selection is not available.
 
 . To view the count of documents for a given time in the specified range,
-click and drag the mouse over the histogram.
+click and drag the mouse over the chart.
 
 [float]
 [[explore-fields-in-your-data]]
@@ -108,7 +108,7 @@ them to your document table. Your table should look similar to this:
 image:images/document-table.png[Document table with fields for manufacturer, customer_first_name, and customer_last_name]
 
 . To rearrange the table columns, hover the mouse over a
-column header, and then use the move controls.
+column header, and then use the move control.
 
 . To view more of the document table, click *Hide chart*.
 
@@ -275,7 +275,7 @@ image:images/discover-maps.png[Map containing documents]
 [[share-your-findings]]
 === Share your findings
 
-To share your findings with a larger audience, click *Share* in the toolbar. For detailed information about the sharing options, refer to <<reporting-getting-started,Reporting>>.
+To share your findings with a larger audience, click *Share* in the *Discover* toolbar. For detailed information about the sharing options, refer to <<reporting-getting-started,Reporting>>.
 
 
 [float]
@@ -285,8 +285,6 @@ To share your findings with a larger audience, click *Share* in the toolbar. For
 
 * <<discover-search-for-relevance, Search for relevance>>.
 
-* <<reporting-getting-started, Present your findings in a report>>.
-
 * <<kibana-discover-settings, Configure Discover>> to better meet your needs.
 Go to **Advanced Settings** to configure the number of documents to show,
 the table columns that display by default, and more.

packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts

@@ -221,11 +221,12 @@ export class CiStatsReporter {
           ? `${error.response.status} response`
           : 'no response';
 
+        const seconds = attempt * 10;
         this.log.warning(
-          `failed to reach ci-stats service [reason=${reason}], retrying in ${attempt} seconds`
+          `failed to reach ci-stats service, retrying in ${seconds} seconds, [reason=${reason}], [error=${error.message}]`
         );
 
-        await new Promise((resolve) => setTimeout(resolve, attempt * 1000));
+        await new Promise((resolve) => setTimeout(resolve, seconds * 1000));
       }
     }
   }

packages/kbn-eslint-plugin-eslint/BUILD.bazel

@@ -6,6 +6,7 @@ PKG_REQUIRE_NAME = "@kbn/eslint-plugin-eslint"
 SOURCE_FILES = glob(
   [
     "rules/**/*.js",
+    "helpers/**/*.js",
     "index.js",
     "lib.js",
   ],

src/plugins/discover/public/application/angular/context/components/action_bar/index.ts → packages/kbn-eslint-plugin-eslint/__fixtures__/bar.ts

@@ -6,4 +6,6 @@
  * Side Public License, v 1.
  */
 
-import './action_bar_directive';
+/* eslint-disable no-restricted-syntax */
+
+export class Bar {}

src/plugins/discover/public/application/angular/helpers/index.ts → packages/kbn-eslint-plugin-eslint/__fixtures__/baz.ts

@@ -6,5 +6,8 @@
  * Side Public License, v 1.
  */
 
-export { handleSourceColumnState } from './state_helpers';
-export { PromiseServiceCreator } from './promises';
+/* eslint-disable no-restricted-syntax */
+
+export const one = 1;
+export const two = 2;
+export const three = 3;

packages/kbn-eslint-plugin-eslint/__fixtures__/foo.ts

@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/* eslint-disable no-restricted-syntax */
+
+export type { Bar as ReexportedClass } from './bar';
+
+export const someConst = 'bar';
+
+// eslint-disable-next-line prefer-const
+export let someLet = 'bar';
+
+export function someFunction() {}
+
+export class SomeClass {}
+
+export interface SomeInterface {
+  prop: number;
+}
+
+export enum SomeEnum {
+  a = 'a',
+  b = 'b',
+}
+
+export type TypeAlias = string[];

src/plugins/discover/public/application/angular/index.ts → packages/kbn-eslint-plugin-eslint/__fixtures__/top.ts

@@ -6,8 +6,6 @@
  * Side Public License, v 1.
  */
 
-// required for i18nIdDirective
-import 'angular-sanitize';
+/* eslint-disable no-restricted-syntax */
 
-import './doc';
-import './context';
+export * from './foo';