Merge branch 'main' into embeddablesRebuild/incomingEmbeddable

.buildkite/ftr_configs.yml

@@ -122,6 +122,7 @@ enabled:
   - test/functional/apps/home/config.ts
   - test/functional/apps/kibana_overview/config.ts
   - test/functional/apps/management/config.ts
+  - test/functional/apps/navigation/config.ts
   - test/functional/apps/saved_objects_management/config.ts
   - test/functional/apps/sharing/config.ts
   - test/functional/apps/status_page/config.ts
@@ -446,24 +447,25 @@ enabled:
   - x-pack/test_serverless/functional/test_suites/security/common_configs/config.group4.ts
   - x-pack/test_serverless/functional/test_suites/security/common_configs/config.group5.ts
   - x-pack/test_serverless/functional/test_suites/security/common_configs/config.group6.ts
-  - x-pack/performance/journeys/ecommerce_dashboard.ts
-  - x-pack/performance/journeys/ecommerce_dashboard_map_only.ts
-  - x-pack/performance/journeys/flight_dashboard.ts
-  - x-pack/performance/journeys/login.ts
-  - x-pack/performance/journeys/many_fields_discover.ts
-  - x-pack/performance/journeys/many_fields_lens_editor.ts
-  - x-pack/performance/journeys/many_fields_transform.ts
-  - x-pack/performance/journeys/tsdb_logs_data_visualizer.ts
-  - x-pack/performance/journeys/promotion_tracking_dashboard.ts
-  - x-pack/performance/journeys/web_logs_dashboard.ts
-  - x-pack/performance/journeys/data_stress_test_lens.ts
-  - x-pack/performance/journeys/ecommerce_dashboard_saved_search_only.ts
-  - x-pack/performance/journeys/ecommerce_dashboard_tsvb_gauge_only.ts
-  - x-pack/performance/journeys/dashboard_listing_page.ts
-  - x-pack/performance/journeys/tags_listing_page.ts
-  - x-pack/performance/journeys/cloud_security_dashboard.ts
-  - x-pack/performance/journeys/apm_service_inventory.ts
-  - x-pack/performance/journeys/infra_hosts_view.ts
+  - x-pack/performance/journeys_e2e/aiops_log_rate_analysis.ts
+  - x-pack/performance/journeys_e2e/ecommerce_dashboard.ts
+  - x-pack/performance/journeys_e2e/ecommerce_dashboard_map_only.ts
+  - x-pack/performance/journeys_e2e/flight_dashboard.ts
+  - x-pack/performance/journeys_e2e/login.ts
+  - x-pack/performance/journeys_e2e/many_fields_discover.ts
+  - x-pack/performance/journeys_e2e/many_fields_lens_editor.ts
+  - x-pack/performance/journeys_e2e/many_fields_transform.ts
+  - x-pack/performance/journeys_e2e/tsdb_logs_data_visualizer.ts
+  - x-pack/performance/journeys_e2e/promotion_tracking_dashboard.ts
+  - x-pack/performance/journeys_e2e/web_logs_dashboard.ts
+  - x-pack/performance/journeys_e2e/data_stress_test_lens.ts
+  - x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts
+  - x-pack/performance/journeys_e2e/ecommerce_dashboard_tsvb_gauge_only.ts
+  - x-pack/performance/journeys_e2e/dashboard_listing_page.ts
+  - x-pack/performance/journeys_e2e/tags_listing_page.ts
+  - x-pack/performance/journeys_e2e/cloud_security_dashboard.ts
+  - x-pack/performance/journeys_e2e/apm_service_inventory.ts
+  - x-pack/performance/journeys_e2e/infra_hosts_view.ts
   - x-pack/test/custom_branding/config.ts
   - x-pack/test/profiling_api_integration/cloud/config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/ess.config.ts

.buildkite/pipelines/emergency_release.yml

@@ -17,3 +17,4 @@ steps:
       env:
         REMOTE_SERVICE_CONFIG: "${EMERGENCY_RELEASE_REMOTE_SERVICE_CONFIG}"
         SERVICE_COMMIT_HASH: "${VERSION}"
+        DRY_RUN: "${DRY_RUN:-false}"

.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml

