Merge branch 'master' into feat/olm-host_isolation_api_changes-1704

Author: kibanamachine

.buildkite/scripts/common/env.sh

@@ -36,7 +36,12 @@ export ELASTIC_APM_ENVIRONMENT=ci
 export ELASTIC_APM_TRANSACTION_SAMPLE_RATE=0.1
 
 if is_pr; then
-  export ELASTIC_APM_ACTIVE=false
+  if [[ "${GITHUB_PR_LABELS:-}" == *"ci:collect-apm"* ]]; then
+    export ELASTIC_APM_ACTIVE=true
+  else
+    export ELASTIC_APM_ACTIVE=false
+  fi
+
   export CHECKS_REPORTER_ACTIVE=true
 
   # These can be removed once we're not supporting Jenkins and Buildkite at the same time

docs/developer/plugin-list.asciidoc

@@ -350,7 +350,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/apm/readme.md[apm]
-|Local setup documentation
+|undefined
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/banners/README.md[banners]

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

@@ -145,6 +145,9 @@ readonly links: {
             readonly networkMap: string;
             readonly troubleshootGaps: string;
         };
+        readonly securitySolution: {
+            readonly trustedApps: string;
+        };
         readonly query: {
             readonly eql: string;
             readonly kueryQuerySyntax: string;

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

@@ -426,6 +426,7 @@ because requests can be spread across all shard copies. However, results might
 be inconsistent because different shards might be in different refresh states.
 
 [[search-includefrozen]]`search:includeFrozen`::
+**This setting is deprecated and will not be supported as of 9.0.**
 Includes {ref}/frozen-indices.html[frozen indices] in results. Searching through
 frozen indices might increase the search time. This setting is off by default.
 Users must opt-in to include frozen indices.

docs/management/advanced-options.asciidoc

@@ -79,11 +79,6 @@ The protocol for accessing {kib}, typically `http` or `https`.
 [[xpack-kibanaServer-hostname]] `xpack.reporting.kibanaServer.hostname`::
 The hostname for accessing {kib}, if different from the <<server-host, `server.host`>> value.
 
-NOTE: Reporting authenticates requests on the {kib} page only when the hostname matches the
-<<xpack-kibanaServer-hostname, `xpack.reporting.kibanaServer.hostname`>> setting. Therefore Reporting fails if the
-set value redirects to another server. For that reason, `"0"` is an invalid setting
-because, in the Reporting browser, it becomes an automatic redirect to `"0.0.0.0"`.
-
 [float]
 [[reporting-job-queue-settings]]
 ==== Background job settings

docs/settings/reporting-settings.asciidoc

@@ -82,7 +82,6 @@
     "**/pdfkit/crypto-js": "4.0.0",
     "**/react-syntax-highlighter": "^15.3.1",
     "**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
-    "**/refractor/prismjs": "~1.25.0",
     "**/trim": "1.0.1",
     "**/typescript": "4.1.3",
     "**/underscore": "^1.13.1"
@@ -103,7 +102,7 @@
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.21",
     "@elastic/ems-client": "7.15.0",
-    "@elastic/eui": "38.0.1",
+    "@elastic/eui": "39.0.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/maki": "6.3.0",
     "@elastic/node-crypto": "1.2.1",
@@ -184,7 +183,7 @@
     "@types/redux-logger": "^3.0.8",
     "JSONStream": "1.3.5",
     "abort-controller": "^3.0.0",
-    "abortcontroller-polyfill": "^1.4.0",
+    "abortcontroller-polyfill": "^1.7.3",
     "angular": "^1.8.0",
     "angular-aria": "^1.8.0",
     "angular-recursion": "^1.0.5",
@@ -209,7 +208,7 @@
     "constate": "^1.3.2",
     "content-disposition": "0.5.3",
     "copy-to-clipboard": "^3.0.8",
-    "core-js": "^3.6.5",
+    "core-js": "^3.18.3",
     "cronstrue": "^1.51.0",
     "cytoscape": "^3.10.0",
     "cytoscape-dagre": "^2.2.2",
@@ -369,7 +368,7 @@
     "remark-stringify": "^9.0.0",
     "require-in-the-middle": "^5.1.0",
     "reselect": "^4.0.0",
-    "resize-observer-polyfill": "^1.5.0",
+    "resize-observer-polyfill": "^1.5.1",
     "rison-node": "1.0.2",
     "rxjs": "^6.5.5",
     "safe-squel": "^5.12.5",

package.json

@@ -94,8 +94,8 @@ describe('ApmConfiguration', () => {
         "globalLabels": Object {},
         "logUncaughtExceptions": true,
         "metricsInterval": "30s",
-        "secretToken": "ZQHYvrmXEx04ozge8F",
-        "serverUrl": "https://38b80fbd79fb4c91bae06b4642d4d093.apm.us-east-1.aws.cloud.es.io",
+        "secretToken": "7YKhoXsO4MzjhXjx2c",
+        "serverUrl": "https://kibana-ci-apm.apm.us-central1.gcp.cloud.es.io",
         "serviceName": "serviceName",
         "serviceVersion": "8.0.0",
         "transactionSampleRate": 1,
@@ -117,8 +117,8 @@ describe('ApmConfiguration', () => {
         },
         "logUncaughtExceptions": true,
         "metricsInterval": "120s",
-        "secretToken": "ZQHYvrmXEx04ozge8F",
-        "serverUrl": "https://38b80fbd79fb4c91bae06b4642d4d093.apm.us-east-1.aws.cloud.es.io",
+        "secretToken": "7YKhoXsO4MzjhXjx2c",
+        "serverUrl": "https://kibana-ci-apm.apm.us-central1.gcp.cloud.es.io",
         "serviceName": "serviceName",
         "serviceVersion": "8.0.0",
         "transactionSampleRate": 1,

packages/kbn-apm-config-loader/src/config.test.ts

@@ -23,14 +23,14 @@ const DEFAULT_CONFIG: AgentConfigOptions = {
 };
 
 const CENTRALIZED_SERVICE_BASE_CONFIG: AgentConfigOptions = {
-  serverUrl: 'https://38b80fbd79fb4c91bae06b4642d4d093.apm.us-east-1.aws.cloud.es.io',
+  serverUrl: 'https://kibana-ci-apm.apm.us-central1.gcp.cloud.es.io',
 
   // The secretToken below is intended to be hardcoded in this file even though
   // it makes it public. This is not a security/privacy issue. Normally we'd
   // instead disable the need for a secretToken in the APM Server config where
   // the data is transmitted to, but due to how it's being hosted, it's easier,
   // for now, to simply leave it in.
-  secretToken: 'ZQHYvrmXEx04ozge8F',
+  secretToken: '7YKhoXsO4MzjhXjx2c',
 
   centralConfig: false,
   metricsInterval: '30s',

packages/kbn-apm-config-loader/src/config.ts

@@ -130,7 +130,7 @@ export class CiStatsReporter {
     }
 
     try {
-      const { stdout } = await execa('git', ['branch', '--show-current']);
+      const { stdout } = await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
       branch = stdout;
     } catch (e) {
       this.log.debug(e.message);