Merge branch 'main' into fix-multiline-string-diff

.buildkite/ftr_oblt_stateful_configs.yml

@@ -3,13 +3,13 @@ disabled:
   - x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_open.ts
   - x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_runner.ts
   - x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config.ts
-  - x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config_run.ts
-  - x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config.ts
-  - x-pack/plugins/observability_solution/inventory/e2e/ftr_config_run.ts
-  - x-pack/plugins/observability_solution/inventory/e2e/ftr_config.ts
-  - x-pack/plugins/observability_solution/profiling/e2e/ftr_config_open.ts
-  - x-pack/plugins/observability_solution/profiling/e2e/ftr_config_runner.ts
-  - x-pack/plugins/observability_solution/profiling/e2e/ftr_config.ts
+  - x-pack/solutions/observability/plugins/apm/ftr_e2e/ftr_config_run.ts
+  - x-pack/solutions/observability/plugins/apm/ftr_e2e/ftr_config.ts
+  - x-pack/solutions/observability/plugins/inventory/e2e/ftr_config_run.ts
+  - x-pack/solutions/observability/plugins/inventory/e2e/ftr_config.ts
+  - x-pack/solutions/observability/plugins/profiling/e2e/ftr_config_open.ts
+  - x-pack/solutions/observability/plugins/profiling/e2e/ftr_config_runner.ts
+  - x-pack/solutions/observability/plugins/profiling/e2e/ftr_config.ts
 
   #FTR configs
   - x-pack/solutions/observability/plugins/uptime/e2e/config.ts

.buildkite/pipeline-resource-definitions/kibana-es-forward-testing-9-dot-0.yml

@@ -27,6 +27,7 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_forward_9_dot_0.yml # Note: this file exists in 8.x only and should be moved into 8.18 once the branch is cut
+      skip_intermediate_builds: false
       provider_settings:
         prefix_pull_request_fork_branch_names: false
         trigger_mode: none

.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml

@@ -27,6 +27,7 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_forward.yml # Note: this file exists in 7.17 only
+      skip_intermediate_builds: false
       provider_settings:
         prefix_pull_request_fork_branch_names: false
         trigger_mode: none

.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts

