Skip to content

Commit bd87366

Browse files
authored
Merge branch 'main' into ci-label-deploy-aisoc
2 parents d17d9e5 + 69ce7b7 commit bd87366

9,463 files changed

Lines changed: 287545 additions & 164463 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.backportrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"repoName": "kibana",
44
"targetBranchChoices": [
55
"main",
6+
"9.1",
67
"9.0",
78
"8.19",
89
"8.18",
@@ -57,7 +58,7 @@
5758
"backport"
5859
],
5960
"branchLabelMapping": {
60-
"^v9.1.0$": "main",
61+
"^v9.2.0$": "main",
6162
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
6263
},
6364
"autoMerge": true,

.buildkite/ftr_oblt_serverless_configs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ disabled:
66
- x-pack/test_serverless/functional/test_suites/observability/cypress/config_headless.ts
77
- x-pack/test_serverless/functional/test_suites/observability/cypress/config_runner.ts
88

9+
# Observability AI Assistant local-only tests
10+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant_local.serverless.config.ts
11+
912
defaultQueue: 'n2-4-spot'
1013
enabled:
1114
- x-pack/test_serverless/api_integration/test_suites/observability/config.ts
@@ -14,7 +17,6 @@ enabled:
1417
- x-pack/test_serverless/api_integration/test_suites/observability/common_configs/config.group1.ts
1518
- x-pack/test_serverless/api_integration/test_suites/observability/common_configs/config.logs_essentials.group1.ts
1619
- x-pack/test_serverless/api_integration/test_suites/observability/fleet/config.ts
17-
- x-pack/test_serverless/api_integration/test_suites/observability/ai_assistant/config.ts
1820
- x-pack/test_serverless/functional/test_suites/observability/config.ts
1921
- x-pack/test_serverless/functional/test_suites/observability/config.logs_essentials.ts
2022
- x-pack/test_serverless/functional/test_suites/observability/config.examples.ts

.buildkite/ftr_oblt_stateful_configs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ disabled:
1919
- x-pack/solutions/observability/plugins/ux/e2e/synthetics_run.ts
2020
- x-pack/solutions/observability/plugins/slo/e2e/synthetics_run.ts
2121

22+
# Observability AI Assistant local-only tests
23+
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.ai_assistant_local.stateful.config.ts
24+
2225
defaultQueue: 'n2-4-spot'
2326
enabled:
2427
- x-pack/solutions/observability/test/alerting_api_integration/observability/config.ts
@@ -40,7 +43,6 @@ enabled:
4043
- x-pack/test/observability_functional/with_rac_write.config.ts
4144
- x-pack/test/observability_onboarding_api_integration/basic/config.ts
4245
- x-pack/test/observability_onboarding_api_integration/cloud/config.ts
43-
- x-pack/test/observability_ai_assistant_api_integration/enterprise/config.ts
4446
- x-pack/test/observability_ai_assistant_functional/enterprise/config.ts
4547
- x-pack/solutions/observability/test/api_integration/profiling/cloud/config.ts
4648
- x-pack/test/functional/apps/apm/config.ts

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ disabled:
77
- src/platform/test/functional/config.base.js
88
- src/platform/test/functional/firefox/config.base.ts
99
- x-pack/test/functional/config.base.js
10+
- x-pack/platform/test/functional/config.base.ts
1011
- x-pack/test/localization/config.base.ts
1112
- src/platform/test/server_integration/config.base.js
1213
- x-pack/test/functional_with_es_ssl/config.base.ts
@@ -21,20 +22,21 @@ disabled:
2122
- x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
2223
- x-pack/test/upgrade/config.ts
2324
- src/platform/test/functional/config.edge.js
25+
- x-pack/platform/test/functional/config.edge.ts
2426
- x-pack/test/functional/config.edge.js
2527

2628
# Configs that exist but weren't running in CI when this file was introduced
2729
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts
2830
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts
2931
- x-pack/platform/test/alerting_api_integration/spaces_only_legacy/config.ts
3032
- x-pack/test/cloud_integration/config.ts
31-
- x-pack/test/load/config.ts
32-
- x-pack/test/plugin_api_perf/config.js
33+
- x-pack/platform/test/load/config.ts
34+
- x-pack/platform/test/plugin_api_perf/config.ts
3335
- x-pack/test/screenshot_creation/config.ts
34-
- x-pack/test/fleet_packages/config.ts
36+
- x-pack/platform/test/fleet_packages/config.ts
3537

