Merge branch 'main' into migrate-toolbar-button

Author: rshen91

.buildkite/pipelines/docker_context.yml

@@ -0,0 +1,11 @@
+ steps:
+  - command: .buildkite/scripts/steps/docker_context/build.sh
+    label: 'Docker Build Context'
+    agents:
+      queue: n2-4
+    timeout_in_minutes: 30
+    key: build-docker-context
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1

.buildkite/pipelines/es_snapshots/verify.yml

@@ -65,6 +65,7 @@ steps:
 
   - command: .buildkite/scripts/steps/test/jest_integration.sh
     label: 'Jest Integration Tests'
+    parallelism: 2
     agents:
       queue: n2-4
     timeout_in_minutes: 120

.buildkite/scripts/steps/cloud/build_and_deploy.sh

@@ -35,16 +35,16 @@ node scripts/build \
 CLOUD_IMAGE=$(docker images --format "{{.Repository}}:{{.Tag}}" docker.elastic.co/kibana-ci/kibana-cloud)
 CLOUD_DEPLOYMENT_NAME="kibana-pr-$BUILDKITE_PULL_REQUEST"
 
-jq '
-  .resources.kibana[0].plan.kibana.docker_image = "'$CLOUD_IMAGE'" |
-  .name = "'$CLOUD_DEPLOYMENT_NAME'" |
-  .resources.kibana[0].plan.kibana.version = "'$VERSION'" |
-  .resources.elasticsearch[0].plan.elasticsearch.version = "'$VERSION'"
-  ' .buildkite/scripts/steps/cloud/deploy.json > /tmp/deploy.json
-
 CLOUD_DEPLOYMENT_ID=$(ecctl deployment list --output json | jq -r '.deployments[] | select(.name == "'$CLOUD_DEPLOYMENT_NAME'") | .id')
 JSON_FILE=$(mktemp --suffix ".json")
 if [ -z "${CLOUD_DEPLOYMENT_ID}" ]; then
+  jq '
+    .resources.kibana[0].plan.kibana.docker_image = "'$CLOUD_IMAGE'" |
+    .name = "'$CLOUD_DEPLOYMENT_NAME'" |
+    .resources.kibana[0].plan.kibana.version = "'$VERSION'" |
+    .resources.elasticsearch[0].plan.elasticsearch.version = "'$VERSION'"
+    ' .buildkite/scripts/steps/cloud/deploy.json > /tmp/deploy.json
+
   ecctl deployment create --track --output json --file /tmp/deploy.json &> "$JSON_FILE"
   CLOUD_DEPLOYMENT_USERNAME=$(jq --slurp '.[]|select(.resources).resources[] | select(.credentials).credentials.username' "$JSON_FILE")
   CLOUD_DEPLOYMENT_PASSWORD=$(jq --slurp '.[]|select(.resources).resources[] | select(.credentials).credentials.password' "$JSON_FILE")
@@ -59,6 +59,11 @@ if [ -z "${CLOUD_DEPLOYMENT_ID}" ]; then
 
   retry 5 5 vault write "secret/kibana-issues/dev/cloud-deploy/$CLOUD_DEPLOYMENT_NAME" username="$CLOUD_DEPLOYMENT_USERNAME" password="$CLOUD_DEPLOYMENT_PASSWORD"
 else
+  ecctl deployment show "$CLOUD_DEPLOYMENT_ID" --generate-update-payload | jq '
+    .resources.kibana[0].plan.kibana.docker_image = "'$CLOUD_IMAGE'" |
+    .resources.kibana[0].plan.kibana.version = "'$VERSION'" |
+    .resources.elasticsearch[0].plan.elasticsearch.version = "'$VERSION'"
+    ' > /tmp/deploy.json
   ecctl deployment update "$CLOUD_DEPLOYMENT_ID" --track --output json --file /tmp/deploy.json &> "$JSON_FILE"
 fi
 

.buildkite/scripts/steps/code_coverage/jest.sh

@@ -10,11 +10,11 @@ is_test_execution_step
 
 echo '--- Jest code coverage'
 
