Merge branch 'master' into so-management/remove_legacy_import_support

.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);
   }
 })();

.ci/Dockerfile

@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=14.17.5
+ARG NODE_VERSION=14.17.6
 
 FROM node:${NODE_VERSION} AS base
 

.github/CODEOWNERS

@@ -439,6 +439,9 @@
 /x-pack/test/reporting_api_integration/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/reporting_functional/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/stack_functional_integration/apps/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/docs/user/reporting @elastic/kibana-reporting-services @elastic/kibana-app-services
+/docs/settings/reporting-settings.asciidoc @elastic/kibana-reporting-services @elastic/kibana-app-services
+/docs/setup/configuring-reporting.asciidoc @elastic/kibana-reporting-services @elastic/kibana-app-services
 #CC# /x-pack/plugins/reporting/ @elastic/kibana-reporting-services
 
 

.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/Fork-Sync-With-Upstream-action@v3.0
+        with:
+          target_sync_branch: main
+          target_repo_token: ${{ secrets.KIBANAMACHINE_TOKEN }}
+          upstream_sync_branch: master
+          upstream_sync_repo: elastic/kibana

.i18nrc.json

@@ -2,6 +2,7 @@
   "paths": {
     "alerts": "packages/kbn-alerts/src",
     "autocomplete": "packages/kbn-securitysolution-autocomplete/src",
+    "kbnConfig": "packages/kbn-config/src",
     "console": "src/plugins/console",
     "core": "src/core",
     "discover": "src/plugins/discover",

.node-version

@@ -1 +1 @@
-14.17.5
+14.17.6

.nvmrc

@@ -1 +1 @@
-14.17.5
+14.17.6

WORKSPACE.bazel

@@ -27,13 +27,13 @@ check_rules_nodejs_version(minimum_version_string = "3.8.0")
 # we can update that rule.
 node_repositories(
   node_repositories = {
-    "14.17.5-darwin_amd64": ("node-v14.17.5-darwin-x64.tar.gz", "node-v14.17.5-darwin-x64", "2e40ab625b45b9bdfcb963ddd4d65d87ddf1dd37a86b6f8b075cf3d77fe9dc09"),
-    "14.17.5-linux_arm64": ("node-v14.17.5-linux-arm64.tar.xz", "node-v14.17.5-linux-arm64", "3a2e674b6db50dfde767c427e8f077235bbf6f9236e1b12a4cc3496b12f94bae"),
-    "14.17.5-linux_s390x": ("node-v14.17.5-linux-s390x.tar.xz", "node-v14.17.5-linux-s390x", "7d40eee3d54241403db12fb3bc420cd776e2b02e89100c45cf5e74a73942e7f6"),
-    "14.17.5-linux_amd64": ("node-v14.17.5-linux-x64.tar.xz", "node-v14.17.5-linux-x64", "2d759de07a50cd7f75bd73d67e97b0d0e095ee3c413efac7d1b3d1e84ed76fff"),
-    "14.17.5-windows_amd64": ("node-v14.17.5-win-x64.zip", "node-v14.17.5-win-x64", "a99b7ee08e846e5d1f4e70c4396265542819d79ed9cebcc27760b89571f03cbf"),
+    "14.17.6-darwin_amd64": ("node-v14.17.6-darwin-x64.tar.gz", "node-v14.17.6-darwin-x64", "e3e4c02240d74fb1dc8a514daa62e5de04f7eaee0bcbca06a366ece73a52ad88"),
+    "14.17.6-linux_arm64": ("node-v14.17.6-linux-arm64.tar.xz", "node-v14.17.6-linux-arm64", "9c4f3a651e03cd9b5bddd33a80e8be6a6eb15e518513e410bb0852a658699156"),
+    "14.17.6-linux_s390x": ("node-v14.17.6-linux-s390x.tar.xz", "node-v14.17.6-linux-s390x", "3677f35b97608056013b5368f86eecdb044bdccc1b3976c1d4448736c37b6a0c"),
+    "14.17.6-linux_amd64": ("node-v14.17.6-linux-x64.tar.xz", "node-v14.17.6-linux-x64", "3bbe4faf356738d88b45be222bf5e858330541ff16bd0d4cfad36540c331461b"),
+    "14.17.6-windows_amd64": ("node-v14.17.6-win-x64.zip", "node-v14.17.6-win-x64", "b83e9ce542fda7fc519cec6eb24a2575a84862ea4227dedc171a8e0b5b614ac0"),
   },
-  node_version = "14.17.5",
+  node_version = "14.17.6",
   node_urls = [
     "https://nodejs.org/dist/v{version}/{filename}",
   ],

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;
         };
@@ -128,6 +132,7 @@ readonly links: {
         readonly rollupJobs: string;
         readonly elasticsearch: Record<string, string>;
         readonly siem: {
+            readonly privileges: string;
             readonly guide: string;
             readonly gettingStarted: string;
             readonly ml: string;