Merge branch 'main' into fix/Kibana-server-is-not-restarting-when-dur…

…ing-development

.buildkite/ftr_platform_stateful_configs.yml

@@ -183,6 +183,7 @@ enabled:
   - x-pack/test/fleet_api_integration/config.agent.ts
   - x-pack/test/fleet_api_integration/config.agent_policy.ts
   - x-pack/test/fleet_api_integration/config.epm.ts
+  - x-pack/test/fleet_api_integration/config.event_ingested.ts
   - x-pack/test/fleet_api_integration/config.fleet.ts
   - x-pack/test/fleet_api_integration/config.package_policy.ts
   - x-pack/test/fleet_api_integration/config.space_awareness.ts

.buildkite/pipeline-resource-definitions/_templates/_new_pipeline.yml

@@ -44,7 +44,6 @@ spec:
       repository: elastic/kibana
       # Point to a pipeline implementation, detailing the pipeline steps to run
       pipeline_file: .buildkite/pipelines/your-pipeline-name.yml
-      skip_intermediate_builds: false
       provider_settings:
         prefix_pull_request_fork_branch_names: false
         skip_pull_request_builds_for_existing_commits: true

.buildkite/pipeline-resource-definitions/kibana-api-docs.yml

@@ -27,7 +27,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/build_api_docs.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/kibana-apis-capacity-testing-daily.yml

@@ -27,7 +27,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/scalability/api_capacity_testing_daily.yml
-      skip_intermediate_builds: false
       provider_settings:
         trigger_mode: none
         build_branches: true

.buildkite/pipeline-resource-definitions/kibana-artifacts-snapshot.yml

@@ -25,7 +25,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/artifacts.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/kibana-artifacts-staging.yml

@@ -25,7 +25,6 @@ spec:
       allow_rebuilds: true
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/artifacts.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/kibana-artifacts-trigger.yml

@@ -26,7 +26,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/artifacts_trigger.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

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

@@ -27,7 +27,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/chrome_forward_testing.yml
-      skip_intermediate_builds: true
       provider_settings:
         prefix_pull_request_fork_branch_names: false
         skip_pull_request_builds_for_existing_commits: true

.buildkite/pipeline-resource-definitions/kibana-coverage-daily.yml

@@ -29,7 +29,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/code_coverage/daily.yml
-      skip_intermediate_builds: false
       provider_settings:
         prefix_pull_request_fork_branch_names: false
         skip_pull_request_builds_for_existing_commits: true

.buildkite/pipeline-resource-definitions/kibana-deploy-project.yml

@@ -26,7 +26,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/serverless_deployment/project-build-and-deploy-pr.yml
-      skip_intermediate_builds: true
       provider_settings:
         build_pull_requests: true
         prefix_pull_request_fork_branch_names: false

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

@@ -27,7 +27,6 @@ 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-resource-definitions/kibana-es-serverless-snapshots.yml

@@ -28,7 +28,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_serverless/verify_es_serverless_image.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml

@@ -26,7 +26,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false
@@ -96,7 +95,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false
@@ -146,7 +144,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/kibana-esql-grammar-sync.yml

@@ -26,7 +26,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/esql_grammar_sync.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/kibana-flaky.yml

@@ -22,7 +22,6 @@ spec:
       default_branch: refs/pull/INSERT_PR_NUMBER/head
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/flaky_tests/pipeline.sh
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: true
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/kibana-fleet-packages-daily.yml

@@ -26,7 +26,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/fleet/packages_daily.yml
-      skip_intermediate_builds: false
       provider_settings:
         trigger_mode: none
         publish_commit_status: false

.buildkite/pipeline-resource-definitions/kibana-performance-daily.yml

@@ -27,7 +27,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/performance/daily.yml
-      skip_intermediate_builds: false
       provider_settings:
         trigger_mode: none
         build_branches: true

.buildkite/pipeline-resource-definitions/kibana-pr.yml

@@ -29,7 +29,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/scripts/pipelines/pull_request/pipeline.sh
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: true

.buildkite/pipeline-resource-definitions/kibana-purge-cloud-deployments.yml

@@ -26,7 +26,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/purge_cloud_deployments.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/kibana-serverless-release-testing.yml

@@ -26,7 +26,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_serverless/emergency_release_branch_testing.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: true
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/kibana-serverless-release.yml

@@ -23,7 +23,6 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       default_branch: main
       allow_rebuilds: false
-      skip_intermediate_builds: false
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/serverless_deployment/run_serverless_release_assistant.yml
       provider_settings:

.buildkite/pipeline-resource-definitions/kibana-vm-images.yml

@@ -24,7 +24,6 @@ spec:
       default_branch: main
       repository: elastic/ci-agent-images
       pipeline_file: vm-images/.buildkite/pipeline.yml
-      skip_intermediate_builds: false
       provider_settings:
         trigger_mode: none
       schedules:

.buildkite/pipeline-resource-definitions/scalability_testing-daily.yml

@@ -27,7 +27,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/scalability/daily.yml
-      skip_intermediate_builds: false
       provider_settings:
         trigger_mode: none
         build_branches: true

.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-defend-workflows.yml

@@ -17,7 +17,6 @@ spec:
     spec:
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_defend_workflows.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-detection-engine.yml

@@ -17,7 +17,6 @@ spec:
     spec:
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_detection_engine.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-entity-analytics.yml

@@ -17,7 +17,6 @@ spec:
     spec:
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_entity_analytics.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-explore.yml

@@ -17,7 +17,6 @@ spec:
     spec:
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_explore.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-gen-ai.yml

@@ -17,7 +17,6 @@ spec:
     spec:
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_gen_ai.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-investigations.yml

@@ -17,7 +17,6 @@ spec:
     spec:
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_investigations.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-rule-management.yml

@@ -17,7 +17,6 @@ spec:
     spec:
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_rule_management.yml
-      skip_intermediate_builds: false
       provider_settings:
         build_branches: false
         build_pull_requests: false

.buildkite/pipeline-resource-definitions/trigger-version-dependent-jobs.yml

@@ -31,7 +31,6 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.sh
-      skip_intermediate_builds: false
       provider_settings:
         prefix_pull_request_fork_branch_names: false
         skip_pull_request_builds_for_existing_commits: true

.buildkite/pipelines/fips.yml

@@ -40,14 +40,15 @@ steps:
       machineType: n2-standard-2
       preemptible: true
 
-  - command: .buildkite/scripts/steps/fips/smoke_test.sh
-    label: 'Pick Smoke Test Group Run Order'
+  - command: .buildkite/scripts/steps/test/pick_test_group_run_order.sh
+    label: 'Pick Test Group Run Order'
     depends_on: build
     timeout_in_minutes: 10
     env:
       FTR_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/ftr_configs.sh'
       FTR_EXTRA_ARGS: '$FTR_EXTRA_ARGS'
-      LIMIT_CONFIG_TYPE: 'functional'
+      JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/test/jest.sh'
+      JEST_INTEGRATION_SCRIPT: '.buildkite/scripts/steps/test/jest_integration.sh'
     retry:
       automatic:
         - exit_status: '*'

.buildkite/pipelines/on_merge.yml

@@ -493,6 +493,21 @@ steps:
         - exit_status: '-1'
           limit: 3
 
+  - command: .buildkite/scripts/steps/openapi_publishing/publish_oas_docs.sh
+    label: 'Publish OAS docs to bump.sh'
+    agents:
+      image: family/kibana-ubuntu-2004
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n2-standard-2
+      preemptible: true
+    timeout_in_minutes: 60
+    soft_fail: true
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
   - command: .buildkite/scripts/steps/bazel_cache/bootstrap_linux.sh
     label: 'Populate local dev bazel cache (Linux)'
     agents:

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

@@ -77,6 +77,6 @@ steps:
     async: true
     build:
       env:
-        IMAGES_CONFIG="kibana/images.yml"
-        RETRY="1"
+        IMAGES_CONFIG: "kibana/images.yml"
+        RETRY: "1"
 EOF

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

@@ -23,7 +23,7 @@ steps:
     async: true
     build:
       env:
-        IMAGES_CONFIG="kibana/images.yml"
-        RETRY="1"
+        IMAGES_CONFIG: "kibana/images.yml"
+        RETRY: "1"
 EOF
 fi

.buildkite/scripts/steps/openapi_bundling/final_merge.sh

@@ -4,8 +4,16 @@ set -euo pipefail
 
 source .buildkite/scripts/common/util.sh
 
+cur_dir=$(pwd)
+cd oas_docs
+
+echo --- Installing NPM modules
+npm install
+
 echo --- Merge Kibana OpenAPI specs
+make api-docs
+# make api-docs-lint <-- Relies on JSONPath version with RCE vulnerabilities based on `npm audit`, https://github.com/advisories/GHSA-pppg-cpfq-h7wr
 
-(cd oas_docs && make api-docs && make api-docs-lint)
+cd "$cur_dir"
 
 check_for_changed_files "make api-docs" true