Skip to content

Commit 3a7151f

Browse files
alexwizpalexwizp
authored
Merge branch '9.1' into backport/9.1/pr-227044
2 parents a80a354 + 4c01fa0 commit 3a7151f

1,248 files changed

Lines changed: 18943 additions & 8069 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.

‎.buildkite/ftr_oblt_serverless_configs.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
disabled:
22
# Base config files, only necessary to inform config finding script
33
- x-pack/test_serverless/functional/test_suites/observability/cypress/oblt_config.base.ts
4-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant_local.serverless.config.ts
54

65
# Cypress configs, for now these are still run manually
76
- x-pack/test_serverless/functional/test_suites/observability/cypress/config_headless.ts
@@ -38,9 +37,9 @@ enabled:
3837
- x-pack/test_serverless/functional/test_suites/observability/config.screenshots.ts
3938
- x-pack/test_serverless/functional/test_suites/observability/config.telemetry.ts
4039
# serverless config files that run deployment-agnostic tests
41-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
42-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts
43-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
44-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts
45-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts
46-
- x-pack/test/api_integration/deployment_agnostic/feature_flag_configs/serverless/oblt.serverless.config.ts
40+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.serverless.config.ts
41+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts
42+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
43+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts
44+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts
45+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/serverless/oblt.serverless.config.ts

‎.buildkite/ftr_oblt_stateful_configs.yml‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ disabled:
1111
- x-pack/solutions/observability/plugins/uptime/e2e/config.ts
1212
- x-pack/solutions/observability/test/api_integration/config.ts
1313
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.ai_assistant_local.stateful.config.ts
14+
- x-pack/solutions/observability/test/functional/config.base.ts
1415

1516
# Elastic Synthetics configs
1617
- x-pack/solutions/observability/plugins/uptime/e2e/uptime/synthetics_run.ts
@@ -32,21 +33,26 @@ enabled:
3233
- x-pack/solutions/observability/test/apm_api_integration/cloud/config.ts
3334
- x-pack/solutions/observability/test/apm_api_integration/rules/config.ts
3435
- x-pack/solutions/observability/test/apm_api_integration/trial/config.ts
35-
- x-pack/test/dataset_quality_api_integration/basic/config.ts
36+
- x-pack/solutions/observability/test/dataset_quality_api_integration/basic/config.ts
3637
- x-pack/test/functional/apps/dataset_quality/config.ts
37-
- x-pack/test/functional/apps/slo/embeddables/config.ts
38-
- x-pack/test/functional/apps/uptime/config.ts
39-
- x-pack/test/observability_api_integration/basic/config.ts
40-
- x-pack/test/observability_api_integration/trial/config.ts
41-
- x-pack/test/observability_functional/with_rac_write.config.ts
42-
- x-pack/test/observability_onboarding_api_integration/basic/config.ts
43-
- x-pack/test/observability_onboarding_api_integration/cloud/config.ts
44-
- x-pack/test/observability_ai_assistant_functional/enterprise/config.ts
38+
- x-pack/solutions/observability/test/functional/apps/uptime/config.ts
39+
- x-pack/solutions/observability/test/observability_api_integration/basic/config.ts
40+
- x-pack/solutions/observability/test/observability_api_integration/trial/config.ts
41+
- x-pack/solutions/observability/test/observability_functional/with_rac_write.config.ts
42+
- x-pack/solutions/observability/test/observability_onboarding_api_integration/basic/config.ts
43+
- x-pack/solutions/observability/test/observability_onboarding_api_integration/cloud/config.ts
44+
- x-pack/solutions/observability/test/observability_ai_assistant_functional/enterprise/config.ts
4545
- x-pack/solutions/observability/test/api_integration/profiling/cloud/config.ts
4646
- x-pack/test/functional/apps/apm/config.ts
47-
- x-pack/test/functional_with_es_ssl/apps/config.ts
47+
- x-pack/solutions/observability/test/functional_with_es_ssl/config.ts
48+
- x-pack/solutions/observability/test/api_integration/apis/cases/config.ts
49+
- x-pack/solutions/observability/test/functional/apps/slo/embeddables/config.ts
50+
- x-pack/solutions/observability/test/api_integration/apis/security/config.ts
51+
- x-pack/solutions/observability/test/accessibility/config.ts
52+
- x-pack/solutions/observability/test/functional/apps/infra/config.ts
53+
- x-pack/solutions/observability/test/functional/config.firefox.ts
4854
# stateful configs that run deployment-agnostic tests
49-
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
50-
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts
51-
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.ai_assistant.stateful.config.ts
52-
- x-pack/test/api_integration/deployment_agnostic/feature_flag_configs/stateful/oblt.stateful.config.ts
55+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.stateful.config.ts
56+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts
57+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.ai_assistant.stateful.config.ts
58+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/stateful/oblt.stateful.config.ts

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ disabled:
22
# Stateful base config for deployment-agnostic tests
33
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/stateful.config.base.ts
44
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/feature_flag.stateful.config.base.ts
5-
- x-pack/test/api_integration/deployment_agnostic/default_configs/stateful.config.base.ts
6-
- x-pack/test/api_integration/deployment_agnostic/default_configs/feature_flag.stateful.config.base.ts
75

