Skip to content

Commit 2570ca4

Browse files
CoenWarmerCoenWarmer
committed
Merge branch 'main' of github.com:elastic/kibana into feat/move-obs-plugins-uptime
2 parents 6542baf + 3ab8e45 commit 2570ca4

1,423 files changed

Lines changed: 3931 additions & 2083 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_configs.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ disabled:
3333
- x-pack/test/defend_workflows_cypress/cli_config.ts
3434
- x-pack/test/defend_workflows_cypress/config.ts
3535
- x-pack/test/defend_workflows_cypress/serverless_config.ts
36-
- x-pack/plugins/observability_onboarding/e2e/ftr_config_open.ts
37-
- x-pack/plugins/observability_onboarding/e2e/ftr_config_runner.ts
38-
- x-pack/plugins/observability_onboarding/e2e/ftr_config.ts
36+
- x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config_open.ts
37+
- x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config_runner.ts
38+
- x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config.ts
3939
- x-pack/test/osquery_cypress/cli_config.ts
4040
- x-pack/test/osquery_cypress/serverless_cli_config.ts
4141
- x-pack/test/osquery_cypress/config.ts
@@ -58,9 +58,9 @@ disabled:
5858
- x-pack/plugins/observability_solution/profiling/e2e/ftr_config.ts
5959

6060
# Elastic Synthetics configs
61-
- x-pack/plugins/synthetics/e2e/config.ts
6261
- x-pack/plugins/observability_solution/uptime/e2e/uptime/synthetics_run.ts
63-
- x-pack/plugins/synthetics/e2e/synthetics/synthetics_run.ts
62+
- x-pack/plugins/observability_solution/synthetics/e2e/config.ts
63+
- x-pack/plugins/observability_solution/synthetics/e2e/synthetics/synthetics_run.ts
6464
- x-pack/plugins/observability_solution/exploratory_view/e2e/synthetics_run.ts
6565
- x-pack/plugins/observability_solution/ux/e2e/synthetics_run.ts
6666

‎.buildkite/pipelines/on_merge_unsupported_ftrs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ steps:
5454
depends_on: build
5555
timeout_in_minutes: 120
5656
artifact_paths:
57-
- 'x-pack/plugins/synthetics/e2e/.journeys/**/*'
57+
- 'x-pack/plugins/observability_solution/synthetics/e2e/.journeys/**/*'
5858
retry:
5959
automatic:
6060
- exit_status: '-1'

‎.buildkite/pipelines/pull_request/synthetics_plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
- quick_checks
99
timeout_in_minutes: 60
1010
artifact_paths:
11-
- 'x-pack/plugins/synthetics/e2e/.journeys/**/*'
11+
- 'x-pack/plugins/observability_solution/synthetics/e2e/.journeys/**/*'
1212
retry:
1313
automatic:
1414
- exit_status: '-1'

‎.buildkite/pipelines/pull_request/uptime_plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
- quick_checks
99
timeout_in_minutes: 60
1010
artifact_paths:
11-
- 'x-pack/plugins/synthetics/e2e/.journeys/**/*'
11+
- 'x-pack/plugins/observability_solution/synthetics/e2e/.journeys/**/*'
1212
retry:
1313
automatic:
1414
- exit_status: '-1'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ echo "--- Observability onboarding Cypress Tests"
1313

1414
cd "$XPACK_DIR"
1515

16-
node plugins/observability_onboarding/scripts/test/e2e.js \
16+
node plugins/observability_solution/observability_onboarding/scripts/test/e2e.js \
1717
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ echo "--- Synthetics plugin @elastic/synthetics Tests"
1313

1414
cd "$XPACK_DIR"
1515

16-
node plugins/synthetics/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
16+
node plugins/observability_solution/synthetics/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}

