Merge branch 'main' into 187069-fix-alert-tests

.buildkite/scripts/lifecycle/post_command.sh

@@ -6,13 +6,6 @@ echo '--- Log out of gcloud'
 ./.buildkite/scripts/common/activate_service_account.sh --unset-impersonation || echo "Failed to unset impersonation"
 ./.buildkite/scripts/common/activate_service_account.sh --logout-gcloud || echo "Failed to log out of gcloud"
 
-if [[ "${SKIP_NODE_SETUP:-}" =~ ^(1|true)$ ]]; then
-  echo '--- Skipping Agent Debug Info'
-else
-  echo '--- Agent Debug Info'
-  ts-node .buildkite/scripts/lifecycle/print_agent_links.ts || true
-fi
-
 IS_TEST_EXECUTION_STEP="$(buildkite-agent meta-data get "${BUILDKITE_JOB_ID}_is_test_execution_step" --default '')"
 
 if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then

.buildkite/scripts/lifecycle/pre_command.sh

@@ -11,16 +11,6 @@ if [[ "${SKIP_NODE_SETUP:-}" =~ ^(1|true)$ ]]; then
 else
   source .buildkite/scripts/common/setup_node.sh
   source .buildkite/scripts/common/setup_buildkite_deps.sh
-
-  echo '--- Agent Debug/SSH Info'
-  ts-node .buildkite/scripts/lifecycle/print_agent_links.ts || true
-fi
-
-if [[ "$(curl -is metadata.google.internal || true)" ]]; then
-  echo ""
-  echo "To SSH into this agent, run:"
-  echo "gcloud compute ssh --tunnel-through-iap --project elastic-kibana-ci --zone \"$(curl -sH Metadata-Flavor:Google http://metadata.google.internal/computeMetadata/v1/instance/zone)\" \"$(curl -sH Metadata-Flavor:Google http://metadata.google.internal/computeMetadata/v1/instance/name)\""
-  echo ""
 fi
 
 if [[ "${BUILDKITE_LABEL:-}" == *"Run Dynamic Pipeline"* || "${BUILDKITE_LABEL:-}" == *"Upload Pipeline"* ]]; then

.buildkite/scripts/steps/artifacts/docker_image.sh

@@ -18,46 +18,82 @@ export KIBANA_IMAGE="$KIBANA_BASE_IMAGE:$KIBANA_IMAGE_TAG"
 
 echo "--- Verify manifest does not already exist"
 echo "Checking manifest for $KIBANA_IMAGE"