@@ -167,7 +167,7 @@ steps:
           queue: n2-4-virt
         depends_on: build
         timeout_in_minutes: 60
-        parallelism: 6
+        parallelism: 10
         retry:
           automatic:
             - exit_status: '*'

.buildkite/scripts/common/env.sh

@@ -72,6 +72,9 @@ export TEST_BROWSER_HEADLESS=1
 
 export ELASTIC_APM_ENVIRONMENT=ci
 export ELASTIC_APM_TRANSACTION_SAMPLE_RATE=0.1
+export ELASTIC_APM_SERVER_URL=https://kibana-ci-apm.apm.us-central1.gcp.cloud.es.io
+# Not really a secret, if APM supported public auth we would use it and APM requires that we use this name
+export ELASTIC_APM_SECRET_TOKEN=7YKhoXsO4MzjhXjx2c
 
 if is_pr; then
   if is_pr_with_label "ci:collect-apm"; then

.buildkite/scripts/common/setup_job_env.sh

@@ -122,12 +122,6 @@ EOF
 
   SONAR_LOGIN=$(vault_get sonarqube token)
   export SONAR_LOGIN
-
-  ELASTIC_APM_SERVER_URL=$(vault_get project-kibana-ci-apm apm_server_url)
-  export ELASTIC_APM_SERVER_URL
-
-  ELASTIC_APM_API_KEY=$(vault_get project-kibana-ci-apm apm_server_api_key)
-  export ELASTIC_APM_API_KEY
 }
 
 # Set up GCS Service Account for CDN

.buildkite/scripts/lifecycle/post_build.sh

@@ -9,7 +9,10 @@ if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
   "$(dirname "${0}")/commit_status_complete.sh"
 fi
 
-ts-node "$(dirname "${0}")/ci_stats_complete.ts"
+# Skip indexing the same metrics twice
+if [[ "${BUILDKITE_RETRY_COUNT:-0}" == "0" ]]; then
+  ts-node "$(dirname "${0}")/ci_stats_complete.ts"
+fi
 
 if [[ "${GITHUB_PR_NUMBER:-}" ]]; then
   DOCS_CHANGES_URL="https://kibana_bk_$GITHUB_PR_NUMBER}.docs-preview.app.elstc.co/diff"

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

@@ -233,6 +233,7 @@ const uploadPipeline = (pipelineContent: string | object) => {
         /^x-pack\/packages\/security-solution/,
         /^x-pack\/packages\/kbn-elastic-assistant/,
         /^x-pack\/packages\/kbn-elastic-assistant-common/,
+        /^x-pack\/test\/functional\/es_archives\/security_solution/,
         /^x-pack\/test\/security_solution_cypress/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
@@ -271,6 +272,7 @@ const uploadPipeline = (pipelineContent: string | object) => {
         /^x-pack\/packages\/security-solution/,
         /^x-pack\/packages\/kbn-elastic-assistant/,
         /^x-pack\/packages\/kbn-elastic-assistant-common/,
+        /^x-pack\/test\/functional\/es_archives\/security_solution/,
         /^x-pack\/test\/security_solution_cypress/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')

.buildkite/scripts/serverless/create_deploy_tag/generate_gpctl_trigger.ts

@@ -28,15 +28,12 @@ function uploadTriggerStep(commitSha: string) {
       env: {
         SERVICE_COMMIT_HASH: commitSha.slice(0, 12),
         REMOTE_SERVICE_CONFIG,
+        ...(IS_DRY_RUN ? { DRY_RUN: 'true' } : {}),
       },
     },
   };
 
-  if (IS_DRY_RUN) {
-    console.log('Dry run: skipping upload of GPCTL trigger step. Step definition:', triggerStep);
-  } else {
-    buildkite.uploadSteps([triggerStep]);
-  }
+  buildkite.uploadSteps([triggerStep]);
 }
 
 main()

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

@@ -136,6 +136,7 @@ steps:
         SERVICE_COMMIT_HASH: "$GIT_ABBREV_COMMIT"
         SERVICE: kibana
         REMOTE_SERVICE_CONFIG: https://raw.githubusercontent.com/elastic/serverless-gitops/main/gen/gpctl/kibana/dev.yaml
+        DRY_RUN: "${DRY_RUN:-false}"
 EOF
 
 else