-.buildkite/scripts/steps/code_coverage/jest_parallel.sh
+.buildkite/scripts/steps/code_coverage/jest_parallel.sh jest.config.js
 
 tar -czf kibana-jest-thread-coverage.tar.gz target/kibana-coverage/jest
 
 echo "--- Merging code coverage for a thread"
 yarn nyc report --nycrc-path src/dev/code_coverage/nyc_config/nyc.jest.config.js --reporter json
 rm -rf target/kibana-coverage/jest/*
-mv target/kibana-coverage/jest-combined/coverage-final.json "target/kibana-coverage/jest/jest-merged-coverage-$(date +%s%3N).json"
+mv target/kibana-coverage/jest-combined/coverage-final.json "target/kibana-coverage/jest/jest-merged-coverage-$(date +%s%3N).json"

.buildkite/scripts/steps/docker_context/build.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -euo pipefail
+
+.buildkite/scripts/bootstrap.sh
+
+echo "--- Create Kibana Docker contexts"
+mkdir -p target
+node scripts/build --skip-initialize --skip-generic-folders --skip-platform-folders --skip-archives
+
+echo "--- Build default context"
+DOCKER_BUILD_FOLDER=$(mktemp -d)
+
+tar -xf target/kibana-[0-9]*-docker-build-context.tar.gz -C "$DOCKER_BUILD_FOLDER"
+cd $DOCKER_BUILD_FOLDER
+docker build .

.buildkite/scripts/steps/storybooks/build_and_upload.js

@@ -16,7 +16,6 @@ const STORYBOOKS = [
   'canvas',
   'ci_composite',
   'cloud',
-  'codeeditor',
   'custom_integrations',
   'dashboard_enhanced',
   'dashboard',
@@ -31,13 +30,13 @@ const STORYBOOKS = [
   'expression_tagcloud',
   'fleet',
   'infra',
+  'kibana_react',
   'lists',
   'observability',
   'presentation',
   'security_solution',
   'shared_ux',
   'ui_actions_enhanced',
-  'url_template_editor',
 ];
 
 const GITHUB_CONTEXT = 'Build and Publish Storybooks';

.buildkite/scripts/steps/test/jest.sh

@@ -10,4 +10,4 @@ is_test_execution_step
 
 echo '--- Jest'
 checks-reporter-with-killswitch "Jest Unit Tests $((BUILDKITE_PARALLEL_JOB+1))" \
-  .buildkite/scripts/steps/test/jest_parallel.sh
+  .buildkite/scripts/steps/test/jest_parallel.sh jest.config.js

.buildkite/scripts/steps/test/jest_parallel.sh

@@ -25,6 +25,6 @@ while read -r config; do
 
   ((i=i+1))
 # uses heredoc to avoid the while loop being in a sub-shell thus unable to overwrite exitCode
-done <<< "$(find src x-pack packages -name ${1:-jest.config.js} -not -path "*/__fixtures__/*" | sort)"
+done <<< "$(find src x-pack packages -name "$1" -not -path "*/__fixtures__/*" | sort)"
 
 exit $exitCode

.github/workflows/label-qa-fixed-in.yml

@@ -37,7 +37,7 @@ jobs:
               }
             }
           prnumber: ${{ github.event.number }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.FLEET_TECH_KIBANA_USER_TOKEN }}
       - uses: sergeysova/jq-action@v2
         id: issues_to_label
         with:
@@ -75,4 +75,4 @@ jobs:
             }
           issueid: ${{ matrix.issueNodeId }}
           labelids: ${{ needs.fetch_issues_to_label.outputs.label_ids }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.FLEET_TECH_KIBANA_USER_TOKEN }}

docs/apm/transactions.asciidoc

@@ -151,7 +151,7 @@ Learn more about a trace sample in the *Metadata* tab:
 * User - Requires additional configuration, but allows you to see which user experienced the current transaction.
 
 TIP: All of this data is stored in documents in Elasticsearch.
-This means you can select "Actions - View sample document" to see the actual Elasticsearch document under the discover tab.
+This means you can select "Actions - View transaction in Discover" to see the actual Elasticsearch document under the discover tab.
 
 *Trace sample logs*
 

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

@@ -13,8 +13,8 @@ export declare type KibanaExecutionContext = {
     readonly type: string;
     readonly name: string;
     readonly id: string;
-    readonly description: string;
+    readonly description?: string;
     readonly url?: string;
-    parent?: KibanaExecutionContext;
+    child?: KibanaExecutionContext;
 };
 ```

docs/development/core/server/kibana-plugin-core-server.kibanaexecutioncontext.md

@@ -13,8 +13,8 @@ export declare type KibanaExecutionContext = {
     readonly type: string;
     readonly name: string;
     readonly id: string;
-    readonly description: string;
+    readonly description?: string;
     readonly url?: string;
-    parent?: KibanaExecutionContext;
+    child?: KibanaExecutionContext;
 };
 ```

docs/user/ml/index.asciidoc

@@ -26,7 +26,8 @@ If {stack-security-features} are enabled, users must have the necessary
 privileges to use {ml-features}. Refer to
 {ml-docs}/setup.html#setup-privileges[Set up {ml-features}].
 
-NOTE: There are limitations in {ml-features} that affect {kib}. For more information, refer to {ml-docs}/ml-limitations.html[Machine learning].
+NOTE: There are limitations in {ml-features} that affect {kib}. For more 
+information, refer to {ml-docs}/ml-limitations.html[{ml-cap}].
 
 --
 
@@ -84,8 +85,6 @@ and {ml-docs}/ml-ad-overview.html[{ml-cap} {anomaly-detect}].
 [[xpack-ml-dfanalytics]]
 == {dfanalytics-cap}
 
-experimental[]
-
 The Elastic {ml} {dfanalytics} feature enables you to analyze your data using
 {classification}, {oldetection}, and {regression} algorithms and generate new
 indices that contain the results alongside your source data.

docs/user/troubleshooting/trace-query.asciidoc

@@ -29,16 +29,16 @@ Now, you can see the request to {es} has been initiated by the `[Logs] Unique Vi
 [source,text]
 ----
 [DEBUG][execution_context] stored the execution context: {
-  "parent": {
-    "type": "application",
-    "name": "dashboard",
-    "id": "edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b",
-    "description": "[Logs] Web Traffic","url":"/view/edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b"
+  "type": "application",
+  "name": "dashboard",
+  "id": "edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b",
+  "description": "[Logs] Web Traffic","url":"/view/edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b"
+  "child": {
+    "type": "visualization",
+    "name": "Vega",
+    "id": "cb099a20-ea66-11eb-9425-113343a037e3",
+    "description": "[Logs] Unique Visitor Heatmap",
+    "url": "/app/visualize#/edit/cb099a20-ea66-11eb-9425-113343a037e3"
   },
-  "type": "visualization",
-  "name": "Vega",
-  "id": "cb099a20-ea66-11eb-9425-113343a037e3",
-  "description": "[Logs] Unique Visitor Heatmap",
-  "url": "/app/visualize#/edit/cb099a20-ea66-11eb-9425-113343a037e3"
 }
 ----

jest.config.integration.js

@@ -46,7 +46,8 @@
           "id": "kibDevTutorialBuildingDistributable",
           "label": "Building a Kibana distributable"
         },
-        { "id": "kibDevTutorialServerEndpoint" }
+        { "id": "kibDevTutorialServerEndpoint" },
+        { "id": "kibDevTutorialAdvancedSettings"}
       ]
     },
     {

jest.config.js

@@ -8,16 +8,20 @@
 
 import { METRIC_TYPE } from './';
 
-export type UiCounterMetricType = METRIC_TYPE.CLICK | METRIC_TYPE.LOADED | METRIC_TYPE.COUNT;
+export type UiCounterMetricType =
+  | METRIC_TYPE.CLICK
+  | METRIC_TYPE.LOADED
+  | METRIC_TYPE.COUNT
+  | string;
 export interface UiCounterMetricConfig {
-  type: UiCounterMetricType;
+  type: string;
   appName: string;
   eventName: string;
   count?: number;
 }
 
 export interface UiCounterMetric {
-  type: UiCounterMetricType;
+  type: string;
   appName: string;
   eventName: string;
   count: number;