86
# Base config files, only necessary to inform config finding script
97
- src/platform/test/functional/config.base.js
@@ -26,7 +24,6 @@ disabled:
2624
- x-pack/platform/test/upgrade/config.ts
2725
- src/platform/test/functional/config.edge.js
2826
- x-pack/platform/test/functional/config.edge.ts
29-
- x-pack/test/functional/config.edge.js
3027

3128
# Configs that exist but weren't running in CI when this file was introduced
3229
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts
@@ -158,8 +155,6 @@ enabled:
158155
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/alerting/group4/config_with_schedule_circuit_breaker.ts
159156
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/actions/config.ts
160157
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts
161-
- x-pack/test/api_integration/apis/cases/config.ts
162-
- x-pack/test/api_integration/apis/security/config.ts
163158
- x-pack/platform/test/banners_functional/config.ts
164159
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_basic.ts
165160
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_trial.ts
@@ -219,7 +214,6 @@ enabled:
219214
- x-pack/test/functional/apps/home/config.ts
220215
- x-pack/test/functional/apps/index_lifecycle_management/config.ts
221216
- x-pack/test/functional/apps/index_management/config.ts
222-
- x-pack/test/functional/apps/infra/config.ts
223217
- x-pack/test/functional/apps/ingest_pipelines/config.ts
224218
- x-pack/test/functional/apps/lens/group1/config.ts
225219
- x-pack/test/functional/apps/lens/group2/config.ts
@@ -272,7 +266,6 @@ enabled:
272266
- x-pack/platform/test/functional/apps/watcher/config.ts
273267
- x-pack/platform/test/functional/config_security_basic.ts
274268
- x-pack/test/functional/config.ccs.ts
275-
- x-pack/test/functional/config.firefox.js
276269
- x-pack/platform/test/functional/config.firefox.ts
277270
- x-pack/platform/test/functional/config.upgrade_assistant.ts
278271
- x-pack/platform/test/functional_cloud/config.ts
@@ -289,10 +282,10 @@ enabled:
289282
- x-pack/test/rule_registry/security_and_spaces/config_trial.ts
290283
- x-pack/test/rule_registry/spaces_only/config_basic.ts
291284
- x-pack/test/rule_registry/spaces_only/config_trial.ts
292-
- x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts
293-
- x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts
294-
- x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts
295-
- x-pack/test/saved_object_tagging/functional/config.ts
285+
- x-pack/platform/test/saved_object_tagging/api_integration/security_and_spaces/config.ts
286+
- x-pack/platform/test/saved_object_tagging/api_integration/tagging_api/config.ts
287+
- x-pack/platform/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts
288+
- x-pack/platform/test/saved_object_tagging/functional/config.ts
296289
- x-pack/platform/test/saved_objects_field_count/config.ts
297290
- x-pack/platform/test/search_sessions_integration/config.ts
298291
- x-pack/test/security_api_integration/anonymous_es_anonymous.config.ts
@@ -365,6 +358,7 @@ enabled:
365358
- x-pack/platform/test/custom_branding/config.ts
366359
# configs migrated to the new Kibana architecture
367360
- x-pack/platform/test/api_integration/apis/aiops/config.ts
361+
- x-pack/platform/test/api_integration/apis/cases/config.ts
368362
- x-pack/platform/test/api_integration/apis/cloud/config.ts
369363
- x-pack/platform/test/api_integration/apis/cloud/saml.config.ts
370364
- x-pack/platform/test/api_integration/apis/console/config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,3 +126,4 @@ enabled:
126126
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial.ts
127127
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial_common.ts
128128
- x-pack/solutions/security/test/api_integration_basic/config.ts
129+
- x-pack/solutions/security/test/api_integration/apis/cases/config.ts

‎.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ agents:
1515
machineType: n2-standard-2
1616

1717
steps:
18-
- label: "Annotate runtime parameters"
18+
- label: 'Annotate runtime parameters'
1919
command: .buildkite/scripts/steps/es_serverless/annotate_runtime_parameters.sh
2020

