Merge branch 'main' of https://github.com/elastic/kibana into make-sp…

…aces-optional
elastic · Jan 26, 2023 · 69e8e7f · 69e8e7f
2 parents 39dffa3 + f49c3ac
commit 69e8e7f
Show file tree

Hide file tree

Showing 2,982 changed files with 213,549 additions and 111,044 deletions.
diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
@@ -159,6 +159,7 @@ enabled:
   - x-pack/test/examples/config.ts
   - x-pack/test/fleet_api_integration/config.ts
   - x-pack/test/fleet_functional/config.ts
+  - x-pack/test/ftr_apis/security_and_spaces/config.ts
   - x-pack/test/functional_basic/config.ts
   - x-pack/test/functional_cors/config.ts
   - x-pack/test/functional_embedded/config.ts
@@ -262,6 +263,7 @@ enabled:
   - x-pack/test/security_api_integration/oidc.config.ts
   - x-pack/test/security_api_integration/pki.config.ts
   - x-pack/test/security_api_integration/saml.config.ts
+  - x-pack/test/security_api_integration/saml_cloud.config.ts
   - x-pack/test/security_api_integration/session_idle.config.ts
   - x-pack/test/security_api_integration/session_invalidate.config.ts
   - x-pack/test/security_api_integration/session_lifespan.config.ts

diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
@@ -149,3 +149,11 @@ steps:
     timeout_in_minutes: 10
     agents:
       queue: kibana-default
+
+  - wait
+
+  - command: '.buildkite/scripts/steps/artifacts/docker_image_trigger.sh'
+    label: Trigger container image build
+    timeout_in_minutes: 10
+    agents:
+      queue: 'kibana-default'
diff --git a/.buildkite/pipelines/scalability/daily.yml b/.buildkite/pipelines/scalability/daily.yml
@@ -12,6 +12,10 @@ steps:
     agents:
       queue: kb-static-scalability
     timeout_in_minutes: 90
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
 
   - wait: ~
     continue_on_failure: true

diff --git a/.buildkite/scripts/post_build_kibana.sh b/.buildkite/scripts/post_build_kibana.sh
@@ -3,10 +3,18 @@
 set -euo pipefail
 
 if [[ ! "${DISABLE_CI_STATS_SHIPPING:-}" ]]; then
+  cmd=(
+    "node" "scripts/ship_ci_stats"
+      "--metrics" "target/optimizer_bundle_metrics.json"
+      "--metrics" "build/kibana/node_modules/@kbn/ui-shared-deps-src/shared_built_assets/metrics.json"
+  )
+
+  if [ "$BUILDKITE_PIPELINE_SLUG" == "kibana-on-merge" ]; then
+    cmd+=("--validate")
+  fi
+
   echo "--- Ship Kibana Distribution Metrics to CI Stats"
-  node scripts/ship_ci_stats \
-    --metrics target/optimizer_bundle_metrics.json \
-    --metrics build/kibana/node_modules/@kbn/ui-shared-deps-src/shared_built_assets/metrics.json
+  "${cmd[@]}"
 fi
 
 echo "--- Upload Build Artifacts"

diff --git a/.buildkite/scripts/steps/artifacts/docker_image.sh b/.buildkite/scripts/steps/artifacts/docker_image.sh
@@ -9,16 +9,16 @@ source .buildkite/scripts/steps/artifacts/env.sh
 GIT_ABBREV_COMMIT=${BUILDKITE_COMMIT:0:7}
 KIBANA_IMAGE="docker.elastic.co/kibana-ci/kibana:$GIT_ABBREV_COMMIT"
 
-echo "--- Verify image does not already exist"
+echo "--- Verify manifest does not already exist"
 echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
 trap 'docker logout docker.elastic.co' EXIT
 
 if docker manifest inspect $KIBANA_IMAGE &> /dev/null; then
-  echo "Image already exists, exiting"
+  echo "Manifest already exists, exiting"
   exit 1
 fi
 
-echo "--- Build image"
+echo "--- Build images"
 node scripts/build \
   --debug \
   --release \
@@ -29,6 +29,29 @@ node scripts/build \
   --skip-docker-ubi \
   --skip-docker-cloud \
   --skip-docker-contexts
+
+echo "--- Tag images"
+docker rmi "$KIBANA_IMAGE"
+docker load < "target/kibana-$BASE_VERSION-docker-image.tar.gz"
+docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-amd64"
+
+docker rmi "$KIBANA_IMAGE"
+docker load < "target/kibana-$BASE_VERSION-docker-image-aarch64.tar.gz"
+docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-arm64"
+
+echo "--- Push images"
+docker image push "$KIBANA_IMAGE-arm64"
+docker image push "$KIBANA_IMAGE-amd64"
+
+echo "--- Create manifest"
+docker rmi "$KIBANA_IMAGE"
+docker manifest create \
+  "$KIBANA_IMAGE" \
+  --amend "$KIBANA_IMAGE-arm64" \
+  --amend "$KIBANA_IMAGE-amd64"
+
+echo "--- Push manifest"
+docker manifest push "$KIBANA_IMAGE"
 docker logout docker.elastic.co
 
 echo "--- Build dependencies report"
@@ -42,3 +65,23 @@ buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image.tar.gz"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image-aarch64.tar.gz"
 buildkite-agent artifact upload "dependencies-$GIT_ABBREV_COMMIT.csv"
 cd -