3638
# Scalability testing config that we run in its own pipeline
37-
- x-pack/test/scalability/config.ts
39+
- x-pack/platform/test/scalability/config.ts
3840

3941
# Cypress configs, for now these are still run manually
4042
- x-pack/test/fleet_cypress/cli_config.ts
@@ -49,6 +51,7 @@ disabled:
4951
# Gen AI suites, running with their own pipeline
5052
- x-pack/test/functional_gen_ai/inference/config.ts
5153

54+
5255
defaultQueue: 'n2-4-spot'
5356
enabled:
5457
- src/platform/test/accessibility/config.ts
@@ -88,6 +91,7 @@ enabled:
8891
- src/platform/test/functional/apps/discover/group10/config.ts
8992
- src/platform/test/functional/apps/discover/context_awareness/config.ts
9093
- src/platform/test/functional/apps/discover/observability/config.ts
94+
- src/platform/test/functional/apps/discover/tabs/config.ts
9195
- src/platform/test/functional/apps/getting_started/config.ts
9296
- src/platform/test/functional/apps/home/config.ts
9397
- src/platform/test/functional/apps/kibana_overview/config.ts
@@ -148,18 +152,17 @@ enabled:
148152
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/alerting/group2/config.ts
149153
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/alerting/group3/config.ts
150154
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/alerting/group4/config.ts
155+
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/alerting/group4/config_with_schedule_circuit_breaker.ts
151156
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/actions/config.ts
152157
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts
153-
- x-pack/test/api_integration_basic/config.ts
154158
- x-pack/test/api_integration/apis/cases/config.ts
155-
- x-pack/test/api_integration/apis/lists/config.ts
156159
- x-pack/test/api_integration/apis/security/config.ts
157160
- x-pack/test/banners_functional/config.ts
158-
- x-pack/test/cases_api_integration/security_and_spaces/config_basic.ts
159-
- x-pack/test/cases_api_integration/security_and_spaces/config_trial.ts
160-
- x-pack/test/cases_api_integration/security_and_spaces/config_trial_common.ts
161-
- x-pack/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts
162-
- x-pack/test/cases_api_integration/spaces_only/config.ts
161+
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_basic.ts
162+
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_trial.ts
163+
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_trial_common.ts
164+
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts
165+
- x-pack/platform/test/cases_api_integration/spaces_only/config.ts
163166
- x-pack/test/disable_ems/config.ts
164167
- x-pack/test/examples/config.ts
165168
- x-pack/test/fleet_api_integration/config.agent.ts
@@ -170,8 +173,8 @@ enabled:
170173
- x-pack/test/fleet_api_integration/config.package_policy.ts
171174
- x-pack/test/fleet_api_integration/config.space_awareness.ts
172175
- x-pack/test/fleet_functional/config.ts
173-
- x-pack/test/fleet_tasks/config.ts
174-
- x-pack/test/ftr_apis/security_and_spaces/config.ts
176+
- x-pack/platform/test/fleet_tasks/config.ts
177+
- x-pack/platform/test/ftr_apis/security_and_spaces/config.ts
175178
- x-pack/test/functional_basic/apps/ml/permissions/config.ts
176179
- x-pack/test/functional_basic/apps/ml/data_visualizer/group1/config.ts
177180
- x-pack/test/functional_basic/apps/ml/data_visualizer/group2/config.ts
@@ -191,18 +194,20 @@ enabled:
191194
- x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/config.ts
192195
- x-pack/test/functional_with_es_ssl/apps/embeddable_alerts_table/config.ts
193196
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/config.ts
194-
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_aws_ses_kibana_config/config.ts
197+
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_email_aws_ses_kbn_config/config.ts
198+
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_email_services_enabled_kbn_config/config.ts
195199
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/shared/config.ts
200+
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/webhook_disabled_ssl_pfx/config.ts
196201
- x-pack/test/functional/apps/advanced_settings/config.ts
197202
- x-pack/test/functional/apps/aiops/config.ts
198203
- x-pack/test/functional/apps/api_keys/config.ts
199-
- x-pack/test/functional/apps/canvas/config.ts
204+
- x-pack/platform/test/functional/apps/canvas/config.ts
200205
- x-pack/test/functional/apps/cross_cluster_replication/config.ts
201206
- x-pack/test/functional/apps/dashboard/group1/config.ts
202207
- x-pack/test/functional/apps/dashboard/group2/config.ts
203208
- x-pack/test/functional/apps/dashboard/group3/config.ts
204209
- x-pack/test/functional/apps/data_views/config.ts
205-
- x-pack/test/functional/apps/dev_tools/config.ts
210+
- x-pack/platform/test/functional/apps/dev_tools/config.ts
206211
- x-pack/test/functional/apps/discover/group1/config.ts
207212
- x-pack/test/functional/apps/discover/group2/config.ts
208213
- x-pack/test/functional/apps/discover/group3/config.ts
@@ -241,41 +246,42 @@ enabled:
241246
- x-pack/test/functional/apps/ml/stack_management_jobs/config.ts
242247
- x-pack/test/functional/apps/ml/memory_usage/config.ts
243248
- x-pack/test/functional/apps/monitoring/config.ts
244-
- x-pack/test/functional/apps/painless_lab/config.ts
249+
- x-pack/platform/test/functional/apps/painless_lab/config.ts
245250
- x-pack/test/functional/apps/remote_clusters/config.ts
246-
- x-pack/test/functional/apps/reporting_management/config.ts
251+
- x-pack/platform/test/functional/apps/reporting_management/config.ts
247252
- x-pack/test/functional/apps/rollup_job/config.ts
248253
- x-pack/test/functional/apps/saved_objects_management/config.ts
249254
- x-pack/test/functional/apps/saved_query_management/config.ts
250255
- x-pack/test/functional/apps/saved_query_management/config.v2.ts
251-
- x-pack/test/functional/apps/security/config.ts
256+
- x-pack/platform/test/functional/apps/security/config.ts
252257
- x-pack/test/functional/apps/snapshot_restore/config.ts
253-
- x-pack/test/functional/apps/spaces/config.ts
258+
- x-pack/platform/test/functional/apps/spaces/config.ts
254259
- x-pack/test/functional/apps/status_page/config.ts
255260
- x-pack/test/functional/apps/transform/creation/index_pattern/config.ts
256261
- x-pack/test/functional/apps/transform/creation/runtime_mappings_saved_search/config.ts
257262
- x-pack/test/functional/apps/transform/actions/config.ts
258263
- x-pack/test/functional/apps/transform/edit_clone/config.ts
259264
- x-pack/test/functional/apps/transform/permissions/config.ts
260265
- x-pack/test/functional/apps/transform/feature_controls/config.ts
261-
- x-pack/test/functional/apps/upgrade_assistant/config.ts
266+
- x-pack/platform/test/functional/apps/upgrade_assistant/config.ts
262267
- x-pack/test/functional/apps/user_profiles/config.ts
263268
- x-pack/test/functional/apps/visualize/config.ts
264-
- x-pack/test/functional/apps/watcher/config.ts
265-
- x-pack/test/functional/config_security_basic.ts
269+
- x-pack/platform/test/functional/apps/watcher/config.ts
270+
- x-pack/platform/test/functional/config_security_basic.ts
266271
- x-pack/test/functional/config.ccs.ts
267272
- x-pack/test/functional/config.firefox.js
268-
- x-pack/test/functional/config.upgrade_assistant.ts
273+
- x-pack/platform/test/functional/config.firefox.ts
274+
- x-pack/platform/test/functional/config.upgrade_assistant.ts
269275
- x-pack/test/functional_cloud/config.ts
270276
- x-pack/test/functional_cloud/saml.config.ts
271277
- x-pack/test/functional_solution_sidenav/config.ts
272278
- x-pack/test/licensing_plugin/config.public.ts
273279
- x-pack/test/licensing_plugin/config.ts
274280
- x-pack/test/plugin_functional/config.ts
275-
- x-pack/test/reporting_api_integration/reporting_and_security.config.ts
276-
- x-pack/test/reporting_api_integration/reporting_without_security.config.ts
277-
- x-pack/test/reporting_functional/reporting_and_security.config.ts
278-
- x-pack/test/reporting_functional/reporting_without_security.config.ts
281+
- x-pack/platform/test/reporting_api_integration/reporting_and_security.config.ts
282+
- x-pack/platform/test/reporting_api_integration/reporting_without_security.config.ts
283+
- x-pack/platform/test/reporting_functional/reporting_and_security.config.ts
284+
- x-pack/platform/test/reporting_functional/reporting_without_security.config.ts
279285
- x-pack/test/rule_registry/security_and_spaces/config_basic.ts
280286
- x-pack/test/rule_registry/security_and_spaces/config_trial.ts
281287
- x-pack/test/rule_registry/spaces_only/config_basic.ts
@@ -324,7 +330,7 @@ enabled:
324330
- x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts
325331
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
326332
- x-pack/test/spaces_api_integration/spaces_only/config.ts
327-
- x-pack/test/task_manager_claimer_update_by_query/config.ts
333+
- x-pack/platform/test/task_manager_claimer_update_by_query/config.ts
328334
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
329335
- x-pack/test/ui_capabilities/spaces_only/config.ts
330336
- x-pack/test/upgrade_assistant_integration/config.ts
@@ -372,6 +378,7 @@ enabled:
372378
- x-pack/platform/test/api_integration/apis/management/config.ts
373379
- x-pack/platform/test/api_integration/apis/management/index_management/disabled_data_enrichers/config.ts
374380
- x-pack/platform/test/api_integration/apis/maps/config.ts
381+
- x-pack/platform/test/api_integration/apis/lens/config.ts
375382
- x-pack/platform/test/api_integration/apis/ml/config.ts
376383
- x-pack/platform/test/api_integration/apis/monitoring/config.ts
377384
- x-pack/platform/test/api_integration/apis/monitoring_collection/config.ts
@@ -392,9 +399,12 @@ enabled:
392399
- x-pack/platform/test/automatic_import_api_integration/apis/config_basic.ts
393400
- x-pack/platform/test/automatic_import_api_integration/apis/config_graphs.ts
394401
- x-pack/platform/test/encrypted_saved_objects_api_integration/config.ts
402+
- x-pack/platform/test/fleet_multi_cluster/config.ts
395403
- x-pack/platform/test/monitoring_api_integration/config.ts
396404
- x-pack/platform/test/plugin_api_integration/config.ts
397405
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_basic.ts
398406
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_trial.ts
399407
- x-pack/platform/test/saved_object_api_integration/spaces_only/config.ts
408+
- x-pack/platform/test/saved_object_api_integration/low-level/config.ts
400409
- x-pack/platform/test/saved_object_api_integration/user_profiles/config.ts
410+
- src/platform/test/api_integration/apis/unused_urls_task/config.ts