21-
- group: "(:kibana: x :elastic:) Trigger Kibana Serverless suite"
21+
- group: '(:kibana: x :elastic:) Trigger Kibana Serverless suite'
2222
if: "build.env('SKIP_VERIFICATION') != '1' && build.env('SKIP_VERIFICATION') != 'true'"
2323
steps:
24-
- label: "Pre-Build"
24+
- label: 'Pre-Build'
2525
command: .buildkite/scripts/lifecycle/pre_build.sh
2626
key: pre-build
2727
timeout_in_minutes: 10
@@ -31,7 +31,7 @@ steps:
3131
provider: gcp
3232
machineType: n2-standard-2
3333

34-
- label: "Build Kibana Distribution"
34+
- label: 'Build Kibana Distribution'
3535
command: .buildkite/scripts/steps/build_kibana.sh
3636
agents:
3737
image: family/kibana-ubuntu-2004
@@ -44,26 +44,26 @@ steps:
4444
timeout_in_minutes: 60
4545
retry:
4646
automatic:
47-
- exit_status: "-1"
47+
- exit_status: '-1'
4848
limit: 3
4949

50-
- label: "Pick Test Group Run Order (FTR + Integration)"
50+
- label: 'Pick Test Group Run Order (FTR + Integration)'
5151
command: .buildkite/scripts/steps/test/pick_test_group_run_order.sh
5252
depends_on: build
5353
timeout_in_minutes: 10
5454
env:
55-
FTR_CONFIGS_SCRIPT: "TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/ftr_configs.sh"
56-
JEST_INTEGRATION_SCRIPT: "TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/jest_integration.sh"
57-
FTR_CONFIG_PATTERNS: "**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts,x-pack/test/api_integration/deployment_agnostic/configs/serverless/**,x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/**"
58-
FTR_EXTRA_ARGS: "$FTR_EXTRA_ARGS"
59-
LIMIT_CONFIG_TYPE: "functional,integration"
55+
FTR_CONFIGS_SCRIPT: 'TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/ftr_configs.sh'
56+
JEST_INTEGRATION_SCRIPT: 'TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/jest_integration.sh'
57+
FTR_CONFIG_PATTERNS: '**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts,x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/**,x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/**'
58+
FTR_EXTRA_ARGS: '$FTR_EXTRA_ARGS'
59+
LIMIT_CONFIG_TYPE: 'functional,integration'
6060
retry:
6161
automatic:
62-
- exit_status: "*"
62+
- exit_status: '*'
6363
limit: 1
6464

6565
- command: .buildkite/scripts/steps/functional/security_serverless_entity_analytics.sh
66-
label: "Serverless Entity Analytics - Security Solution Cypress Tests"
66+
label: 'Serverless Entity Analytics - Security Solution Cypress Tests'
6767
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
6868
agents:
6969
image: family/kibana-ubuntu-2004
@@ -76,11 +76,11 @@ steps:
7676
parallelism: 3
7777
retry:
7878
automatic:
79-
- exit_status: "-1"
79+
- exit_status: '-1'
8080
limit: 1
8181

8282
- command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
83-
label: "Serverless Explore - Security Solution Cypress Tests"
83+
label: 'Serverless Explore - Security Solution Cypress Tests'
8484
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
8585
agents:
8686
image: family/kibana-ubuntu-2004
@@ -93,11 +93,11 @@ steps:
9393
parallelism: 4
9494
retry:
9595
automatic:
96-
- exit_status: "-1"
96+
- exit_status: '-1'
9797
limit: 1
9898

9999
- command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
100-
label: "Serverless Investigations - Security Solution Cypress Tests"
100+
label: 'Serverless Investigations - Security Solution Cypress Tests'
101101
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
102102
agents:
103103
image: family/kibana-ubuntu-2004
@@ -110,11 +110,11 @@ steps:
110110
parallelism: 10
111111
retry:
112112
automatic:
113-
- exit_status: "-1"
113+
- exit_status: '-1'
114114
limit: 1
115115

116116
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management.sh
117-
label: "Serverless Rule Management - Security Solution Cypress Tests"
117+
label: 'Serverless Rule Management - Security Solution Cypress Tests'
118118
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
119119
agents:
120120
image: family/kibana-ubuntu-2004
@@ -127,11 +127,11 @@ steps:
127127
parallelism: 5
128128
retry:
129129
automatic:
130-
- exit_status: "-1"
130+
- exit_status: '-1'
131131
limit: 1
132132

133133
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules.sh
134-
label: "Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests"
134+
label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
135135
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
136136
agents:
137137
image: family/kibana-ubuntu-2004
@@ -144,11 +144,11 @@ steps:
144144
parallelism: 1
145145
retry:
146146
automatic:
147-
- exit_status: "-1"
147+
- exit_status: '-1'
148148
limit: 1
149149