@@ -485,7 +485,10 @@ export async function pickTestGroupRunOrder() {
             parallelism: unit.count,
             timeout_in_minutes: 120,
             key: 'jest',
-            agents: expandAgentQueue('n2-4-spot'),
+            agents: {
+              ...expandAgentQueue('n2-4-spot'),
+              diskSizeGb: 75,
+            },
             retry: {
               automatic: [
                 { exit_status: '-1', limit: 3 },

.buildkite/pipelines/on_merge.yml

@@ -10,6 +10,7 @@ steps:
       imageProject: elastic-images-prod
       provider: gcp
       machineType: n2-standard-2
+      diskSizeGb: 75
     retry:
       automatic:
         - exit_status: '*'
@@ -39,6 +40,7 @@ steps:
       provider: gcp
       machineType: n2-highcpu-8
       preemptible: true
+      diskSizeGb: 75
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -53,6 +55,7 @@ steps:
       provider: gcp
       machineType: n2-standard-2
       preemptible: true
+      diskSizeGb: 75
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -67,6 +70,7 @@ steps:
       provider: gcp
       machineType: n2-standard-16
       preemptible: true
+      diskSizeGb: 75
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -81,6 +85,7 @@ steps:
       provider: gcp
       machineType: n2-standard-32
       preemptible: true
+      diskSizeGb: 75
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -97,6 +102,7 @@ steps:
       diskType: 'hyperdisk-balanced'
       preemptible: true
       spotZones: us-central1-a,us-central1-b,us-central1-c
+      diskSizeGb: 75
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -111,6 +117,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      diskSizeGb: 75
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -128,6 +135,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      diskSizeGb: 75
     timeout_in_minutes: 80
     retry:
       automatic:
@@ -143,6 +151,7 @@ steps:
       imageProject: elastic-images-prod
       provider: gcp
       machineType: n2-standard-2
+      diskSizeGb: 75
     timeout_in_minutes: 10
     depends_on:
       - build
@@ -159,6 +168,7 @@ steps:
       imageProject: elastic-images-prod
       provider: gcp
       machineType: n2-standard-2
+      diskSizeGb: 75
     timeout_in_minutes: 10
     env:
       JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/test/jest.sh'

.buildkite/pipelines/pull_request/base.yml

@@ -4,6 +4,7 @@ steps:
     timeout_in_minutes: 10
     agents:
       machineType: n2-standard-2
+      diskSizeGb: 75
 
   - wait
 
@@ -26,6 +27,7 @@ steps:
     agents:
       machineType: n2-highcpu-8
       preemptible: true
+      diskSizeGb: 75
     key: quick_checks
     timeout_in_minutes: 60
     retry:
@@ -39,6 +41,7 @@ steps:
     agents:
       machineType: n2-standard-2
       preemptible: true
+      diskSizeGb: 75
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -50,6 +53,7 @@ steps:
     agents:
       machineType: n2-standard-16
       preemptible: true
+      diskSizeGb: 75
     key: linting
     timeout_in_minutes: 60
     retry:
@@ -62,6 +66,7 @@ steps:
     agents:
       machineType: n2-standard-32
       preemptible: true
+      diskSizeGb: 75
     key: linting_with_types
     timeout_in_minutes: 60
     retry:
@@ -74,6 +79,7 @@ steps:
     agents:
       machineType: n2-standard-4
       preemptible: true
+      diskSizeGb: 75
     key: check_oas_snapshot
     timeout_in_minutes: 60
     retry:
@@ -88,6 +94,7 @@ steps:
       diskType: 'hyperdisk-balanced'
       preemptible: true
       spotZones: us-central1-a,us-central1-b,us-central1-c
+      diskSizeGb: 75
     key: check_types
     timeout_in_minutes: 60
     retry:
@@ -101,6 +108,7 @@ steps:
     label: Mark CI Stats as ready
     agents:
       machineType: n2-standard-2
+      diskSizeGb: 75
     timeout_in_minutes: 10
     depends_on:
       - build
@@ -114,6 +122,7 @@ steps:
     label: 'Pick Test Group Run Order'
     agents:
       machineType: n2-standard-2
+      diskSizeGb: 75
     timeout_in_minutes: 10
     env:
       JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/test/jest.sh'
@@ -129,6 +138,7 @@ steps:
     agents:
       machineType: n2-standard-4
       preemptible: true
+      diskSizeGb: 75
     key: build_api_docs
     timeout_in_minutes: 90
     retry:

.buildkite/scripts/pipelines/pull_request/pipeline.ts

@@ -58,27 +58,27 @@ const getPipeline = (filename: string, removeSteps = true) => {
     if (
       (await doAnyChangesMatch([
         /^src\/plugins\/data/,
-        /^x-pack\/plugins\/actions/,
-        /^x-pack\/plugins\/alerting/,
-        /^x-pack\/plugins\/event_log/,
-        /^x-pack\/plugins\/rule_registry/,
-        /^x-pack\/plugins\/task_manager/,
+        /^x-pack\/platform\/plugins\/shared\/actions/,
+        /^x-pack\/platform\/plugins\/shared\/alerting/,
+        /^x-pack\/platform\/plugins\/shared\/event_log/,
+        /^x-pack\/platform\/plugins\/shared\/rule_registry/,
+        /^x-pack\/platform\/plugins\/shared\/task_manager/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
     ) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/response_ops.yml'));
     }
 
     if (
-      (await doAnyChangesMatch([/^x-pack\/plugins\/cases/])) ||
+      (await doAnyChangesMatch([/^x-pack\/platform\/plugins\/shared\/cases/])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
     ) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/response_ops_cases.yml'));
     }
 
     if (
       (await doAnyChangesMatch([
-        /^x-pack\/plugins\/observability_solution\/apm/,
+        /^x-pack\/solutions\/observability\/plugins\/apm/,
         /^packages\/kbn-apm-synthtrace/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
@@ -88,7 +88,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
 
     if (
       (await doAnyChangesMatch([
-        /^x-pack\/plugins\/observability_solution\/inventory/,
+        /^x-pack\/solutions\/observability\/plugins\/inventory/,
         /^packages\/kbn-apm-synthtrace/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
@@ -99,7 +99,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
     if (
       (await doAnyChangesMatch([
         /^x-pack\/solutions\/observability\/plugins\/observability_onboarding/,
-        /^x-pack\/plugins\/fleet/,
+        /^x-pack\/platform\/plugins\/shared\/fleet/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
     ) {
@@ -109,14 +109,17 @@ const getPipeline = (filename: string, removeSteps = true) => {
     }
 
     if (
-      (await doAnyChangesMatch([/^x-pack\/plugins\/observability_solution\/profiling/])) ||
+      (await doAnyChangesMatch([/^x-pack\/solutions\/observability\/plugins\/profiling/])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
     ) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/profiling_cypress.yml'));
     }
 
     if (
-      (await doAnyChangesMatch([/^x-pack\/plugins\/fleet/, /^x-pack\/test\/fleet_cypress/])) ||
+      (await doAnyChangesMatch([
+        /^x-pack\/platform\/plugins\/shared\/fleet/,
+        /^x-pack\/test\/fleet_cypress/,
+      ])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
     ) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/fleet_cypress.yml'));
@@ -166,9 +169,9 @@ const getPipeline = (filename: string, removeSteps = true) => {
         /^x-pack\/platform\/packages\/shared\/ai-infra/,
         /^x-pack\/platform\/plugins\/shared\/ai_infra/,
         /^x-pack\/platform\/plugins\/shared\/inference/,
-        /^x-pack\/plugins\/stack_connectors\/server\/connector_types\/bedrock/,
-        /^x-pack\/plugins\/stack_connectors\/server\/connector_types\/gemini/,
-        /^x-pack\/plugins\/stack_connectors\/server\/connector_types\/openai/,
+        /^x-pack\/platform\/plugins\/shared\/stack_connectors\/server\/connector_types\/bedrock/,
+        /^x-pack\/platform\/plugins\/shared\/stack_connectors\/server\/connector_types\/gemini/,
+        /^x-pack\/platform\/plugins\/shared\/stack_connectors\/server\/connector_types\/openai/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:all-gen-ai-suites')
     ) {
@@ -249,19 +252,19 @@ const getPipeline = (filename: string, removeSteps = true) => {
       (await doAnyChangesMatch([
         /^package.json/,
         /^packages\/kbn-securitysolution-.*/,
-        /^x-pack\/plugins\/alerting/,
+        /^x-pack\/platform\/plugins\/shared\/alerting/,
         /^x-pack\/plugins\/data_views\/common/,
         /^x-pack\/solutions\/security\/plugins\/lists/,
-        /^x-pack\/plugins\/rule_registry\/common/,
+        /^x-pack\/platform\/plugins\/shared\/rule_registry\/common/,
         /^x-pack\/solutions\/security\/plugins\/security_solution/,
         /^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
         /^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
-        /^x-pack\/plugins\/task_manager/,
+        /^x-pack\/platform\/plugins\/shared\/task_manager/,
         /^x-pack\/solutions\/security\/plugins\/timelines/,
-        /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
-        /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/context\/actions_connectors_context\.tsx/,
-        /^x-pack\/plugins\/triggers_actions_ui\/server\/connector_types\/openai/,
-        /^x-pack\/plugins\/triggers_actions_ui\/server\/connector_types\/bedrock/,
+        /^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
+        /^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/public\/application\/context\/actions_connectors_context\.tsx/,
+        /^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/server\/connector_types\/openai/,
+        /^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/server\/connector_types\/bedrock/,
         /^x-pack\/plugins\/usage_collection\/public/,
         /^x-pack\/solutions\/security\/plugins\/elastic_assistant/,
         /^x-pack\/solutions\/security\/packages/,
@@ -299,7 +302,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
         /^packages\/kbn-es-query/,
         /^packages\/kbn-i18n/,
         /^packages\/kbn-i18n-react/,
-        /^packages\/kbn-grouping/,
+        /^src\/platform\/packages\/shared\/kbn-grouping/,
         /^packages\/kbn-resizable-layout/,
         /^packages\/kbn-rison/,
         /^src\/platform\/packages\/shared\/kbn-rule-data-utils/,
@@ -332,19 +335,19 @@ const getPipeline = (filename: string, removeSteps = true) => {
         /^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant/,
         /^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant-common/,
         /^x-pack\/solutions\/security\/packages/,
-        /^x-pack\/plugins\/alerting/,
-        /^x-pack\/plugins\/cases/,
+        /^x-pack\/platform\/plugins\/shared\/alerting/,
+        /^x-pack\/platform\/plugins\/shared\/cases/,
         /^x-pack\/plugins\/data_views\/common/,
         /^x-pack\/solutions\/security\/plugins\/elastic_assistant/,
         /^x-pack\/solutions\/security\/plugins\/lists/,
-        /^x-pack\/plugins\/rule_registry\/common/,
+        /^x-pack\/platform\/plugins\/shared\/rule_registry\/common/,
         /^x-pack\/solutions\/security\/plugins\/security_solution/,
         /^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
         /^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
-        /^x-pack\/plugins\/task_manager/,
+        /^x-pack\/platform\/plugins\/shared\/task_manager/,
         /^x-pack\/solutions\/security\/plugins\/threat_intelligence/,
         /^x-pack\/solutions\/security\/plugins\/timelines/,
-        /^x-pack\/plugins\/triggers_actions_ui/,
+        /^x-pack\/platform\/plugins\/shared\/triggers_actions_ui/,
         /^x-pack\/plugins\/usage_collection\/public/,
         /^x-pack\/test\/functional\/es_archives\/security_solution/,
         /^x-pack\/test\/security_solution_cypress/,

.buildkite/scripts/steps/checks/event_log.sh

@@ -28,6 +28,6 @@ else
   git clone --depth 1 -b $ECS_STABLE_VERSION https://github.com/elastic/ecs.git ../ecs
 fi
 
-node x-pack/plugins/event_log/scripts/create_schemas.js
+node x-pack/platform/plugins/shared/event_log/scripts/create_schemas.js
 
-check_for_changed_files 'node x-pack/plugins/event_log/scripts/create_schemas.js' false 'Follow the directions in x-pack/plugins/event_log/generated/README.md to make schema changes for the event log.'
+check_for_changed_files 'node x-pack/platform/plugins/shared/event_log/scripts/create_schemas.js' false 'Follow the directions in x-pack/platform/plugins/shared/event_log/generated/README.md to make schema changes for the event log.'

.buildkite/scripts/steps/es_serverless/promote_es_serverless_image.sh

@@ -72,7 +72,7 @@ EOT
 
 cat << EOF | buildkite-agent pipeline upload
 steps:
-  - label: "Builds Kibana VM images for cache update"
+  - label: "Update cache for ES serverless image"
     trigger: kibana-vm-images
     async: true
     build:

.buildkite/scripts/steps/es_snapshots/promote.sh

@@ -16,14 +16,15 @@ ts-node "$(dirname "${0}")/promote_manifest.ts" "$ES_SNAPSHOT_MANIFEST"
 if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
   echo "--- Trigger agent packer cache pipeline"
   ts-node .buildkite/scripts/steps/trigger_pipeline.ts kibana-agent-packer-cache main
-  cat << EOF | buildkite-agent pipeline upload
+fi
+
+cat << EOF | buildkite-agent pipeline upload
 steps:
-  - label: "Builds Kibana VM images for cache update"
+  - label: "Update cache for ES $BUILDKITE_BRANCH snapshot"
     trigger: kibana-vm-images
     async: true
     build:
       env:
         IMAGES_CONFIG: "kibana/images.yml"
         RETRY: "1"
 EOF
-fi