.buildkite/ftr_search_stateful_configs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ defaultQueue: 'n2-4-spot'
66
enabled:
77
- x-pack/test/functional_search/config.ts
88
- x-pack/test/functional/apps/search_playground/config.ts
9+
- x-pack/solutions/search/test/functional_search/config/config.feature_flags.ts
910
- x-pack/solutions/search/test/api_integration/apis/search_playground/config.ts
10-
11+
- x-pack/solutions/search/test/api_integration/apis/guided_onboarding/config.ts

.buildkite/ftr_security_serverless_configs.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ disabled:
44
- x-pack/test/security_solution_api_integration/config/serverless/config.base.essentials.ts
55
- x-pack/test/security_solution_api_integration/config/serverless/config.base.edr_workflows.ts
66
- x-pack/test/security_solution_api_integration/config/serverless/config.base.ai4dsoc.ts
7-
- x-pack/test/defend_workflows_cypress/serverless_config.base.ts
8-
- x-pack/test/osquery_cypress/serverless_config.base.ts
7+
- x-pack/solutions/security/test/defend_workflows_cypress/serverless_config.base.ts
8+
- x-pack/solutions/security/test/osquery_cypress/serverless_config.base.ts
99

1010
# Cypress configs, for now these are still run manually
11-
- x-pack/test/defend_workflows_cypress/serverless_config.ts
12-
- x-pack/test/osquery_cypress/serverless_cli_config.ts
11+
- x-pack/solutions/security/test/defend_workflows_cypress/serverless_config.ts
12+
- x-pack/solutions/security/test/osquery_cypress/serverless_cli_config.ts
1313
- x-pack/test/security_solution_cypress/serverless_config.ts
1414
- x-pack/test/security_solution_cypress/ai4dsoc_serverless_config.ts
1515

@@ -76,6 +76,7 @@ enabled:
7676
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/basic_license_essentials_tier/configs/serverless.config.ts
7777
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/trial_license_complete_tier/configs/serverless.config.ts
7878
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/configs/serverless.config.ts
79+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/serverless_essentials_tier.config.ts
7980
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_disabled/configs/serverless_essentials_tier.config.ts
8081
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/serverless.config.ts
8182
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/common_fields/configs/serverless.config.ts

0 commit comments

Comments
 (0)