150150
- command: .buildkite/scripts/steps/functional/security_serverless_detection_engine.sh
151-
label: "Serverless Detection Engine - Security Solution Cypress Tests"
151+
label: 'Serverless Detection Engine - Security Solution Cypress Tests'
152152
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
153153
agents:
154154
image: family/kibana-ubuntu-2004
@@ -161,11 +161,11 @@ steps:
161161
parallelism: 5
162162
retry:
163163
automatic:
164-
- exit_status: "-1"
164+
- exit_status: '-1'
165165
limit: 1
166166

167167
- command: .buildkite/scripts/steps/functional/security_serverless_detection_engine_exceptions.sh
168-
label: "Serverless Detection Engine - Exceptions - Security Solution Cypress Tests"
168+
label: 'Serverless Detection Engine - Exceptions - Security Solution Cypress Tests'
169169
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
170170
agents:
171171
image: family/kibana-ubuntu-2004
@@ -178,11 +178,11 @@ steps:
178178
parallelism: 4
179179
retry:
180180
automatic:
181-
- exit_status: "-1"
181+
- exit_status: '-1'
182182
limit: 1
183183

184184
- command: .buildkite/scripts/steps/functional/security_serverless_ai_assistant.sh
185-
label: "Serverless AI Assistant - Security Solution Cypress Tests"
185+
label: 'Serverless AI Assistant - Security Solution Cypress Tests'
186186
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
187187
agents:
188188
image: family/kibana-ubuntu-2004
@@ -195,11 +195,11 @@ steps:
195195
parallelism: 1
196196
retry:
197197
automatic:
198-
- exit_status: "-1"
198+
- exit_status: '-1'
199199
limit: 1
200200

201201
- command: .buildkite/scripts/steps/functional/defend_workflows_serverless.sh
202-
label: "Defend Workflows Cypress Tests on Serverless"
202+
label: 'Defend Workflows Cypress Tests on Serverless'
203203
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
204204
agents:
205205
image: family/kibana-ubuntu-2004
@@ -212,11 +212,11 @@ steps:
212212
parallelism: 12
213213
retry:
214214
automatic:
215-
- exit_status: "-1"
215+
- exit_status: '-1'
216216
limit: 1
217217

218218
- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
219-
label: "Osquery Cypress Tests on Serverless"
219+
label: 'Osquery Cypress Tests on Serverless'
220220
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
221221
agents:
222222
image: family/kibana-ubuntu-2004
@@ -229,16 +229,16 @@ steps:
229229
parallelism: 7
230230
retry:
231231
automatic:
232-
- exit_status: "-1"
232+
- exit_status: '-1'
233233
limit: 1
234234

235235
- wait: ~
236236

237-
- label: ":arrow_up::elastic::arrow_up: Promote docker image"
237+
- label: ':arrow_up::elastic::arrow_up: Promote docker image'
238238
command: .buildkite/scripts/steps/es_serverless/promote_es_serverless_image.sh $ES_SERVERLESS_IMAGE
239239

240240
- wait: ~
241241

242-
- label: "Post-Build"
242+
- label: 'Post-Build'
243243
command: .buildkite/scripts/lifecycle/post_build.sh
244244
timeout_in_minutes: 10

‎.eslintrc.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -779,9 +779,12 @@ module.exports = {
779779
'x-pack/platform/test/*/{tests,test_suites,apis,apps}/**/*',
780780
'x-pack/platform/test/*api_integration*/**/*',
781781
'x-pack/platform/test/*/*config.*ts',
782-
'x-pack/solutions/*/test/**/{tests,test_suites,apis,apps,deployment_agnostic,fixtures}/**/*',
783-
'x-pack/solutions/*/test/**/*config.*ts',
784-
'x-pack/test/*/{tests,test_suites,apis,apps,deployment_agnostic}/**/*',
782+
'x-pack/solutions/*/test/**/{tests,test_suites,apis,apps,fixtures,index.ts}/**/*',
783+
'x-pack/solutions/*/test/**/*config*.ts',
784+
'x-pack/solutions/*/test/**/tests/**/*',
785+
'x-pack/solutions/*/test/api_integration_deployment_agnostic/*configs/**/*',
786+
'x-pack/solutions/*/test/alerting_api_integration/**/*',
787+
'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',
785788
'x-pack/test/*/*config.*ts',
786789
'x-pack/platform/test/saved_object_api_integration/*/apis/**/*',
787790
'x-pack/platform/test/ui_capabilities/*/tests/**/*',

0 commit comments

Comments
 (0)