Skip to content

Commit a06f407

Browse files
jpdjerejpdjere
authored
Merge branch 'main' into upgrade-review-test-plan-coverage-v2
2 parents 9b4915a + 8899fb8 commit a06f407

3,642 files changed

Lines changed: 14258 additions & 14350 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_stateful_configs.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ disabled:
33
- x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_open.ts
44
- x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_runner.ts
55
- x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config.ts
6-
- x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config_run.ts
7-
- x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config.ts
8-
- x-pack/plugins/observability_solution/inventory/e2e/ftr_config_run.ts
9-
- x-pack/plugins/observability_solution/inventory/e2e/ftr_config.ts
10-
- x-pack/plugins/observability_solution/profiling/e2e/ftr_config_open.ts
11-
- x-pack/plugins/observability_solution/profiling/e2e/ftr_config_runner.ts
12-
- x-pack/plugins/observability_solution/profiling/e2e/ftr_config.ts
6+
- x-pack/solutions/observability/plugins/apm/ftr_e2e/ftr_config_run.ts
7+
- x-pack/solutions/observability/plugins/apm/ftr_e2e/ftr_config.ts
8+
- x-pack/solutions/observability/plugins/inventory/e2e/ftr_config_run.ts
9+
- x-pack/solutions/observability/plugins/inventory/e2e/ftr_config.ts
10+
- x-pack/solutions/observability/plugins/profiling/e2e/ftr_config_open.ts
11+
- x-pack/solutions/observability/plugins/profiling/e2e/ftr_config_runner.ts
12+
- x-pack/solutions/observability/plugins/profiling/e2e/ftr_config.ts
1313

1414
#FTR configs
1515
- x-pack/solutions/observability/plugins/uptime/e2e/config.ts

‎.buildkite/scripts/pipelines/pull_request/pipeline.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
7878

