Skip to content

Commit 229ba76

Browse files
Merge branch 'main' into removing-removeIfExists-from-sync-task-scheduler
2 parents 1217fca + e3f6268 commit 229ba76

91 files changed

Lines changed: 942 additions & 210 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_platform_stateful_configs.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ disabled:
1818
- x-pack/platform/test/functional_basic/apps/transform/config.base.ts
1919
- x-pack/platform/test/api_integration_basic/config.basic_license.ts
2020
- x-pack/platform/test/ui_capabilities/common/config.ts
21+
- x-pack/platform/test/functional/config.ccs.ts
2122

2223
# QA suites that are run out-of-band
23-
- x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
24+
- x-pack/platform/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
2425
- x-pack/platform/test/upgrade/config.ts
2526
- src/platform/test/functional/config.edge.js
2627
- x-pack/platform/test/functional/config.edge.ts

‎.github/CODEOWNERS‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,8 +1220,8 @@ x-pack/test_serverless/api_integration/test_suites/common/platform_security @ela
12201220
/x-pack/platform/test/functional/apps/saved_query_management @elastic/kibana-data-discovery
12211221
/x-pack/platform/test/functional_with_es_ssl/apps/discover_ml/discover @elastic/kibana-data-discovery
12221222
/x-pack/platform/test/search_sessions_integration @elastic/kibana-data-discovery
1223-
/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js @elastic/kibana-data-discovery
1224-
/x-pack/test/stack_functional_integration/apps/management/_index_pattern_create.js @elastic/kibana-data-discovery
1223+
/x-pack/platform/test/stack_functional_integration/apps/ccs/ccs_discover.js @elastic/kibana-data-discovery
1224+
/x-pack/platform/test/stack_functional_integration/apps/management/_index_pattern_create.js @elastic/kibana-data-discovery
12251225
/x-pack/platform/test/upgrade/apps/discover @elastic/kibana-data-discovery
12261226
/x-pack/test_serverless/api_integration/test_suites/common/data_views @elastic/kibana-data-discovery
12271227
/x-pack/test_serverless/api_integration/test_suites/common/data_view_field_editor @elastic/kibana-data-discovery
@@ -1322,7 +1322,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
13221322
/x-pack/test/functional/fixtures/kbn_archiver/reporting/ @elastic/response-ops
13231323
/x-pack/platform/test/reporting_api_integration/ @elastic/response-ops
13241324
/x-pack/platform/test/reporting_functional/ @elastic/response-ops
1325-
/x-pack/test/stack_functional_integration/apps/reporting/ @elastic/response-ops
1325+
/x-pack/platform/test/stack_functional_integration/apps/reporting/ @elastic/response-ops
13261326
/docs/user/reporting @elastic/response-ops
13271327
/docs/settings/reporting-settings.asciidoc @elastic/response-ops
13281328
/docs/setup/configuring-reporting.asciidoc @elastic/response-ops
@@ -1537,7 +1537,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
15371537
/x-pack/test_serverless/**/test_suites/**/fleet/ @elastic/fleet
15381538

