Skip to content

Commit 47f675c

Browse files
gsoldevilapgayvalletkibanamachine
authored
Sustainable Kibana Architecture: Move modules owned by @elastic/stack-monitoring (elastic#202860)
## Summary This PR aims at relocating some of the Kibana modules (plugins and packages) into a new folder structure, according to the _Sustainable Kibana Architecture_ initiative. > [!IMPORTANT] > * We kindly ask you to: > * Manually fix the errors in the error section below (if there are any). > * Search for the `packages[\/\\]` and `plugins[\/\\]` patterns in the source code (Babel and Eslint config files), and update them appropriately. > * Manually review `.buildkite/scripts/pipelines/pull_request/pipeline.ts` to ensure that any CI pipeline customizations continue to be correctly applied after the changed path names > * Review all of the updated files, specially the `.ts` and `.js` files listed in the sections below, as some of them contain relative paths that have been updated. > * Think of potential impact of the move, including tooling and configuration files that can be pointing to the relocated modules. E.g.: > * customised eslint rules > * docs pointing to source code > [!NOTE] > * This PR has been auto-generated. > * Any manual contributions will be lost if the 'relocate' script is re-run. > * Try to obtain the missing reviews / approvals before applying manual fixes, and/or keep your changes in a .patch / git stash. > * Please use [#sustainable_kibana_architecture](https://elastic.slack.com/archives/C07TCKTA22E) Slack channel for feedback. Are you trying to rebase this PR to solve merge conflicts? Please follow the steps describe [here](https://elastic.slack.com/archives/C07TCKTA22E/p1734019532879269?thread_ts=1734019339.935419&cid=C07TCKTA22E). #### 2 plugin(s) are going to be relocated: | Id | Target folder | | -- | ------------- | | `@kbn/monitoring-collection-plugin` | `x-pack/platform/plugins/private/monitoring_collection` | | `@kbn/monitoring-plugin` | `x-pack/platform/plugins/private/monitoring` | <details > <summary>Updated relative paths</summary> ``` x-pack/platform/plugins/private/monitoring/dev_docs/how_to/testing.md:7 x-pack/platform/plugins/private/monitoring/dev_docs/how_to/testing.md:8 x-pack/platform/plugins/private/monitoring/jest.config.js:10 x-pack/platform/plugins/private/monitoring/tsconfig.json:2 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:100 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:103 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:106 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:109 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:115 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:121 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:127 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:130 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:133 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:136 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:139 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:142 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:145 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:19 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:2 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:22 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:25 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:28 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:31 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:34 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:37 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:64 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:67 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:70 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:73 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:76 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:79 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:82 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:85 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:88 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:91 x-pack/platform/plugins/private/monitoring/tsconfig.type_check.json:97 x-pack/platform/plugins/private/monitoring_collection/jest.config.js:10 x-pack/platform/plugins/private/monitoring_collection/tsconfig.json:2 x-pack/platform/plugins/private/monitoring_collection/tsconfig.type_check.json:16 x-pack/platform/plugins/private/monitoring_collection/tsconfig.type_check.json:19 x-pack/platform/plugins/private/monitoring_collection/tsconfig.type_check.json:2 x-pack/platform/plugins/private/monitoring_collection/tsconfig.type_check.json:22 x-pack/platform/plugins/private/monitoring_collection/tsconfig.type_check.json:25 x-pack/platform/plugins/private/monitoring_collection/tsconfig.type_check.json:28 x-pack/platform/plugins/private/monitoring_collection/tsconfig.type_check.json:31 ``` </details> --------- Co-authored-by: pgayvallet <[email protected]> Co-authored-by: kibanamachine <[email protected]>
1 parent 681d40e commit 47f675c

File tree

1,105 files changed

+394
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,105 files changed

+394
-143
lines changed

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,8 @@ x-pack/platform/plugins/private/grokdebugger @elastic/kibana-management
847847
x-pack/platform/plugins/private/index_lifecycle_management @elastic/kibana-management
848848
x-pack/platform/plugins/private/license_api_guard @elastic/kibana-management
849849
x-pack/platform/plugins/private/logstash @elastic/logstash
850+
x-pack/platform/plugins/private/monitoring @elastic/stack-monitoring
851+
x-pack/platform/plugins/private/monitoring_collection @elastic/stack-monitoring
850852
x-pack/platform/plugins/private/painless_lab @elastic/kibana-management
851853
x-pack/platform/plugins/private/remote_clusters @elastic/kibana-management
852854
x-pack/platform/plugins/private/rollup @elastic/kibana-management
@@ -900,8 +902,6 @@ x-pack/plugins/global_search_providers @elastic/appex-sharedux
900902
x-pack/plugins/graph @elastic/kibana-visualizations
901903
x-pack/plugins/lens @elastic/kibana-visualizations
902904
x-pack/plugins/licensing @elastic/kibana-core
903-
x-pack/plugins/monitoring @elastic/stack-monitoring
904-
x-pack/plugins/monitoring_collection @elastic/stack-monitoring
905905
x-pack/plugins/notifications @elastic/appex-sharedux
906906
x-pack/plugins/observability_solution/apm @elastic/obs-ux-infra_services-team
907907
x-pack/plugins/observability_solution/apm_data_access @elastic/obs-ux-infra_services-team
@@ -2544,7 +2544,7 @@ x-pack/solutions/security/plugins/security_solution/server/lib/security_integrat
25442544

25452545
# Observability design
25462546
/x-pack/plugins/fleet/**/*.scss @elastic/observability-design
2547-
/x-pack/plugins/monitoring/**/*.scss @elastic/observability-design
2547+
/x-pack/platform/plugins/private/monitoring/**/*.scss @elastic/observability-design
25482548

25492549
# Ent. Search design
25502550
/x-pack/plugins/enterprise_search/**/*.scss @elastic/search-design

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 2 additions & 2 deletions

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,8 @@
682682
"@kbn/ml-url-state": "link:x-pack/platform/packages/private/ml/url_state",
683683
"@kbn/ml-validators": "link:x-pack/platform/packages/private/ml/validators",
684684
"@kbn/monaco": "link:packages/kbn-monaco",
685-
"@kbn/monitoring-collection-plugin": "link:x-pack/plugins/monitoring_collection",
686-
"@kbn/monitoring-plugin": "link:x-pack/plugins/monitoring",
685+
"@kbn/monitoring-collection-plugin": "link:x-pack/platform/plugins/private/monitoring_collection",
686+
"@kbn/monitoring-plugin": "link:x-pack/platform/plugins/private/monitoring",
687687
"@kbn/navigation-plugin": "link:src/plugins/navigation",
688688
"@kbn/newsfeed-plugin": "link:src/plugins/newsfeed",
689689
"@kbn/newsfeed-test-plugin": "link:test/common/plugins/newsfeed",

‎src/dev/precommit_hook/casing_check_config.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export const IGNORE_FILE_GLOBS = [
3030
'x-pack/platform/plugins/private/canvas/canvas_plugin_src/**/*',
3131
'x-pack/platform/plugins/private/canvas/server/templates/assets/*.{png,jpg,svg}',
3232
'x-pack/plugins/cases/docs/**/*',
33-
'x-pack/plugins/monitoring/public/lib/jquery_flot/**/*',
33+
'x-pack/platform/plugins/private/monitoring/public/lib/jquery_flot/**/*',
3434
'x-pack/plugins/fleet/cypress/packages/*.zip',
3535
'**/apm-diagnostics-*.json',
3636
'**/.*',
@@ -178,10 +178,10 @@ export const TEMPORARILY_IGNORED_PATHS = [
178178
'test/functional/apps/management/exports/_import_objects-conflicts.json',
179179
'x-pack/legacy/platform/plugins/shared/index_management/public/lib/editSettings.js',
180180
'x-pack/legacy/platform/plugins/shared/license_management/public/store/reducers/licenseManagement.js',
181-
'x-pack/plugins/monitoring/public/icons/health-gray.svg',
182-
'x-pack/plugins/monitoring/public/icons/health-green.svg',
183-
'x-pack/plugins/monitoring/public/icons/health-red.svg',
184-
'x-pack/plugins/monitoring/public/icons/health-yellow.svg',
181+
'x-pack/platform/plugins/private/monitoring/public/icons/health-gray.svg',
182+
'x-pack/platform/plugins/private/monitoring/public/icons/health-green.svg',
183+
'x-pack/platform/plugins/private/monitoring/public/icons/health-red.svg',
184+
'x-pack/platform/plugins/private/monitoring/public/icons/health-yellow.svg',
185185
'x-pack/platform/plugins/shared/screenshotting/server/assets/fonts/noto/NotoSansCJKtc-Medium.ttf',
186186
'x-pack/platform/plugins/shared/screenshotting/server/assets/fonts/noto/NotoSansCJKtc-Regular.ttf',
187187
'x-pack/platform/plugins/shared/screenshotting/server/assets/fonts/roboto/Roboto-Italic.ttf',

‎tsconfig.base.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,10 +1298,10 @@
12981298
"@kbn/mock-idp-utils/*": ["packages/kbn-mock-idp-utils/*"],
12991299
"@kbn/monaco": ["packages/kbn-monaco"],
13001300
"@kbn/monaco/*": ["packages/kbn-monaco/*"],
1301-
"@kbn/monitoring-collection-plugin": ["x-pack/plugins/monitoring_collection"],
1302-
"@kbn/monitoring-collection-plugin/*": ["x-pack/plugins/monitoring_collection/*"],
1303-
"@kbn/monitoring-plugin": ["x-pack/plugins/monitoring"],
1304-
"@kbn/monitoring-plugin/*": ["x-pack/plugins/monitoring/*"],
1301+
"@kbn/monitoring-collection-plugin": ["x-pack/platform/plugins/private/monitoring_collection"],
1302+
"@kbn/monitoring-collection-plugin/*": ["x-pack/platform/plugins/private/monitoring_collection/*"],
1303+
"@kbn/monitoring-plugin": ["x-pack/platform/plugins/private/monitoring"],
1304+
"@kbn/monitoring-plugin/*": ["x-pack/platform/plugins/private/monitoring/*"],
13051305
"@kbn/navigation-plugin": ["src/plugins/navigation"],
13061306
"@kbn/navigation-plugin/*": ["src/plugins/navigation/*"],
13071307
"@kbn/newsfeed-plugin": ["src/plugins/newsfeed"],

‎x-pack/.i18nrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"platform/plugins/shared/ml"
9999
],
100100
"xpack.monitoring": [
101-
"plugins/monitoring"
101+
"platform/plugins/private/monitoring"
102102
],
103103
"xpack.observability": "solutions/observability/plugins/observability",
104104
"xpack.observabilityAiAssistant": [

‎x-pack/.telemetryrc.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"output": "plugins/telemetry_collection_xpack/schema/xpack_plugins.json",
44
"root": "plugins/",
55
"exclude": [
6-
"plugins/monitoring/server/telemetry_collection/"
6+
"platform/plugins/private/monitoring/server/telemetry_collection/"
77
]
88
},
99
{
1010
"output": "plugins/telemetry_collection_xpack/schema/xpack_monitoring.json",
11-
"root": "plugins/monitoring/server/telemetry_collection/",
11+
"root": "platform/plugins/private/monitoring/server/telemetry_collection/",
1212
"exclude": []
1313
},
1414
{

x-pack/plugins/monitoring/common/cancel_promise.ts renamed to x-pack/platform/plugins/private/monitoring/common/cancel_promise.ts

File renamed without changes.

x-pack/plugins/monitoring/common/ccs_utils.test.js renamed to x-pack/platform/plugins/private/monitoring/common/ccs_utils.test.js

File renamed without changes.

x-pack/plugins/monitoring/common/ccs_utils.ts renamed to x-pack/platform/plugins/private/monitoring/common/ccs_utils.ts

File renamed without changes.

0 commit comments

Comments
 (0)