‎.eslintrc.js‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -915,11 +915,12 @@ module.exports = {
915915
'x-pack/plugins/observability_solution/exploratory_view/**/*.tsx',
916916
'x-pack/plugins/infra/**/*.tsx',
917917
'x-pack/plugins/observability/**/*.tsx',
918-
'x-pack/plugins/observability_shared/observability_ai_assistant/**/*.tsx',
919-
'x-pack/plugins/observability_onboarding/**/*.tsx',
918+
'x-pack/plugins/observability_solution/observability_onboarding/**/*.tsx',
919+
'x-pack/plugins/observability_solution/observability_ai_assistant/**/*.tsx',
920+
'x-pack/plugins/observability_solution/observability_onboarding/**/*.tsx',
920921
'x-pack/plugins/observability_solution/observability_shared/**/*.tsx',
921922
'x-pack/plugins/observability_solution/profiling/**/*.tsx',
922-
'x-pack/plugins/synthetics/**/*.tsx',
923+
'x-pack/plugins/observability_solution/synthetics/**/*.tsx',
923924
'x-pack/plugins/observability_solution/ux/**/*.tsx',
924925
'src/plugins/ai_assistant_management/**/*.tsx',
925926
],
@@ -933,11 +934,12 @@ module.exports = {
933934
'x-pack/plugins/observability_solution/exploratory_view/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
934935
'x-pack/plugins/infra/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
935936
'x-pack/plugins/observability/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
937+
'x-pack/plugins/observability_solution/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
936938
'x-pack/plugins/observability_solution/observability_ai_assistant/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
937-
'x-pack/plugins/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
939+
'x-pack/plugins/observability_solution/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
938940
'x-pack/plugins/observability_solution/observability_shared/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
939941
'x-pack/plugins/observability_solution/profiling/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
940-
'x-pack/plugins/synthetics/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
942+
'x-pack/plugins/observability_solution/synthetics/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
941943
'x-pack/plugins/observability_solution/ux/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
942944
'src/plugins/ai_assistant_management/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
943945
],
@@ -971,7 +973,9 @@ module.exports = {
971973
},
972974
{
973975
// disable imports from legacy uptime plugin
974-
files: ['x-pack/plugins/synthetics/public/apps/synthetics/**/*.{js,mjs,ts,tsx}'],
976+
files: [
977+
'x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/**/*.{js,mjs,ts,tsx}',
978+
],
975979
rules: {
976980
'no-restricted-imports': [
977981
'error',

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ x-pack/packages/observability/alerting_test_data @elastic/obs-ux-management-team
575575
x-pack/test/cases_api_integration/common/plugins/observability @elastic/response-ops
576576
x-pack/packages/observability/get_padded_alert_time_range_util @elastic/obs-ux-management-team
577577
x-pack/plugins/observability_solution/observability_logs_explorer @elastic/obs-ux-logs-team
578-
x-pack/plugins/observability_onboarding @elastic/obs-ux-logs-team
578+
x-pack/plugins/observability_solution/observability_onboarding @elastic/obs-ux-logs-team
579579
x-pack/plugins/observability @elastic/obs-ux-management-team
580580
x-pack/plugins/observability_solution/observability_shared @elastic/observability-ui
581581
x-pack/test/security_api_integration/plugins/oidc_provider @elastic/kibana-security
@@ -790,7 +790,7 @@ test/server_integration/plugins/status_plugin_b @elastic/kibana-core
790790
packages/kbn-std @elastic/kibana-core
791791
packages/kbn-stdio-dev-helpers @elastic/kibana-operations
792792
packages/kbn-storybook @elastic/kibana-operations
793-
x-pack/plugins/synthetics @elastic/obs-ux-infra_services-team
793+
x-pack/plugins/observability_solution/synthetics @elastic/obs-ux-infra_services-team
794794
x-pack/test/alerting_api_integration/common/plugins/task_manager_fixture @elastic/response-ops
795795
x-pack/test/plugin_api_perf/plugins/task_manager_performance @elastic/response-ops
796796
x-pack/plugins/task_manager @elastic/response-ops

‎.github/paths-labeller.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
- 'packages/kbn-apm-synthtrace/**/*.*'
1515
- 'packages/kbn-apm-synthtrace-client/**/*.*'
1616
- 'packages/kbn-apm-utils/**/*.*'
17-
- 'x-pack/plugins/synthetics/**/*.*'
17+
- 'x-pack/plugins/observability_solution/synthetics/**/*.*'
1818
- 'x-pack/plugins/observability_solution/ux/**/*.*'
19-
- 'x-pack/plugins/observability/public/components/shared/exploratory_view/**/*.*'
19+
- 'x-pack/plugins/observability_solution/exploratory_view/**/*.*'
2020
- 'Team:Fleet':
2121
- 'x-pack/plugins/fleet/**/*.*'
2222
- 'x-pack/test/fleet_api_integration/**/*.*'

‎.i18nrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"savedObjectsManagement": "src/plugins/saved_objects_management",
103103
"searchConnectors": "packages/kbn-search-connectors",
104104
"server": "src/legacy/server",
105-
"share": "src/plugins/share",
105+
"share": ["src/plugins/share", "packages/kbn-reporting-share"],
106106
"sharedUXPackages": "packages/shared-ux",
107107
"searchApiPanels": "packages/kbn-search-api-panels/",
108108
"searchErrors": "packages/kbn-search-errors",

0 commit comments

Comments
 (0)