15391539
# APM
1540-
/x-pack/test/stack_functional_integration/apps/apm @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
1540+
/x-pack/platform/test/stack_functional_integration/apps/apm @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
15411541
/src/platform/test/api_integration/apis/ui_metric/*.ts @elastic/obs-ux-infra_services-team
15421542
/x-pack/test/functional/apps/apm/ @elastic/obs-ux-infra_services-team
15431543
/x-pack/solutions/observability/test/api_integration/apm/ @elastic/obs-ux-infra_services-team
@@ -1669,7 +1669,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
16691669
/x-pack/test/functional/es_archives/canvas/logstash_lens @elastic/kibana-presentation
16701670
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation
16711671
/x-pack/platform/test/upgrade/services/maps_upgrade_services.ts @elastic/kibana-presentation
1672-
/x-pack/test/stack_functional_integration/apps/maps @elastic/kibana-presentation
1672+
/x-pack/platform/test/stack_functional_integration/apps/maps @elastic/kibana-presentation
16731673
/x-pack/platform/test/functional/page_objects/geo_file_upload.ts @elastic/kibana-presentation
16741674
/x-pack/platform/test/functional/page_objects/gis_page.ts @elastic/kibana-presentation
16751675
/x-pack/platform/test/upgrade/apps/maps @elastic/kibana-presentation
@@ -1681,7 +1681,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
16811681

16821682

16831683
# Machine Learning
1684-
/x-pack/test/stack_functional_integration/apps/ml @elastic/ml-ui
1684+
/x-pack/platform/test/stack_functional_integration/apps/ml @elastic/ml-ui
16851685
/x-pack/test/functional/fixtures/kbn_archiver/ml @elastic/ml-ui
16861686
/x-pack/platform/test/api_integration/apis/file_upload @elastic/ml-ui
16871687
/x-pack/test/accessibility/apps/group2/ml.ts @elastic/ml-ui
@@ -1788,13 +1788,13 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
17881788
/src/platform/test/api_integration/fixtures/es_archiver/elasticsearch @elastic/appex-qa
17891789
/x-pack/test/plugin_functional/services.ts @elastic/appex-qa
17901790
/src/platform/test/server_integration/services/index.js @elastic/appex-qa
1791-
/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js @elastic/appex-qa
1792-
/x-pack/test/stack_functional_integration/configs/consume_state.js @elastic/appex-qa
1793-
/x-pack/test/functional/services/remote_es/remote_es_archiver.ts @elastic/appex-qa
1791+
/x-pack/platform/test/stack_functional_integration/configs/config.stack_functional_integration_base.js @elastic/appex-qa
1792+
/x-pack/platform/test/stack_functional_integration/configs/consume_state.js @elastic/appex-qa
1793+
/x-pack/platform/test/functional/services/remote_es/remote_es_archiver.ts @elastic/appex-qa
17941794
/src/platform/test/functional/services/remote_es/remote_es_archiver.ts @elastic/appex-qa
17951795
/x-pack/test/kibana.jsonc @elastic/appex-qa
17961796
/x-pack/platform/test/functional_with_es_ssl/ftr_provider_context.d.ts @elastic/appex-qa
1797-
/x-pack/test/stack_functional_integration/apps @elastic/appex-qa
1797+
/x-pack/platform/test/stack_functional_integration/apps @elastic/appex-qa
17981798
/x-pack/test/plugin_functional/config.ts @elastic/appex-qa
17991799
/x-pack/test/plugin_functional/ftr_provider_context.d.ts @elastic/appex-qa
18001800
/x-pack/test/plugin_functional/page_objects.ts @elastic/appex-qa
@@ -1803,7 +1803,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
18031803
/x-pack/platform/test/upgrade/config.ts @elastic/appex-qa
18041804
/x-pack/platform/test/functional_basic/ftr_provider_context.d.ts @elastic/appex-qa
18051805
x-pack/test/functional/services/index.ts @elastic/appex-qa
1806-
/x-pack/test/functional/services/remote_es/remote_es.ts @elastic/appex-qa
1806+
/x-pack/platform/test/functional/services/remote_es/remote_es.ts @elastic/appex-qa
18071807
/x-pack/test/functional/services/random.js @elastic/appex-qa
18081808
/x-pack/test/functional/services/index.ts @elastic/appex-qa
18091809
/x-pack/platform/test/functional/services/index.ts @elastic/appex-qa
@@ -1969,7 +1969,7 @@ x-pack/test/functional/services/index.ts @elastic/appex-qa
19691969
/src/platform/test/api_integration/apis/general/*.js @elastic/kibana-core # Assigned per https://github.com/elastic/kibana/pull/199795/files/894a8ede3f9d0398c5af56bf5a82654a9bc0610b#r1846691639
19701970
/x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test @elastic/kibana-core
19711971
/x-pack/platform/test/functional/page_objects/navigational_search.ts @elastic/kibana-core
1972-
/x-pack/test/stack_functional_integration/apps/savedobjects_upgrade_testing @elastic/kibana-core
1972+
/x-pack/platform/test/stack_functional_integration/apps/savedobjects_upgrade_testing @elastic/kibana-core
19731973
/x-pack/platform/test/functional/page_objects/status_page.ts @elastic/kibana-core
19741974
/x-pack/platform/test/functional/page_objects/share_saved_objects_to_space_page.ts @elastic/kibana-core
19751975
/x-pack/platform/test/functional/page_objects/banners_page.ts @elastic/kibana-core
@@ -1991,7 +1991,7 @@ x-pack/test/functional/services/index.ts @elastic/appex-qa
19911991
/x-pack/platform/test/cloud_integration/plugins/saml_provider @elastic/kibana-core
19921992
/src/platform/test/server_integration @elastic/kibana-core
19931993
/x-pack/platform/test/functional_cors @elastic/kibana-core
1994-
/x-pack/test/stack_functional_integration/apps/telemetry @elastic/kibana-core
1994+
/x-pack/platform/test/stack_functional_integration/apps/telemetry @elastic/kibana-core
19951995
/src/platform/test/plugin_functional/plugins/core* @elastic/kibana-core
19961996
/src/platform/test/plugin_functional/platform/plugins/shared/telemetry @elastic/kibana-core
19971997
/src/platform/test/plugin_functional/plugins/session_notifications @elastic/kibana-core
@@ -2186,7 +2186,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
21862186
/x-pack/platform/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts @elastic/response-ops
21872187
/x-pack/platform/test/functional_with_es_ssl/page_objects/rule_details.ts @elastic/response-ops
21882188
/x-pack/platform/test/functional_with_es_ssl/lib/object_remover.ts @elastic/response-ops
2189-
/x-pack/test/stack_functional_integration/apps/alerts @elastic/response-ops
2189+
/x-pack/platform/test/stack_functional_integration/apps/alerts @elastic/response-ops
21902190
/x-pack/platform/test/functional/services/actions @elastic/response-ops
21912191
/x-pack/solutions/security/test/api_integration_basic/apis/security_solution/index.ts @elastic/kibana-cases
21922192
/x-pack/solutions/security/test/api_integration_basic/apis/security_solution/cases_privileges.ts @elastic/kibana-cases
@@ -2287,7 +2287,7 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
22872287
/x-pack/test/functional/es_archives/upgrade_assistant @elastic/kibana-management
22882288
/x-pack/platform/test/functional/services/ace_editor.ts @elastic/kibana-management
22892289
/x-pack/test/functional/page_objects/remote_clusters_page.ts @elastic/kibana-management
2290-
/x-pack/test/stack_functional_integration/apps/ccs @elastic/kibana-management
2290+
/x-pack/platform/test/stack_functional_integration/apps/ccs @elastic/kibana-management
22912291
/x-pack/test/functional/services/data_stream.ts @elastic/kibana-management
22922292
/x-pack/platform/test/functional/page_objects/watcher_page.ts @elastic/kibana-management
22932293
/x-pack/platform/test/functional/page_objects/upgrade_assistant_page.ts @elastic/kibana-management
@@ -2300,7 +2300,7 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
23002300
/x-pack/platform/test/functional/apps/snapshot_restore @elastic/kibana-management
23012301
/x-pack/platform/test/functional/apps/painless_lab @elastic/kibana-management
23022302
/x-pack/test_serverless/functional/test_suites/common/spaces/spaces_management.ts @elastic/kibana-management
2303-
/x-pack/test/stack_functional_integration/apps/management @elastic/kibana-management
2303+
/x-pack/platform/test/stack_functional_integration/apps/management @elastic/kibana-management
23042304
/x-pack/test/functional/page_objects/*_management_page.ts @elastic/kibana-management
23052305
/src/platform/test/functional/services/saved_query_management_component.ts @elastic/kibana-management
23062306
/src/platform/test/functional/services/management @elastic/kibana-management

‎src/platform/packages/shared/kbn-test/src/functional_test_runner/functional_test_runner.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ export class FunctionalTestRunner {
9393
log: this.log,
9494
config: this.config,
9595
providers,
96+
// Skipping root hooks when there are no tests to execute
97+
skipRootHooks: !realServices,
9698
esVersion: this.esVersion,
9799
reporter,
98100
reporterOptions,
@@ -162,6 +164,7 @@ export class FunctionalTestRunner {
162164
log: this.log,
163165
config: this.config,
164166
providers,
167+
skipRootHooks: true,
165168
esVersion: this.esVersion,
166169
});
167170

‎src/platform/packages/shared/kbn-test/src/functional_test_runner/lib/config/schema.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,13 @@ export const schema = Joi.object()
151151
slow: Joi.number().default(30000),
152152
timeout: Joi.number().default(INSPECTING ? 360000 * 100 : 360000),
153153
ui: Joi.string().default('bdd'),
154+
// Currently supporting beforeAll and afterAll.
155+
rootHooks: Joi.object()
156+
.keys({
157+
beforeAll: Joi.function().optional(),
158+
afterAll: Joi.function().optional(),
159+
})
160+
.optional(),
154161
})
155162
.default(),
156163

‎src/platform/packages/shared/kbn-test/src/functional_test_runner/lib/mocha/setup_mocha.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ interface Options {
3131
config: Config;
3232
providers: ProviderCollection;
3333
esVersion: EsVersion;
34+
skipRootHooks?: boolean;
3435
reporter?: any;
3536
reporterOptions?: any;
3637
}
@@ -45,12 +46,21 @@ export async function setupMocha({
4546
config,
4647
providers,
4748
esVersion,
49+
skipRootHooks,
4850
reporter,
4951
reporterOptions,
5052
}: Options) {
53+
const rootHooks = config.get('mochaOpts.rootHooks');
54+
5155
// configure mocha
5256
const mocha = new Mocha({
5357
...config.get('mochaOpts'),
58+
rootHooks: {
59+
beforeAll:
60+
rootHooks?.beforeAll && !skipRootHooks ? () => rootHooks.beforeAll(providers) : undefined,
61+
afterAll:
62+
rootHooks?.afterAll && !skipRootHooks ? () => rootHooks.afterAll(providers) : undefined,
63+
},
5464
reporter:
5565
reporter || (await providers.loadExternalService('mocha reporter', MochaReporterProvider)),
5666
reporterOptions,
@@ -72,7 +82,7 @@ export async function setupMocha({
7282
paths: config.get('testFiles'),
7383
});
7484

75-
// valiate that there aren't any tests in multiple ciGroups
85+
// validate that there aren't any tests in multiple ciGroups
7686
validateCiGroupTags(log, mocha);
7787

7888
filterSuites({

‎src/platform/plugins/private/links/public/components/editor/links_editor.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ const styles = {
356356
return css({
357357
'.linkEditor': {
358358
maxInlineSize: `calc(${euiTheme.size.xs} * 125)`,
359-
height: 'calc(100vh - var(--euiFixedHeadersOffset, 0))',
359+
height: 'var(--kbn-application--content-height)',
360360
position: 'fixed',
361361
display: 'flex',
362362
inlineSize: '50vw',

‎src/platform/plugins/shared/console/server/lib/spec_definitions/json/generated/cat.recovery.json‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,34 @@
2121
],
2222
"detailed": "__flag__",
2323
"index": [],
24-
"h": [],
24+
"h": [
25+
"index",
26+
"shard",
27+
"time",
28+
"type",
29+
"stage",
30+
"source_host",
31+
"source_node",
32+
"target_host",
33+
"target_node",
34+
"repository",
35+
"snapshot",
36+
"files",
37+
"files_recovered",
38+
"files_percent",
39+
"files_total",
40+
"bytes",
41+
"bytes_recovered",
42+
"bytes_percent",
43+
"bytes_total",
44+
"translog_ops",
45+
"translog_ops_recovered",
46+
"translog_ops_percent",
47+
"start_time",
48+
"start_time_millis",
49+
"stop_time",
50+
"stop_time_millis"
51+
],
2552
"s": [],
2653
"time": [
2754
"nanos",

‎src/platform/plugins/shared/console/server/lib/spec_definitions/json/generated/cat.segments.json‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,23 @@
1818
"tb",
1919
"pb"
2020
],
21-
"h": [],
21+
"h": [
22+
"index",
23+
"shard",
24+
"prirep",
25+
"ip",
26+
"segment",
27+
"generation",
28+
"docs.count",
29+
"docs.deleted",
30+
"size",
31+
"size.memory",
32+
"committed",
33+
"searchable",
34+
"version",
35+
"compound",
36+
"id"
37+
],
2238
"s": [],
2339
"local": "__flag__",
2440
"master_timeout": [

‎src/platform/plugins/shared/console/server/lib/spec_definitions/json/generated/cat.shards.json‎

Lines changed: 72 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,78 @@
1818
"tb",
1919
"pb"
2020
],
21-
"h": [],
21+
"h": [
22+
"completion.size",
23+
"dataset.size",
24+
"dense_vector.value_count",
25+
"docs",
26+
"fielddata.evictions",
27+
"fielddata.memory_size",
28+
"flush.total",
29+
"flush.total_time",
30+
"get.current",
31+
"get.exists_time",
32+
"get.exists_total",
33+
"get.missing_time",
34+
"get.missing_total",
35+
"get.time",
36+
"get.total",
37+
"id",
38+
"index",
39+
"indexing.delete_current",
40+
"indexing.delete_time",
41+
"indexing.delete_total",
42+
"indexing.index_current",
43+
"indexing.index_failed_due_to_version_conflict",
44+
"indexing.index_failed",
45+
"indexing.index_time",
46+
"indexing.index_total",
47+
"ip",
48+
"merges.current",
49+
"merges.current_docs",
50+
"merges.current_size",
51+
"merges.total",
52+
"merges.total_docs",
53+
"merges.total_size",
54+
"merges.total_time",
55+
"node",
56+
"prirep",
57+
"query_cache.evictions",
58+
"query_cache.memory_size",
59+
"recoverysource.type",
60+
"refresh.time",
61+
"refresh.total",
62+
"search.fetch_current",
63+
"search.fetch_time",
64+
"search.fetch_total",
65+
"search.open_contexts",
66+
"search.query_current",
67+
"search.query_time",
68+
"search.query_total",
69+
"search.scroll_current",
70+
"search.scroll_time",
71+
"search.scroll_total",
72+
"segments.count",
73+
"segments.fixed_bitset_memory",
74+
"segments.index_writer_memory",
75+
"segments.memory",
76+
"segments.version_map_memory",
77+
"seq_no.global_checkpoint",
78+
"seq_no.local_checkpoint",
79+
"seq_no.max",
80+
"shard",
81+
"dsparse_vector.value_count",
82+
"state",
83+
"store",
84+
"suggest.current",
85+
"suggest.time",
86+
"suggest.total",
87+
"sync_id",
88+
"unassigned.at",
89+
"unassigned.details",
90+
"unassigned.for",
91+
"unassigned.reason"
92+
],
2293
"s": [],
2394
"master_timeout": [
2495
"30s",

0 commit comments

Comments
 (0)