Merge branch 'main' into 231522-fix-slo-find-flaky

Author: fkanout

.backportrc.json

@@ -3,6 +3,7 @@
   "repoName": "kibana",
   "targetBranchChoices": [
     "main",
+    "9.2",
     "9.1",
     "9.0",
     "8.19",
@@ -58,7 +59,7 @@
     "backport"
   ],
   "branchLabelMapping": {
-    "^v9.2.0$": "main",
+    "^v9.3.0$": "main",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,

.buildkite/ftr_oblt_serverless_configs.yml

@@ -20,6 +20,8 @@ enabled:
   - x-pack/platform/test/serverless/api_integration/configs/observability/config.logs_essentials.group1.ts
   - x-pack/solutions/observability/test/serverless/api_integration/test_suites/fleet/config.ts
   - x-pack/solutions/observability/test/serverless/functional/configs/config.ts
+  - x-pack/solutions/observability/test/serverless/functional/configs/config.cases_and_rules.ts
+  - x-pack/solutions/observability/test/serverless/functional/configs/config.ml_and_discover.ts
   - x-pack/solutions/observability/test/serverless/functional/configs/config.logs_essentials.ts
   - x-pack/platform/test/serverless/functional/configs/observability/config.examples.ts
   - x-pack/solutions/observability/test/serverless/functional/configs/config.feature_flags.ts

.buildkite/ftr_platform_stateful_configs.yml

@@ -405,6 +405,7 @@ enabled:
   - x-pack/platform/test/encrypted_saved_objects_api_integration/config.ts
   - x-pack/platform/test/fleet_multi_cluster/config.ts
   - x-pack/platform/test/monitoring_api_integration/config.ts
+  - x-pack/platform/test/onechat_functional/config.ts
   - x-pack/platform/test/plugin_api_integration/config.ts
   - x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_basic.ts
   - x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_trial.ts

.buildkite/ftr_search_serverless_configs.yml

@@ -6,12 +6,13 @@ defaultQueue: 'n2-4-spot'
 enabled:
   - x-pack/solutions/search/test/serverless/api_integration/configs/config.ts
   - x-pack/solutions/search/test/serverless/api_integration/configs/config.feature_flags.ts
-  - x-pack/platform/test/serverless/api_integration/configs/search/config.group1.ts
   - x-pack/solutions/search/test/serverless/functional/configs/config.ts
-  - x-pack/platform/test/serverless/functional/configs/search/config.examples.ts
+  - x-pack/solutions/search/test/serverless/functional/configs/config.search_features.ts
   - x-pack/solutions/search/test/serverless/functional/configs/config.feature_flags.ts
   - x-pack/solutions/search/test/serverless/functional/configs/config.screenshots.ts
   - x-pack/solutions/search/test/serverless/functional/configs/config.nav_v2.ts
+  - x-pack/platform/test/serverless/api_integration/configs/search/config.group1.ts
+  - x-pack/platform/test/serverless/functional/configs/search/config.examples.ts
   - x-pack/platform/test/serverless/functional/configs/search/config.saved_objects_management.ts
   - x-pack/platform/test/serverless/functional/configs/search/config.context_awareness.ts
   - x-pack/platform/test/serverless/functional/configs/search/config.config_compat_mode.ts
@@ -28,4 +29,3 @@ enabled:
   - x-pack/platform/test/serverless/functional/configs/search/config.group11.ts
   - x-pack/platform/test/serverless/functional/configs/search/config.group12.ts
   - x-pack/platform/test/onechat_api_integration/configs/config.serverless.ts
-

.buildkite/ftr_search_stateful_configs.yml

@@ -5,6 +5,7 @@ disabled:
 defaultQueue: 'n2-4-spot'
 enabled:
   - x-pack/solutions/search/test/functional_search/config.ts
+  - x-pack/solutions/search/test/functional_search/config/config.basic.ts
   - x-pack/solutions/search/test/functional_search/config/config.search_playground.ts
   - x-pack/solutions/search/test/functional_search/config/config.feature_flags.ts
   - x-pack/solutions/search/test/api_integration/apis/search_playground/config.ts

.buildkite/pipeline-resource-definitions/kibana-console-definitions-sync.yml

@@ -22,7 +22,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-management'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: false
-      branch_configuration: main 9.1 9.0 8.19 8.18
+      branch_configuration: main 9.2 9.1 9.0 8.19 8.18
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/console_definitions_sync.yml

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

@@ -22,7 +22,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.1 9.0 8.19 8.18 7.17
+      branch_configuration: main 9.2 9.1 9.0 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -48,6 +48,10 @@ spec:
           cronline: 0 22 * * * America/New_York
           message: Daily build
           branch: main
+        Daily build (9.2):
+          cronline: 0 22 * * * America/New_York
+          message: Daily build
+          branch: '9.2'
         Daily build (9.1):
           cronline: 0 22 * * * America/New_York
           message: Daily build
@@ -95,7 +99,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.1 9.0 8.19 8.18 7.17
+      branch_configuration: main 9.2 9.1 9.0 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -144,7 +148,7 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         REPORT_FAILED_TESTS_TO_GITHUB: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.1 9.0 8.19 8.18 7.17
+      branch_configuration: main 9.2 9.1 9.0 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml

.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml

@@ -23,7 +23,7 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         SCOUT_REPORTER_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.1 9.0 8.19 8.18 7.17
+      branch_configuration: main 9.2 9.1 9.0 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml

.buildkite/pipeline-resource-definitions/kibana-on-merge.yml

@@ -26,7 +26,7 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         SCOUT_REPORTER_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.1 9.0 8.19 8.18 7.17
+      branch_configuration: main 9.2 9.1 9.0 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/on_merge.yml

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

@@ -338,7 +338,7 @@ export async function pickTestGroupRunOrder() {
     : [];
 
   const jestIntegrationConfigs = LIMIT_CONFIG_TYPE.includes('integration')
-    ? globby.sync(getJestConfigGlobs(['**/jest.integration.config.js', '!**/__fixtures__/**']), {
+    ? globby.sync(getJestConfigGlobs(['**/jest.integration.config.*js', '!**/__fixtures__/**']), {
         cwd: process.cwd(),
         absolute: false,
         ignore: DISABLED_JEST_CONFIGS,
@@ -507,7 +507,7 @@ export async function pickTestGroupRunOrder() {
             key: 'jest',
             agents: {
               ...expandAgentQueue('n2-4-spot'),
-              diskSizeGb: 85,
+              diskSizeGb: 100,
             },
             env: {
               SCOUT_TARGET_TYPE: 'local',