Merge branch 'main' into entity-store-management-redirect

.buildkite/ftr_platform_stateful_configs.yml

@@ -249,6 +249,7 @@ enabled:
   - x-pack/test/functional/apps/ml/permissions/config.ts
   - x-pack/test/functional/apps/ml/short_tests/config.ts
   - x-pack/test/functional/apps/ml/stack_management_jobs/config.ts
+  - x-pack/test/functional/apps/ml/memory_usage/config.ts
   - x-pack/test/functional/apps/monitoring/config.ts
   - x-pack/test/functional/apps/painless_lab/config.ts
   - x-pack/test/functional/apps/remote_clusters/config.ts
@@ -341,10 +342,10 @@ enabled:
   - x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
   - x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
   - x-pack/test/spaces_api_integration/spaces_only/config.ts
-  - x-pack/test/task_manager_claimer_mget/config.ts
+  - x-pack/test/task_manager_claimer_update_by_query/config.ts
   - x-pack/test/ui_capabilities/security_and_spaces/config.ts
   - x-pack/test/ui_capabilities/spaces_only/config.ts
-  - x-pack/test/upgrade_assistant_integration/config.js
+  - x-pack/test/upgrade_assistant_integration/config.ts
   - x-pack/test/usage_collection/config.ts
   - x-pack/performance/journeys_e2e/aiops_log_rate_analysis.ts
   - x-pack/performance/journeys_e2e/ecommerce_dashboard.ts

.buildkite/ftr_security_serverless_configs.yml

@@ -1,17 +1,17 @@
 disabled:
   # Base config files, only necessary to inform config finding script
-  - x-pack/test_serverless/functional/test_suites/security/cypress/security_config.base.ts
-  - x-pack/test_serverless/functional/test_suites/security/cypress/cypress.config.ts
   - x-pack/test/security_solution_api_integration/config/serverless/config.base.ts
   - x-pack/test/security_solution_api_integration/config/serverless/config.base.essentials.ts
   - x-pack/test/security_solution_api_integration/config/serverless/config.base.edr_workflows.ts
+  - x-pack/test/defend_workflows_cypress/serverless_config.base.ts
+  - x-pack/test/osquery_cypress/serverless_config.base.ts
 
   # Cypress configs, for now these are still run manually
   - x-pack/test/defend_workflows_cypress/serverless_config.ts
   - x-pack/test/osquery_cypress/serverless_cli_config.ts
-  - x-pack/test_serverless/functional/test_suites/security/cypress/security_config.ts
   - x-pack/test/security_solution_cypress/serverless_config.ts
 
+
   # Playwright
   - x-pack/test/security_solution_playwright/serverless_config.ts
 

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

@@ -53,12 +53,16 @@ spec:
           cronline: 0 22 * * * America/New_York
           message: Daily build
           branch: '8.x'
+        Daily build (8.16):
+          cronline: 0 22 * * * America/New_York
+          message: Daily build
+          branch: '8.16'
         Daily build (8.15):
           cronline: 0 22 * * * America/New_York
           message: Daily build
           branch: '8.15'
         Daily build (7.17):
-          cronline: 0 22 * * * America/New_York
+          cronline: 0 20 * * * America/New_York
           message: Daily build
           branch: '7.17'
       tags:

.buildkite/pipelines/chrome_forward_testing.yml

@@ -300,7 +300,7 @@ steps:
           limit: 1
 
   - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
-    label: 'Serverless Osquery Cypress Tests'
+    label: 'Osquery Cypress Tests on Serverless'
     agents:
       machineType: n2-standard-4
       preemptible: true

.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml

@@ -218,7 +218,7 @@ steps:
               limit: 1
 
       - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
-        label: "Serverless Osquery Cypress Tests"
+        label: "Osquery Cypress Tests on Serverless"
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
           image: family/kibana-ubuntu-2004

.buildkite/pipelines/on_merge.yml

@@ -405,7 +405,7 @@ steps:
           limit: 1
 
   - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
-    label: 'Serverless Osquery Cypress Tests'
+    label: 'Osquery Cypress Tests on Serverless'
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod

.buildkite/pipelines/pointer_compression.yml

@@ -339,7 +339,7 @@ steps:
           limit: 1
 
   - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
-    label: 'Serverless Osquery Cypress Tests'
+    label: 'Osquery Cypress Tests on Serverless'
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod

.buildkite/pipelines/pull_request/security_solution/defend_workflows.yml

@@ -31,16 +31,4 @@ steps:
     retry:
       automatic:
         - exit_status: '-1'
-          limit: 1
-#   status_exception: Native role management is not enabled in this Elasticsearch instance
-#  - command: .buildkite/scripts/steps/functional/security_serverless_defend_workflows.sh
-#    label: 'Serverless Security Defend Workflows Cypress Tests'
-#    agents:
-#      machineType: n2-standard-4
-#      preemptible: true
-#    depends_on: build
-#    timeout_in_minutes: 60
-#    retry:
-#      automatic:
-#        - exit_status: '-1'
-#          limit: 1
+          limit: 1

.buildkite/pipelines/pull_request/security_solution/osquery_cypress.yml

@@ -15,7 +15,7 @@ steps:
           limit: 1
 
   - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
-    label: 'Serverless Osquery Cypress Tests'
+    label: 'Osquery Cypress Tests on Serverless'
     agents:
       machineType: n2-standard-4
       preemptible: true

.buildkite/scripts/steps/checks.sh

@@ -12,6 +12,4 @@ fi
 .buildkite/scripts/steps/checks/saved_objects_definition_change.sh
 .buildkite/scripts/steps/code_generation/elastic_assistant_codegen.sh
 .buildkite/scripts/steps/code_generation/security_solution_codegen.sh
-.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
 .buildkite/scripts/steps/code_generation/osquery_codegen.sh
-.buildkite/scripts/steps/openapi_bundling/final_merge.sh

.buildkite/scripts/steps/checks/capture_oas_snapshot.sh

@@ -2,10 +2,11 @@
 
 set -euo pipefail
 
-.buildkite/scripts/bootstrap.sh
-
 source .buildkite/scripts/common/util.sh
 
+.buildkite/scripts/bootstrap.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
+
 echo --- Capture OAS snapshot
 cmd="node scripts/capture_oas_snapshot --include-path /api/status --include-path /api/alerting/rule/ --include-path /api/alerting/rules --include-path /api/actions --include-path /api/security/role --include-path /api/spaces --include-path /api/fleet"
 if is_pr && ! is_auto_commit_disabled; then