.buildkite/scripts/steps/functional/performance_playwright.sh

@@ -3,10 +3,30 @@
 set -euo pipefail
 
 source .buildkite/scripts/common/util.sh
+source .buildkite/scripts/common/setup_bazel.sh
 
 is_test_execution_step
 
-.buildkite/scripts/bootstrap.sh
+run_bootstrap() {
+    echo "Running yarn kbn bootstrap --force-install"
+    yarn kbn bootstrap --force-install
+}
+
+echo "--- yarn install and boostrap"
+if ! run_bootstrap; then
+  echo "--- bootstrap failed, trying again in 15 seconds"
+  sleep 15
+
+  # Most bootstrap failures will result in a problem inside node_modules that does not get fixed on the next bootstrap
+  # So, we should just delete node_modules in between attempts
+  rm -rf node_modules
+
+  run_bootstrap
+fi
+
+if [[ "$DISABLE_BOOTSTRAP_VALIDATION" != "true" ]]; then
+  check_for_changed_files 'yarn kbn bootstrap'
+fi
 
 # These tests are running on static workers so we have to make sure we delete previous build of Kibana
 rm -rf "$KIBANA_BUILD_LOCATION"

.buildkite/scripts/steps/functional/scalability_dataset_extraction.sh

@@ -15,7 +15,7 @@ OUTPUT_DIR="${KIBANA_DIR}/${OUTPUT_REL}"
 .buildkite/scripts/bootstrap.sh
 
 echo "--- Extract APM metrics"
-for journey in x-pack/performance/journeys/*; do
+for journey in x-pack/performance/journeys_e2e/*; do
   echo "Looking for journey=${journey} and BUILD_ID=${BUILD_ID} in APM traces"
 
   node scripts/extract_performance_testing_dataset \

.eslintrc.js

@@ -875,6 +875,7 @@ module.exports = {
         'x-pack/plugins/observability_solution/observability/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/observability_solution/exploratory_view/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/observability_solution/ux/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/observability_solution/slo/**/*.{js,mjs,ts,tsx}',
       ],
       rules: {
         'no-console': ['warn', { allow: ['error'] }],
@@ -897,6 +898,7 @@ module.exports = {
         'x-pack/plugins/observability_solution/apm/**/*.stories.*',
         'x-pack/plugins/observability_solution/observability/**/*.stories.*',
         'x-pack/plugins/observability_solution/exploratory_view/**/*.stories.*',
+        'x-pack/plugins/observability_solution/slo/**/*.stories.*',
       ],
       rules: {
         'react/function-component-definition': [
@@ -911,19 +913,7 @@ module.exports = {
     {
       files: [
         'x-pack/plugins/aiops/**/*.tsx',
-        'x-pack/plugins/infra/**/*.tsx',
-        'x-pack/plugins/observability_solution/apm/**/*.tsx',
-        'x-pack/plugins/observability_solution/dataset_quality/**/*.tsx',
-        'x-pack/plugins/observability_solution/exploratory_view/**/*.tsx',
-        'x-pack/plugins/observability_solution/infra/**/*.tsx',
-        'x-pack/plugins/observability_solution/observability/**/*.tsx',
-        'x-pack/plugins/observability_solution/observability_ai_assistant/**/*.tsx',
-        'x-pack/plugins/observability_solution/observability_onboarding/**/*.tsx',
-        'x-pack/plugins/observability_solution/observability_shared/**/*.tsx',
-        'x-pack/plugins/observability_solution/profiling/**/*.tsx',
-        'x-pack/plugins/observability_solution/synthetics/**/*.tsx',
-        'x-pack/plugins/observability_solution/uptime/**/*.tsx',
-        'x-pack/plugins/observability_solution/ux/**/*.tsx',
+        'x-pack/plugins/observability_solution/**/*.tsx',
         'src/plugins/ai_assistant_management/**/*.tsx',
       ],
       rules: {
@@ -932,16 +922,7 @@ module.exports = {
     },
     {
       files: [
-        'x-pack/plugins/observability_solution/apm/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/exploratory_view/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/infra/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/observability/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/observability_ai_assistant/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/observability_shared/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/profiling/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/synthetics/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/ux/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'src/plugins/ai_assistant_management/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
       ],
       rules: {