7979
if (
8080
(await doAnyChangesMatch([
81-
/^x-pack\/plugins\/observability_solution\/apm/,
81+
/^x-pack\/solutions\/observability\/plugins\/apm/,
8282
/^packages\/kbn-apm-synthtrace/,
8383
])) ||
8484
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
@@ -88,7 +88,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
8888

8989
if (
9090
(await doAnyChangesMatch([
91-
/^x-pack\/plugins\/observability_solution\/inventory/,
91+
/^x-pack\/solutions\/observability\/plugins\/inventory/,
9292
/^packages\/kbn-apm-synthtrace/,
9393
])) ||
9494
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
@@ -109,7 +109,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
109109
}
110110

111111
if (
112-
(await doAnyChangesMatch([/^x-pack\/plugins\/observability_solution\/profiling/])) ||
112+
(await doAnyChangesMatch([/^x-pack\/solutions\/observability\/plugins\/profiling/])) ||
113113
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
114114
) {
115115
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/profiling_cypress.yml'));

‎.buildkite/scripts/steps/functional/apm_cypress.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ echo "--- APM Cypress Tests"
3131

3232
cd "$XPACK_DIR"
3333

34-
node plugins/observability_solution/apm/scripts/test/e2e.js \
34+
node solutions/observability/plugins/apm/scripts/test/e2e.js \
3535
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
3636
$CYPRESS_ARGS

‎.buildkite/scripts/steps/functional/inventory_cypress.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ echo "--- Observability Inventory Cypress Tests"
1414

1515
cd "$XPACK_DIR"
1616

17-
node plugins/observability_solution/inventory/scripts/test/e2e.js \
17+
node solutions/observability/plugins/inventory/scripts/test/e2e.js \
1818
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \

‎.buildkite/scripts/steps/functional/profiling_cypress.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ echo "--- Profiling Cypress Tests"
1414

1515
cd "$XPACK_DIR"
1616

17-
NODE_OPTIONS=--openssl-legacy-provider node plugins/observability_solution/profiling/scripts/test/e2e.js \
17+
NODE_OPTIONS=--openssl-legacy-provider node solutions/observability/plugins/profiling/scripts/test/e2e.js \
1818
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \

‎.eslintrc.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ module.exports = {
633633
'**/*.test.js',
634634
'x-pack/test/apm_api_integration/**/*.ts',
635635
'x-pack/test/functional/apps/**/*.js',
636-
'x-pack/plugins/observability_solution/apm/**/*.js',
636+
'x-pack/solutions/observability/plugins/apm/**/*.js',
637637
'test/*/config.ts',
638638
'test/*/config_open.ts',
639639
'test/*/*.config.ts',
@@ -913,7 +913,7 @@ module.exports = {
913913
*/
914914
{
915915
files: [
916-
'x-pack/plugins/observability_solution/apm/**/*.{js,mjs,ts,tsx}',
916+
'x-pack/solutions/observability/plugins/apm/**/*.{js,mjs,ts,tsx}',
917917
'x-pack/solutions/observability/plugins/observability/**/*.{js,mjs,ts,tsx}',
918918
'x-pack/solutions/observability/plugins/exploratory_view/**/*.{js,mjs,ts,tsx}',
919919
'x-pack/solutions/observability/plugins/ux/**/*.{js,mjs,ts,tsx}',
@@ -934,7 +934,7 @@ module.exports = {
934934
},
935935
{
936936
files: [
937-
'x-pack/plugins/observability_solution/apm/**/*.stories.*',
937+
'x-pack/solutions/observability/plugins/apm/**/*.stories.*',
938938
'x-pack/solutions/observability/plugins/observability/**/*.stories.*',
939939
'x-pack/solutions/observability/plugins/exploratory_view/**/*.stories.*',
940940
'x-pack/solutions/observability/plugins/slo/**/*.stories.*',
@@ -999,7 +999,7 @@ module.exports = {
999999
},
10001000
{
10011001
// require explicit return types in route handlers for performance reasons
1002-
files: ['x-pack/plugins/observability_solution/apm/server/**/route.ts'],
1002+
files: ['x-pack/solutions/observability/plugins/apm/server/**/route.ts'],
10031003
rules: {
10041004
'@typescript-eslint/explicit-function-return-type': [
10051005
'error',

‎.github/CODEOWNERS‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,8 @@ packages/kbn-ambient-storybook-types @elastic/kibana-operations
261261
packages/kbn-ambient-ui-types @elastic/kibana-operations
262262
packages/kbn-analytics @elastic/kibana-core
263263
packages/kbn-apm-config-loader @elastic/kibana-core @vigneshshanmugam
264-
packages/kbn-apm-data-view @elastic/obs-ux-infra_services-team
265264
packages/kbn-apm-synthtrace @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
266265
packages/kbn-apm-synthtrace-client @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
267-
packages/kbn-apm-types @elastic/obs-ux-infra_services-team
268-
packages/kbn-apm-utils @elastic/obs-ux-infra_services-team
269266
packages/kbn-axe-config @elastic/kibana-qa
270267
packages/kbn-babel-preset @elastic/kibana-operations
271268
packages/kbn-babel-register @elastic/kibana-operations
@@ -349,7 +346,6 @@ packages/kbn-jest-serializers @elastic/kibana-operations
349346
packages/kbn-journeys @elastic/kibana-operations @elastic/appex-qa
350347
packages/kbn-json-ast @elastic/kibana-operations
351348
packages/kbn-kibana-manifest-schema @elastic/kibana-operations
352-
packages/kbn-lens-embeddable-utils @elastic/obs-ux-infra_services-team @elastic/kibana-visualizations
353349
packages/kbn-lens-formula-docs @elastic/kibana-visualizations
354350
packages/kbn-lint-packages-cli @elastic/kibana-operations
355351
packages/kbn-lint-ts-projects-cli @elastic/kibana-operations
@@ -379,7 +375,6 @@ packages/kbn-picomatcher @elastic/kibana-operations
379375
packages/kbn-plugin-check @elastic/appex-sharedux
380376
packages/kbn-plugin-generator @elastic/kibana-operations
381377
packages/kbn-plugin-helpers @elastic/kibana-operations
382-
packages/kbn-profiling-utils @elastic/obs-ux-infra_services-team
383378
packages/kbn-react-field @elastic/kibana-data-discovery
384379
packages/kbn-react-mute-legacy-root-warning @elastic/appex-sharedux
385380
packages/kbn-recently-accessed @elastic/appex-sharedux
@@ -418,7 +413,6 @@ packages/kbn-search-types @elastic/kibana-data-discovery
418413
packages/kbn-security-hardening @elastic/kibana-security
419414
packages/kbn-server-http-tools @elastic/kibana-core
420415
packages/kbn-set-map @elastic/kibana-operations
421-
packages/kbn-shared-svg @elastic/obs-ux-infra_services-team
422416
packages/kbn-shared-ux-utility @elastic/appex-sharedux
423417
packages/kbn-some-dev-log @elastic/kibana-operations
424418
packages/kbn-sort-package-json @elastic/kibana-operations
@@ -555,6 +549,8 @@ src/platform/packages/shared/kbn-actions-types @elastic/response-ops
555549
src/platform/packages/shared/kbn-alerting-types @elastic/response-ops
556550
src/platform/packages/shared/kbn-alerts-as-data-utils @elastic/response-ops
557551
src/platform/packages/shared/kbn-alerts-ui-shared @elastic/response-ops
552+
src/platform/packages/shared/kbn-apm-data-view @elastic/obs-ux-infra_services-team
553+
src/platform/packages/shared/kbn-apm-utils @elastic/obs-ux-infra_services-team
558554
src/platform/packages/shared/kbn-avc-banner @elastic/security-defend-workflows
559555
src/platform/packages/shared/kbn-cases-components @elastic/response-ops
560556
src/platform/packages/shared/kbn-cell-actions @elastic/security-threat-hunting-explore
@@ -568,6 +564,7 @@ src/platform/packages/shared/kbn-esql-validation-autocomplete @elastic/kibana-es
568564
src/platform/packages/shared/kbn-flot-charts @elastic/kibana-presentation @elastic/stack-monitoring
569565
src/platform/packages/shared/kbn-grouping @elastic/response-ops
570566
src/platform/packages/shared/kbn-io-ts-utils @elastic/obs-knowledge-team
567+
src/platform/packages/shared/kbn-lens-embeddable-utils @elastic/obs-ux-infra_services-team @elastic/kibana-visualizations
571568
src/platform/packages/shared/kbn-management/cards_navigation @elastic/kibana-management
572569
src/platform/packages/shared/kbn-management/settings/components/field_input @elastic/kibana-management
573570
src/platform/packages/shared/kbn-management/settings/components/field_row @elastic/kibana-management
@@ -576,6 +573,7 @@ src/platform/packages/shared/kbn-management/settings/types @elastic/kibana-manag
576573
src/platform/packages/shared/kbn-management/settings/utilities @elastic/kibana-management
577574
src/platform/packages/shared/kbn-openapi-common @elastic/security-detection-rule-management
578575
src/platform/packages/shared/kbn-osquery-io-ts-types @elastic/security-asset-management
576+
src/platform/packages/shared/kbn-profiling-utils @elastic/obs-ux-infra_services-team
579577
src/platform/packages/shared/kbn-react-hooks @elastic/obs-ux-logs-team
580578
src/platform/packages/shared/kbn-router-utils @elastic/obs-ux-logs-team
581579
src/platform/packages/shared/kbn-rrule @elastic/response-ops
@@ -590,6 +588,7 @@ src/platform/packages/shared/kbn-securitysolution-rules @elastic/security-detect
590588
src/platform/packages/shared/kbn-server-route-repository @elastic/obs-knowledge-team
591589
src/platform/packages/shared/kbn-server-route-repository-client @elastic/obs-knowledge-team
592590
src/platform/packages/shared/kbn-server-route-repository-utils @elastic/obs-knowledge-team
591+
src/platform/packages/shared/kbn-shared-svg @elastic/obs-ux-infra_services-team
593592
src/platform/packages/shared/kbn-sse-utils @elastic/obs-knowledge-team
594593
src/platform/packages/shared/kbn-sse-utils-client @elastic/obs-knowledge-team
595594
src/platform/packages/shared/kbn-sse-utils-server @elastic/obs-knowledge-team
@@ -899,14 +898,6 @@ x-pack/plugins/graph @elastic/kibana-visualizations
899898
x-pack/plugins/lens @elastic/kibana-visualizations
900899
x-pack/plugins/licensing @elastic/kibana-core
901900
x-pack/plugins/notifications @elastic/appex-sharedux
902-
x-pack/plugins/observability_solution/apm @elastic/obs-ux-infra_services-team
903-
x-pack/plugins/observability_solution/apm_data_access @elastic/obs-ux-infra_services-team
904-
x-pack/plugins/observability_solution/apm/ftr_e2e @elastic/obs-ux-infra_services-team
905-
x-pack/plugins/observability_solution/inventory @elastic/obs-ux-infra_services-team
906-
x-pack/plugins/observability_solution/inventory/e2e @elastic/obs-ux-infra_services-team
907-
x-pack/plugins/observability_solution/metrics_data_access @elastic/obs-ux-infra_services-team
908-
x-pack/plugins/observability_solution/profiling @elastic/obs-ux-infra_services-team
909-
x-pack/plugins/observability_solution/profiling_data_access @elastic/obs-ux-infra_services-team
910901
x-pack/plugins/reporting @elastic/appex-sharedux
911902
x-pack/plugins/saved_objects_tagging @elastic/appex-sharedux
912903
x-pack/plugins/security @elastic/kibana-security
@@ -918,6 +909,7 @@ x-pack/solutions/observability/packages/alert_details @elastic/obs-ux-management
918909
x-pack/solutions/observability/packages/alerting_test_data @elastic/obs-ux-management-team
919910
x-pack/solutions/observability/packages/get_padded_alert_time_range_util @elastic/obs-ux-management-team
920911
x-pack/solutions/observability/packages/kbn-alerts-grouping @elastic/response-ops
912+
x-pack/solutions/observability/packages/kbn-apm-types @elastic/obs-ux-infra_services-team
921913
x-pack/solutions/observability/packages/kbn-custom-integrations @elastic/obs-ux-logs-team
922914
x-pack/solutions/observability/packages/kbn-investigation-shared @elastic/obs-ux-management-team
923915
x-pack/solutions/observability/packages/observability_ai/observability_ai_common @elastic/obs-ai-assistant
@@ -926,11 +918,17 @@ x-pack/solutions/observability/packages/synthetics_test_data @elastic/obs-ux-man
926918
x-pack/solutions/observability/packages/utils_browser @elastic/observability-ui
927919
x-pack/solutions/observability/packages/utils_common @elastic/observability-ui
928920
x-pack/solutions/observability/packages/utils_server @elastic/observability-ui
921+
x-pack/solutions/observability/plugins/apm @elastic/obs-ux-infra_services-team
922+
x-pack/solutions/observability/plugins/apm_data_access @elastic/obs-ux-infra_services-team
923+
x-pack/solutions/observability/plugins/apm/ftr_e2e @elastic/obs-ux-infra_services-team
929924
x-pack/solutions/observability/plugins/exploratory_view @elastic/obs-ux-management-team
930925
x-pack/solutions/observability/plugins/infra @elastic/obs-ux-logs-team @elastic/obs-ux-infra_services-team
926+
x-pack/solutions/observability/plugins/inventory @elastic/obs-ux-infra_services-team
927+
x-pack/solutions/observability/plugins/inventory/e2e @elastic/obs-ux-infra_services-team
931928
x-pack/solutions/observability/plugins/investigate @elastic/obs-ux-management-team
932929
x-pack/solutions/observability/plugins/investigate_app @elastic/obs-ux-management-team
933930
x-pack/solutions/observability/plugins/logs_explorer @elastic/obs-ux-logs-team
931+
x-pack/solutions/observability/plugins/metrics_data_access @elastic/obs-ux-infra_services-team
934932
x-pack/solutions/observability/plugins/observability @elastic/obs-ux-management-team
935933
x-pack/solutions/observability/plugins/observability_ai_assistant_app @elastic/obs-ai-assistant
936934
x-pack/solutions/observability/plugins/observability_ai_assistant_management @elastic/obs-ai-assistant
@@ -940,6 +938,8 @@ x-pack/solutions/observability/plugins/observability_onboarding/e2e @elastic/obs
940938
x-pack/solutions/observability/plugins/observability_shared @elastic/observability-ui
941939
x-pack/solutions/observability/plugins/observability_solution/entities_data_access @elastic/obs-entities
942940
x-pack/solutions/observability/plugins/observability_solution/entity_manager_app @elastic/obs-entities
941+
x-pack/solutions/observability/plugins/profiling @elastic/obs-ux-infra_services-team
942+
x-pack/solutions/observability/plugins/profiling_data_access @elastic/obs-ux-infra_services-team
943943
x-pack/solutions/observability/plugins/serverless_observability @elastic/obs-ux-management-team
944944
x-pack/solutions/observability/plugins/slo @elastic/obs-ux-management-team
945945
x-pack/solutions/observability/plugins/streams @elastic/streams-program-team
@@ -3296,7 +3296,7 @@ x-pack/solutions/observability/packages/alert_details @elastic/obs-ux-management
32963296
x-pack/solutions/observability/packages/alerting_test_data @elastic/obs-ux-management-team
32973297
x-pack/solutions/observability/packages/get_padded_alert_time_range_util @elastic/obs-ux-management-team
32983298
x-pack/solutions/observability/x-pack/solutions/observability/packages/kbn-alerts-grouping @elastic/response-ops
3299-
x-pack/solutions/observability/packages/kbn-apm-types @elastic/obs-ux-infra_services-team
3299+
x-pack/solutions/observability/x-pack/solutions/observability/packages/kbn-apm-types @elastic/obs-ux-infra_services-team
33003300
x-pack/solutions/observability/x-pack/solutions/observability/packages/kbn-custom-integrations @elastic/obs-ux-logs-team
33013301
x-pack/solutions/observability/packages/kbn-investigation-shared @elastic/obs-ux-management-team
33023302
x-pack/solutions/observability/src/platform/packages/shared/kbn-timerange @elastic/obs-ux-logs-team

‎.github/codeql/codeql-config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ paths-ignore:
8989
- x-pack/examples
9090
- x-pack/performance
9191
- x-pack/platform/**/scripts
92+
- x-pack/plugins/observability_solution/*/scripts
9293
- x-pack/scripts
9394
- x-pack/solutions/**/scripts
9495
- x-pack/test

‎.github/paths-labeller.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
- 'src/plugins/expressions/**/*.*'
1010
- 'src/plugins/bfetch/**/*.*'
1111
- 'Team:obs-ux-infra_services':
12-
- 'x-pack/plugins/observability_solution/apm/**/*.*'
12+
- 'x-pack/solutions/observability/plugins/apm/**/*.*'
1313
- 'x-pack/test/apm_api_integration/**/*.*'
1414
- 'packages/kbn-apm-synthtrace/**/*.*'
1515
- 'packages/kbn-apm-synthtrace-client/**/*.*'
16-
- 'packages/kbn-apm-utils/**/*.*'
16+
- 'src/platform/packages/shared/kbn-apm-utils/**/*.*'
1717
- 'x-pack/solutions/observability/plugins/ux/**/*.*'
1818
- 'Team:Fleet':
1919
- 'x-pack/platform/plugins/shared/fleet/**/*.*'

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ npm-debug.log*
9292
## @cypress/snapshot from apm plugin
9393
/snapshots.js
9494
/apm-diagnostics*.json
95-
/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.actual.png
96-
/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.diff.png
95+
/x-pack/solutions/observability/plugins/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.actual.png
96+
/x-pack/solutions/observability/plugins/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.diff.png
9797

9898
# transpiled cypress config
9999
x-pack/platform/plugins/shared/fleet/cypress.config.d.ts

0 commit comments

Comments
 (0)