Skip to content

Commit 0b69204

Browse files
authored
Merge branch 'main' into collapse-long-field-values
2 parents a1e1187 + a18fcf3 commit 0b69204

966 files changed

Lines changed: 12566 additions & 4668 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_base_serverless_configs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
disabled:
22
# Base config files, only necessary to inform config finding script
33

4+
# Serverless deployment-agnostic default config for api-integration tests
5+
- x-pack/test/api_integration/deployment_agnostic/default_configs/serverless.config.base.ts
46
# Serverless base config files
57
- x-pack/test_serverless/api_integration/config.base.ts
68
- x-pack/test_serverless/functional/config.base.ts

.buildkite/ftr_oblt_serverless_configs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ enabled:
2626
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group5.ts
2727
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group6.ts
2828
- x-pack/test_serverless/functional/test_suites/observability/config.screenshots.ts
29+
# serverless config files that run deployment-agnostic tests
30+
- x-pack/test/api_integration/deployment_agnostic/oblt.serverless.config.ts

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
disabled:
2+
# Stateful base config for deployment-agnostic tests
3+
- x-pack/test/api_integration/deployment_agnostic/default_configs/stateful.config.base.ts
24
# Base config files, only necessary to inform config finding script
35
- test/functional/config.base.js
46
- test/functional/firefox/config.base.ts
@@ -155,7 +157,6 @@ enabled:
155157
- x-pack/test/api_integration/apis/monitoring/config.ts
156158
- x-pack/test/api_integration/apis/monitoring_collection/config.ts
157159
- x-pack/test/api_integration/apis/osquery/config.ts
158-
- x-pack/test/api_integration/apis/painless_lab/config.ts
159160
- x-pack/test/api_integration/apis/search/config.ts
160161
- x-pack/test/api_integration/apis/searchprofiler/config.ts
161162
- x-pack/test/api_integration/apis/security/config.ts
@@ -359,3 +360,5 @@ enabled:
359360
- x-pack/performance/journeys_e2e/apm_service_inventory.ts
360361
- x-pack/performance/journeys_e2e/infra_hosts_view.ts
361362
- x-pack/test/custom_branding/config.ts
363+
# stateful config files that run deployment-agnostic tests
364+
- x-pack/test/api_integration/deployment_agnostic/stateful.config.ts

.buildkite/ftr_search_serverless_configs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ enabled:
1616
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group4.ts
1717
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group5.ts
1818
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group6.ts
19+
# serverless config files that run deployment-agnostic tests
20+
- x-pack/test/api_integration/deployment_agnostic/search.serverless.config.ts

.buildkite/ftr_security_serverless_configs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,5 @@ enabled:
9797
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/response_actions/trial_license_complete_tier/configs/serverless.config.ts
9898
- x-pack/test/security_solution_endpoint/configs/serverless.endpoint.config.ts
9999
- x-pack/test/security_solution_endpoint/configs/serverless.integrations.config.ts
100+
# serverless config files that run deployment-agnostic tests
101+
- x-pack/test/api_integration/deployment_agnostic/security.serverless.config.ts

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ module.exports = {
618618
'test/*/*.config.ts',
619619
'test/*/{tests,test_suites,apis,apps}/**/*',
620620
'test/server_integration/**/*.ts',
621-
'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',
621+
'x-pack/test/*/{tests,test_suites,apis,apps,deployment_agnostic}/**/*',
622622
'x-pack/test/*/*config.*ts',
623623
'x-pack/test/saved_object_api_integration/*/apis/**/*',
624624
'x-pack/test/ui_capabilities/*/tests/**/*',

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,6 +1274,7 @@ x-pack/test/observability_ai_assistant_functional @elastic/obs-ai-assistant
12741274
/x-pack/test_serverless/functional/test_suites/security/ftr/ @elastic/appex-qa
12751275
/x-pack/test_serverless/functional/test_suites/common/home_page/ @elastic/appex-qa
12761276
/x-pack/test_serverless/**/services/ @elastic/appex-qa
1277+
/packages/kbn-es/src/stateful_resources/roles.yml @elastic/appex-qa
12771278

12781279
# Core
12791280
/config/ @elastic/kibana-core

api_docs/actions.mdx

Lines changed: 1 addition & 1 deletion

api_docs/advanced_settings.mdx

Lines changed: 1 addition & 1 deletion

api_docs/ai_assistant_management_selection.mdx

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)