-if docker manifest inspect $KIBANA_IMAGE &> /dev/null; then
-  echo "Manifest already exists, exiting"
-  exit 1
+SKIP_BUILD=false
+if docker manifest inspect "$KIBANA_IMAGE" &> /dev/null; then
+  # If a staging build manifest already exists, there's a workflow error and the root cause should be investigated.
+  if [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
+    echo "Manifest already exists, exiting"
+    exit 1
+  else
+    echo "Manifest already exists, skipping build.  Look up previous build for artifacts."
+    SKIP_BUILD=true
+  fi
 fi
 
-echo "--- Build Kibana"
-node scripts/build \
-  --debug \
-  --release \
-  --serverless \
-  --docker-cross-compile \
-  --docker-namespace="kibana-ci" \
-  --docker-tag="$KIBANA_IMAGE_TAG"
-
-echo "--- Tag images"
-docker rmi "$KIBANA_IMAGE"
-docker load < "target/kibana-serverless-$BASE_VERSION-docker-image.tar.gz"
-docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-amd64"
-
-docker rmi "$KIBANA_IMAGE"
-docker load < "target/kibana-serverless-$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 and push manifests"
-docker manifest create \
-  "$KIBANA_IMAGE" \
-  --amend "$KIBANA_IMAGE-arm64" \
-  --amend "$KIBANA_IMAGE-amd64"
-docker manifest push "$KIBANA_IMAGE"
-
-if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]] && [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
+if [[ "$SKIP_BUILD" == "false" ]]; then
+  echo "--- Build Kibana"
+  node scripts/build \
+    --debug \
+    --release \
+    --serverless \
+    --docker-cross-compile \
+    --docker-namespace="kibana-ci" \
+    --docker-tag="$KIBANA_IMAGE_TAG"
+
+  echo "--- Tag images"
+  docker rmi "$KIBANA_IMAGE"
+  docker load < "target/kibana-serverless-$BASE_VERSION-docker-image.tar.gz"
+  docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-amd64"
+
+  docker rmi "$KIBANA_IMAGE"
+  docker load < "target/kibana-serverless-$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 and push manifests"
   docker manifest create \
-    "$KIBANA_BASE_IMAGE:latest" \
+    "$KIBANA_IMAGE" \
     --amend "$KIBANA_IMAGE-arm64" \
     --amend "$KIBANA_IMAGE-amd64"
-  docker manifest push "$KIBANA_BASE_IMAGE:latest"
+  docker manifest push "$KIBANA_IMAGE"
+
+  if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]] && [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
+    docker manifest create \
+      "$KIBANA_BASE_IMAGE:latest" \
+      --amend "$KIBANA_IMAGE-arm64" \
+      --amend "$KIBANA_IMAGE-amd64"
+    docker manifest push "$KIBANA_BASE_IMAGE:latest"
+  fi
+
+  echo "--- Build dependencies report"
+  node scripts/licenses_csv_report "--csv=target/dependencies-$GIT_ABBREV_COMMIT.csv"
+
+  echo "--- Upload archives"
+  buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-linux-x86_64.tar.gz"
+  buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-linux-aarch64.tar.gz"
+  buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-image.tar.gz"
+  buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-image-aarch64.tar.gz"
+  buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-build-context.tar.gz"
+  buildkite-agent artifact upload "kibana-$BASE_VERSION-cdn-assets.tar.gz"
+  buildkite-agent artifact upload "dependencies-$GIT_ABBREV_COMMIT.csv"
+
+  echo "--- Upload CDN assets"
+  cd target
+  gcloud auth activate-service-account --key-file <(echo "$GCS_SA_CDN_KEY")
+
+  CDN_ASSETS_FOLDER=$(mktemp -d)
+  tar -xf "kibana-$BASE_VERSION-cdn-assets.tar.gz" -C "$CDN_ASSETS_FOLDER" --strip=1
+
+  gsutil -m cp -r "$CDN_ASSETS_FOLDER/*" "gs://$GCS_SA_CDN_BUCKET/$GIT_ABBREV_COMMIT"
+  gcloud auth revoke "$GCS_SA_CDN_EMAIL"
+
+  echo "--- Validate CDN assets"
+  ts-node "$(git rev-parse --show-toplevel)/.buildkite/scripts/steps/artifacts/validate_cdn_assets.ts" \
+    "$GCS_SA_CDN_URL" \
+    "$CDN_ASSETS_FOLDER"
 fi
 
 cat << EOF | buildkite-agent annotate --style "info" --context image
@@ -75,33 +111,6 @@ if [[ "${BUILDKITE_PULL_REQUEST:-false}" != "false" ]]; then
   buildkite-agent meta-data set pr_comment:early_comment_job_id "$BUILDKITE_JOB_ID"
 fi
 
-echo "--- Build dependencies report"
-node scripts/licenses_csv_report "--csv=target/dependencies-$GIT_ABBREV_COMMIT.csv"
-
-echo "--- Upload CDN assets"
-cd target
-gcloud auth activate-service-account --key-file <(echo "$GCS_SA_CDN_KEY")
-
-CDN_ASSETS_FOLDER=$(mktemp -d)
-tar -xf "kibana-$BASE_VERSION-cdn-assets.tar.gz" -C "$CDN_ASSETS_FOLDER" --strip=1
-
-gsutil -m cp -r "$CDN_ASSETS_FOLDER/*" "gs://$GCS_SA_CDN_BUCKET/$GIT_ABBREV_COMMIT"
-gcloud auth revoke "$GCS_SA_CDN_EMAIL"
-
-echo "--- Validate CDN assets"
-ts-node "$(git rev-parse --show-toplevel)/.buildkite/scripts/steps/artifacts/validate_cdn_assets.ts" \
-  "$GCS_SA_CDN_URL" \
-  "$CDN_ASSETS_FOLDER"
-
-echo "--- Upload archives"
-buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-linux-x86_64.tar.gz"
-buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-linux-aarch64.tar.gz"
-buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-image.tar.gz"
-buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-image-aarch64.tar.gz"
-buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-build-context.tar.gz"
-buildkite-agent artifact upload "kibana-$BASE_VERSION-cdn-assets.tar.gz"
-buildkite-agent artifact upload "dependencies-$GIT_ABBREV_COMMIT.csv"
-
 # This part is related with updating the configuration of kibana-controller,
 # so that new stack instances contain the latest and greatest image of kibana,
 # and the respective stack components of course.

.github/CODEOWNERS

@@ -28,6 +28,7 @@ x-pack/plugins/alerting @elastic/response-ops
 x-pack/packages/kbn-alerting-state-types @elastic/response-ops
 packages/kbn-alerting-types @elastic/response-ops
 packages/kbn-alerts-as-data-utils @elastic/response-ops
+packages/kbn-alerts-grouping @elastic/response-ops
 x-pack/test/alerting_api_integration/common/plugins/alerts_restricted @elastic/response-ops
 packages/kbn-alerts-ui-shared @elastic/response-ops
 packages/kbn-ambient-common-types @elastic/kibana-operations
@@ -1424,7 +1425,7 @@ x-pack/test/security_solution_api_integration/test_suites/sources @elastic/secur
 /x-pack/test/security_solution_cypress/cypress/* @elastic/security-engineering-productivity
 /x-pack/test/security_solution_cypress/cypress/tasks/login.ts @elastic/security-engineering-productivity
 /x-pack/test/security_solution_cypress/es_archives @elastic/security-engineering-productivity
-/x-pack/plugins/security_solution/scripts/run_cypress @MadameSheema @patrykkopycinski @oatkiller @maximpn @banderror
+/x-pack/plugins/security_solution/scripts/run_cypress @MadameSheema @patrykkopycinski @maximpn @banderror
 
 ## Security Solution sub teams - Threat Hunting Investigations
 

.github/workflows/auto-approve-api-docs.yml

@@ -1,5 +1,5 @@
 on:
-  pull_request:
+  pull_request_target:
     branches:
       - main
     types:

.github/workflows/auto-approve-backports.yml

@@ -1,5 +1,5 @@
 on:
-  pull_request:
+  pull_request_target:
     branches-ignore:
       - main
     types:

.i18nrc.json

@@ -59,6 +59,7 @@
     "flot": "packages/kbn-flot-charts/lib",
     "generateCsv": "packages/kbn-generate-csv",
     "grouping": "packages/kbn-grouping/src",
+    "alertsGrouping": "packages/kbn-alerts-grouping",
     "guidedOnboarding": "src/plugins/guided_onboarding",
     "guidedOnboardingPackage": "packages/kbn-guided-onboarding",
     "home": "src/plugins/home",

api_docs/actions.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
 title: "actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the actions plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 ---
 import actionsObj from './actions.devdocs.json';

api_docs/advanced_settings.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
 title: "advancedSettings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the advancedSettings plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
 ---
 import advancedSettingsObj from './advanced_settings.devdocs.json';

api_docs/ai_assistant_management_selection.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
 title: "aiAssistantManagementSelection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiAssistantManagementSelection plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
 ---
 import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';

api_docs/aiops.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
 title: "aiops"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiops plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
 ---
 import aiopsObj from './aiops.devdocs.json';

api_docs/alerting.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
 title: "alerting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the alerting plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
 ---
 import alertingObj from './alerting.devdocs.json';

api_docs/apm.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
 title: "apm"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the apm plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
 ---
 import apmObj from './apm.devdocs.json';

api_docs/apm_data_access.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apmDataAccess
 title: "apmDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the apmDataAccess plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apmDataAccess']
 ---
 import apmDataAccessObj from './apm_data_access.devdocs.json';

api_docs/assets_data_access.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/assetsDataAccess
 title: "assetsDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the assetsDataAccess plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'assetsDataAccess']
 ---
 import assetsDataAccessObj from './assets_data_access.devdocs.json';

api_docs/banners.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/banners
 title: "banners"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the banners plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'banners']
 ---
 import bannersObj from './banners.devdocs.json';

api_docs/bfetch.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/bfetch
 title: "bfetch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the bfetch plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'bfetch']
 ---
 import bfetchObj from './bfetch.devdocs.json';

api_docs/canvas.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/canvas
 title: "canvas"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the canvas plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'canvas']
 ---
 import canvasObj from './canvas.devdocs.json';

api_docs/cases.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cases
 title: "cases"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cases plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cases']
 ---
 import casesObj from './cases.devdocs.json';

api_docs/charts.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/charts
 title: "charts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the charts plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'charts']
 ---
 import chartsObj from './charts.devdocs.json';

api_docs/cloud.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloud
 title: "cloud"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloud plugin
-date: 2024-07-08
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloud']
 ---
 import cloudObj from './cloud.devdocs.json';