+
+echo "--- Trigger image tag update"
+if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]]; then
+
+  cat << EOF | buildkite-agent pipeline upload
+steps:
+  - trigger: k8s-gitops-update-image-tag
+    label: ":argo: Update image tag for deployment-api"
+    branches: main
+    build:
+      env:
+        MODE: sed
+        TARGET_FILE: kibana-controller.yaml
+        IMAGE_TAG: "$GIT_ABBREV_COMMIT"
+        SERVICE: kibana-controller
+EOF
+
+else
+  echo "Skipping update for untracked branch $BUILDKITE_BRANCH"
+fi
diff --git a/.buildkite/scripts/steps/artifacts/docker_image_trigger.sh b/.buildkite/scripts/steps/artifacts/docker_image_trigger.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -euo pipefail
+
+ts-node .buildkite/scripts/steps/trigger_pipeline.ts kibana-artifacts-container-image "$BUILDKITE_BRANCH" "$BUILDKITE_COMMIT"
diff --git a/.ci/Dockerfile b/.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=18.13.0
+ARG NODE_VERSION=16.19.0
 
 FROM node:${NODE_VERSION} AS base
 

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -901,6 +901,7 @@ packages/kbn-chart-icons @elastic/kibana-visualizations
 packages/kbn-ci-stats-core @elastic/kibana-operations
 packages/kbn-ci-stats-performance-metrics @elastic/kibana-operations
 packages/kbn-ci-stats-reporter @elastic/kibana-operations
+packages/kbn-ci-stats-shipper-cli @elastic/kibana-operations
 packages/kbn-cli-dev-mode @elastic/kibana-operations
 packages/kbn-coloring @elastic/kibana-visualizations
 packages/kbn-config @elastic/kibana-core
@@ -981,6 +982,7 @@ packages/kbn-rison @elastic/kibana-operations
 packages/kbn-rule-data-utils @elastic/security-detections-response @elastic/actionable-observability @elastic/response-ops
 packages/kbn-safer-lodash-set @elastic/kibana-security
 packages/kbn-securitysolution-autocomplete @elastic/security-solution-platform
+packages/kbn-securitysolution-ecs @elastic/security-threat-hunting-explore
 packages/kbn-securitysolution-es-utils @elastic/security-solution-platform
 packages/kbn-securitysolution-exception-list-components @elastic/security-solution-platform
 packages/kbn-securitysolution-hook-utils @elastic/security-solution-platform
@@ -1017,6 +1019,7 @@ packages/kbn-tooling-log @elastic/kibana-operations
 packages/kbn-ts-projects @elastic/kibana-operations
 packages/kbn-ts-type-check-cli @elastic/kibana-operations
 packages/kbn-typed-react-router-config @elastic/apm-ui
+packages/kbn-ui-actions-browser @elastic/appex-sharedux
 packages/kbn-ui-framework @elastic/kibana-design
 packages/kbn-ui-shared-deps-npm @elastic/kibana-operations
 packages/kbn-ui-shared-deps-src @elastic/kibana-operations

diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-18.13.0
+16.19.0
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18.13.0
+16.19.0
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -22,13 +22,13 @@ load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install
 # Setup the Node.js toolchain for the architectures we want to support
 node_repositories(
   node_repositories = {
-    "18.13.0-darwin_amd64": ("node-v18.13.0-darwin-x64.tar.gz", "node-v18.13.0-darwin-x64", "8b57c4da4ff6cca19d5ef7953f8816e3406d1508a2e4ee7f997984b3b1d11b77"),
-    "18.13.0-darwin_arm64": ("node-v18.13.0-darwin-arm64.tar.gz", "node-v18.13.0-darwin-arm64", "418d535e64dbcbd628715180c2de4ffcecb8a84b81f233c60e6ab9f0d795c249"),
-    "18.13.0-linux_arm64": ("node-v18.13.0-linux-arm64.tar.xz", "node-v18.13.0-linux-arm64", "5b338667822341d1ea3b18d5b37d442a655829b9eafdc5f9008f00b8451ac148"),
-    "18.13.0-linux_amd64": ("node-v18.13.0-linux-x64.tar.xz", "node-v18.13.0-linux-x64", "7f5d6922a91986ef059ba8a4396aa435440adacfe6fc6fab60a857c8f2cf5e7a"),
-    "18.13.0-windows_amd64": ("node-v18.13.0-win-x64.zip", "node-v18.13.0-win-x64", "29c99ad1167ddbd72f2b15e91b560e36ac785b1873ba6791ab50d9d62f1957e2"),
+    "16.19.0-darwin_amd64": ("node-v16.19.0-darwin-x64.tar.gz", "node-v16.19.0-darwin-x64", "491e5a5592eca1961dcbb1fae28567428ce56ce9cc7977b04041e163e0c1670c"),
+    "16.19.0-darwin_arm64": ("node-v16.19.0-darwin-arm64.tar.gz", "node-v16.19.0-darwin-arm64", "5c9434fbb0f323fecf3d261b23a2e544919380c5043d0046d9745682fefd9cde"),
+    "16.19.0-linux_arm64": ("node-v16.19.0-linux-arm64.tar.xz", "node-v16.19.0-linux-arm64", "9072c995052f832678fe8fab18e960bd9853f30e481787e53f8dd1ec8aaa3bb6"),
+    "16.19.0-linux_amd64": ("node-v16.19.0-linux-x64.tar.xz", "node-v16.19.0-linux-x64", "c88b52497ab38a3ddf526e5b46a41270320409109c3f74171b241132984fd08f"),
+    "16.19.0-windows_amd64": ("node-v16.19.0-win-x64.zip", "node-v16.19.0-win-x64", "534ca7a24e999c81cec847a498cc43d47e2bb158f6edf639e5297f2718350e96"),
   },
-  node_version = "18.13.0",
+  node_version = "16.19.0",
   node_urls = [
     "https://nodejs.org/dist/v{version}/{filename}",
   ],