@@ -23,3 +24,6 @@ run_check() {
 retry 5 15 run_check
 
 check_for_changed_files "$cmd" true
+
+.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
+.buildkite/scripts/steps/openapi_bundling/final_merge.sh

.buildkite/scripts/steps/functional/apm_cypress.sh

@@ -8,6 +8,7 @@ APM_CYPRESS_RECORD_KEY="$(vault_get apm-cypress-dashboard-record-key CYPRESS_REC
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/download_build_artifacts.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
 
 export JOB=kibana-apm-cypress
 IS_FLAKY_TEST_RUNNER=${CLI_COUNT:-0}

.buildkite/scripts/steps/functional/inventory_cypress.sh

@@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/download_build_artifacts.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
 
 export JOB=kibana-inventory-onboarding-cypress
 

.buildkite/scripts/steps/functional/observability_onboarding_cypress.sh

@@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/download_build_artifacts.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
 
 export JOB=kibana-observability-onboarding-cypress
 

.buildkite/scripts/steps/functional/profiling_cypress.sh

@@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/download_build_artifacts.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
 
 export JOB=kibana-profiling-cypress
 

.buildkite/scripts/steps/functional/synthetics.sh

@@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/download_build_artifacts.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
 
 export JOB=kibana-uptime-playwright
 

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

@@ -7,6 +7,5 @@ source .buildkite/scripts/common/util.sh
 echo --- Merge Kibana OpenAPI specs
 
 (cd oas_docs && make api-docs && make api-docs-lint)
-(cd oas_docs && make api-docs-staging && make api-docs-lint)
 
-check_for_changed_files "make api-docs && make api-docs-staging" true
+check_for_changed_files "make api-docs" true

.buildkite/scripts/steps/storybooks/build_and_upload.ts

@@ -18,44 +18,45 @@ const STORYBOOKS = [
   'canvas',
   'cases',
   'cell_actions',
-  'coloring',
   'chart_icons',
+  'cloud_security_posture_packages',
+  'coloring',
   'content_management_examples',
   'custom_integrations',
   'dashboard_enhanced',
   'dashboard',
   'data',
-  'logs_explorer',
   'embeddable',
+  'esql_editor',
   'expression_error',
   'expression_image',
   'expression_metric',
   'expression_repeat_image',
   'expression_reveal_image',
   'expression_shape',
   'expression_tagcloud',
-  'management',
   'fleet',
   'grouping',
   'home',
   'infra',
   'kibana_react',
+  'language_documentation_popover',
   'lists',
-  'observability',
+  'logs_explorer',
+  'management',
   'observability_ai_assistant',
   'observability_inventory',
   'observability_shared',
+  'observability',
   'presentation',
-  'security_solution',
+  'random_sampling',
   'security_solution_packages',
+  'security_solution',
   'serverless',
   'shared_ux',
   'triggers_actions_ui',
   'ui_actions_enhanced',
-  'language_documentation_popover',
   'unified_search',
-  'random_sampling',
-  'esql_editor',
 ];
 
 const GITHUB_CONTEXT = 'Build and Publish Storybooks';

.eslintrc.js

@@ -643,6 +643,7 @@ module.exports = {
         'x-pack/test/*/*config.*ts',
         'x-pack/test/saved_object_api_integration/*/apis/**/*',
         'x-pack/test/ui_capabilities/*/tests/**/*',
+        'x-pack/test/upgrade_assistant_integration/**/*',
         'x-pack/test/performance/**/*.ts',
         '**/cypress.config.{js,ts}',
         'x-pack/test_serverless/**/config*.ts',
@@ -1977,6 +1978,54 @@ module.exports = {
         'max-classes-per-file': 'off',
       },
     },
+    {
+      files: [
+        'packages/kbn-reporting/common/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
+        'packages/kbn-reporting/export_types/pdf_common/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
+        'packages/kbn-reporting/export_types/pdf/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
+        'packages/kbn-reporting/export_types/png_common/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
+        'packages/kbn-reporting/export_types/png/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
+        'packages/kbn-reporting/public/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
+        'packages/kbn-reporting/server/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
+        'packages/shared-ux/page/analytics_no_data/types/**',
+        'scripts/create_observability_rules.js', // TODO - is importing "@kbn/observability-alerting-test-data" (observability/private)
+        'src/cli_setup/**', // TODO @kibana/operations - is importing "@kbn/interactive-setup-plugin" (platform/private)
+        'src/dev/build/tasks/install_chromium.ts', // TODO @kibana/operations - is importing "@kbn/screenshotting-plugin" (platform/private)
+        'src/plugins/ai_assistant_management/selection/**',
+        'src/plugins/dashboard/**',
+        'src/plugins/discover/**',
+        'test/**',
+        'x-pack/examples/exploratory_view_example/**',
+        'x-pack/examples/screenshotting_example/**',
+        'x-pack/examples/ui_actions_enhanced_examples/**',
+        'x-pack/packages/security-solution/data_table/**',
+        'x-pack/plugins/aiops/**',
+        'x-pack/plugins/data_quality/**',
+        'x-pack/plugins/ingest_pipelines/**',
+        'x-pack/plugins/ml/**',
+        'x-pack/plugins/monitoring/**',
+        'x-pack/plugins/observability_solution/infra/**',
+        'x-pack/plugins/observability_solution/inventory/**',
+        'x-pack/plugins/observability_solution/investigate_app/**',
+        'x-pack/plugins/observability_solution/investigate/**',
+        'x-pack/plugins/observability_solution/logs_shared/**',
+        'x-pack/plugins/observability_solution/metrics_data_access/**',
+        'x-pack/plugins/observability_solution/observability_ai_assistant_app/**',
+        'x-pack/plugins/observability_solution/observability_ai_assistant_management/**',
+        'x-pack/plugins/observability_solution/observability/**',
+        'x-pack/plugins/observability_solution/slo/**',
+        'x-pack/plugins/observability_solution/synthetics/e2e/**',
+        'x-pack/plugins/osquery/**',
+        'x-pack/plugins/search_assistant/**',
+        'x-pack/test_serverless/**',
+        'x-pack/test/**',
+        'x-pack/test/plugin_functional/plugins/resolver_test/**',
+      ],
+      rules: {
+        '@kbn/imports/no_group_crossing_manifests': 'warn',
+        '@kbn/imports/no_group_crossing_imports': 'warn',
+      },
+    },
   ],
 };