Skip to content

Commit

Permalink
[8.x] Sustainable Kibana Architecture: Move modules owned by `@elasti…
Browse files Browse the repository at this point in the history
…c/logstash` (elastic#202756) (elastic#205131)

# Backport

This will backport the following commits from `main` to `8.x`:
- [Sustainable Kibana Architecture: Move modules owned by
`@elastic/logstash`
(elastic#202756)](elastic#202756)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Gerard
Soldevila","email":"gerard.soldevila@elastic.co"},"sourceCommit":{"committedDate":"2024-12-24T08:54:24Z","message":"Sustainable
Kibana Architecture: Move modules owned by `@elastic/logstash`
(elastic#202756)\n\n## Summary\r\n\r\nThis PR aims at relocating some of the
Kibana modules (plugins and\r\npackages) into a new folder structure,
according to the _Sustainable\r\nKibana Architecture_
initiative.\r\n\r\n> [!IMPORTANT]\r\n> * We kindly ask you to:\r\n> *
Manually fix the errors in the error section below (if there
are\r\nany).\r\n> * Search for the `packages[\\/\\\\]` and
`plugins[\\/\\\\]` patterns in the\r\nsource code (Babel and Eslint
config files), and update them\r\nappropriately.\r\n> * Manually
review\r\n`.buildkite/scripts/pipelines/pull_request/pipeline.ts` to
ensure that\r\nany CI pipeline customizations continue to be correctly
applied after\r\nthe changed path names\r\n> * Review all of the updated
files, specially the `.ts` and `.js` files\r\nlisted in the sections
below, as some of them contain relative paths\r\nthat have been
updated.\r\n> * Think of potential impact of the move, including tooling
and\r\nconfiguration files that can be pointing to the relocated
modules. E.g.:\r\n> * customised eslint rules\r\n> * docs pointing to
source code\r\n\r\n> [!NOTE]\r\n> * This PR has been
auto-generated.\r\n> * Any manual contributions will be lost if the
'relocate' script is\r\nre-run.\r\n> * Try to obtain the missing reviews
/ approvals before applying manual\r\nfixes, and/or keep your changes in
a .patch / git stash.\r\n> * Please
use\r\n[#sustainable_kibana_architecture](https://elastic.slack.com/archives/C07TCKTA22E)\r\nSlack
channel for feedback.\r\n\r\n#### 1 plugin(s) are going to be
relocated:\r\n\r\n| Id | Target folder |\r\n| -- | ------------- |\r\n|
`@kbn/logstash-plugin` | `x-pack/platform/plugins/private/logstash`
|\r\n\r\n\r\n<details >\r\n<summary>Updated
references</summary>\r\n\r\n```\r\n./docs/developer/plugin-list.asciidoc\r\n./package.json\r\n./packages/kbn-repo-packages/package-map.json\r\n./packages/kbn-synthetic-package-map/synthetic-packages.json\r\n./packages/kbn-ts-projects/config-paths.json\r\n./tsconfig.base.json\r\n./tsconfig.base.type_check.json\r\n./tsconfig.refs.json\r\n./x-pack/.i18nrc.json\r\n./x-pack/build/plugin/kibana/x-pack/.i18nrc.json\r\n./x-pack/platform/plugins/private/logstash/jest.config.js\r\n./yarn.lock\r\n```\r\n\r\n</details><details
>\r\n<summary>Updated relative
paths</summary>\r\n\r\n```\r\nx-pack/platform/plugins/private/logstash/jest.config.js:10\r\nx-pack/platform/plugins/private/logstash/tsconfig.json:3\r\n```\r\n\r\n</details>","sha":"49956ec243a2aad61a3c8ef6d59ee3743505f2e3","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","Team:Logstash","release_note:skip","v9.0.0","backport:prev-minor","plugin
groups"],"number":202756,"url":"https://github.com/elastic/kibana/pull/202756","mergeCommit":{"message":"Sustainable
Kibana Architecture: Move modules owned by `@elastic/logstash`
(elastic#202756)\n\n## Summary\r\n\r\nThis PR aims at relocating some of the
Kibana modules (plugins and\r\npackages) into a new folder structure,
according to the _Sustainable\r\nKibana Architecture_
initiative.\r\n\r\n> [!IMPORTANT]\r\n> * We kindly ask you to:\r\n> *
Manually fix the errors in the error section below (if there
are\r\nany).\r\n> * Search for the `packages[\\/\\\\]` and
`plugins[\\/\\\\]` patterns in the\r\nsource code (Babel and Eslint
config files), and update them\r\nappropriately.\r\n> * Manually
review\r\n`.buildkite/scripts/pipelines/pull_request/pipeline.ts` to
ensure that\r\nany CI pipeline customizations continue to be correctly
applied after\r\nthe changed path names\r\n> * Review all of the updated
files, specially the `.ts` and `.js` files\r\nlisted in the sections
below, as some of them contain relative paths\r\nthat have been
updated.\r\n> * Think of potential impact of the move, including tooling
and\r\nconfiguration files that can be pointing to the relocated
modules. E.g.:\r\n> * customised eslint rules\r\n> * docs pointing to
source code\r\n\r\n> [!NOTE]\r\n> * This PR has been
auto-generated.\r\n> * Any manual contributions will be lost if the
'relocate' script is\r\nre-run.\r\n> * Try to obtain the missing reviews
/ approvals before applying manual\r\nfixes, and/or keep your changes in
a .patch / git stash.\r\n> * Please
use\r\n[#sustainable_kibana_architecture](https://elastic.slack.com/archives/C07TCKTA22E)\r\nSlack
channel for feedback.\r\n\r\n#### 1 plugin(s) are going to be
relocated:\r\n\r\n| Id | Target folder |\r\n| -- | ------------- |\r\n|
`@kbn/logstash-plugin` | `x-pack/platform/plugins/private/logstash`
|\r\n\r\n\r\n<details >\r\n<summary>Updated
references</summary>\r\n\r\n```\r\n./docs/developer/plugin-list.asciidoc\r\n./package.json\r\n./packages/kbn-repo-packages/package-map.json\r\n./packages/kbn-synthetic-package-map/synthetic-packages.json\r\n./packages/kbn-ts-projects/config-paths.json\r\n./tsconfig.base.json\r\n./tsconfig.base.type_check.json\r\n./tsconfig.refs.json\r\n./x-pack/.i18nrc.json\r\n./x-pack/build/plugin/kibana/x-pack/.i18nrc.json\r\n./x-pack/platform/plugins/private/logstash/jest.config.js\r\n./yarn.lock\r\n```\r\n\r\n</details><details
>\r\n<summary>Updated relative
paths</summary>\r\n\r\n```\r\nx-pack/platform/plugins/private/logstash/jest.config.js:10\r\nx-pack/platform/plugins/private/logstash/tsconfig.json:3\r\n```\r\n\r\n</details>","sha":"49956ec243a2aad61a3c8ef6d59ee3743505f2e3"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/202756","number":202756,"mergeCommit":{"message":"Sustainable
Kibana Architecture: Move modules owned by `@elastic/logstash`
(elastic#202756)\n\n## Summary\r\n\r\nThis PR aims at relocating some of the
Kibana modules (plugins and\r\npackages) into a new folder structure,
according to the _Sustainable\r\nKibana Architecture_
initiative.\r\n\r\n> [!IMPORTANT]\r\n> * We kindly ask you to:\r\n> *
Manually fix the errors in the error section below (if there
are\r\nany).\r\n> * Search for the `packages[\\/\\\\]` and
`plugins[\\/\\\\]` patterns in the\r\nsource code (Babel and Eslint
config files), and update them\r\nappropriately.\r\n> * Manually
review\r\n`.buildkite/scripts/pipelines/pull_request/pipeline.ts` to
ensure that\r\nany CI pipeline customizations continue to be correctly
applied after\r\nthe changed path names\r\n> * Review all of the updated
files, specially the `.ts` and `.js` files\r\nlisted in the sections
below, as some of them contain relative paths\r\nthat have been
updated.\r\n> * Think of potential impact of the move, including tooling
and\r\nconfiguration files that can be pointing to the relocated
modules. E.g.:\r\n> * customised eslint rules\r\n> * docs pointing to
source code\r\n\r\n> [!NOTE]\r\n> * This PR has been
auto-generated.\r\n> * Any manual contributions will be lost if the
'relocate' script is\r\nre-run.\r\n> * Try to obtain the missing reviews
/ approvals before applying manual\r\nfixes, and/or keep your changes in
a .patch / git stash.\r\n> * Please
use\r\n[#sustainable_kibana_architecture](https://elastic.slack.com/archives/C07TCKTA22E)\r\nSlack
channel for feedback.\r\n\r\n#### 1 plugin(s) are going to be
relocated:\r\n\r\n| Id | Target folder |\r\n| -- | ------------- |\r\n|
`@kbn/logstash-plugin` | `x-pack/platform/plugins/private/logstash`
|\r\n\r\n\r\n<details >\r\n<summary>Updated
references</summary>\r\n\r\n```\r\n./docs/developer/plugin-list.asciidoc\r\n./package.json\r\n./packages/kbn-repo-packages/package-map.json\r\n./packages/kbn-synthetic-package-map/synthetic-packages.json\r\n./packages/kbn-ts-projects/config-paths.json\r\n./tsconfig.base.json\r\n./tsconfig.base.type_check.json\r\n./tsconfig.refs.json\r\n./x-pack/.i18nrc.json\r\n./x-pack/build/plugin/kibana/x-pack/.i18nrc.json\r\n./x-pack/platform/plugins/private/logstash/jest.config.js\r\n./yarn.lock\r\n```\r\n\r\n</details><details
>\r\n<summary>Updated relative
paths</summary>\r\n\r\n```\r\nx-pack/platform/plugins/private/logstash/jest.config.js:10\r\nx-pack/platform/plugins/private/logstash/tsconfig.json:3\r\n```\r\n\r\n</details>","sha":"49956ec243a2aad61a3c8ef6d59ee3743505f2e3"}}]}]
BACKPORT-->

Co-authored-by: Gerard Soldevila <gerard.soldevila@elastic.co>
  • Loading branch information
pgayvallet and gsoldevila authored Dec 24, 2024
1 parent b86b92e commit 6fe3d36
Show file tree
Hide file tree
Showing 104 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ packages/kbn-logging-mocks @elastic/kibana-core
x-pack/plugins/observability_solution/logs_data_access @elastic/obs-ux-logs-team
x-pack/plugins/observability_solution/logs_explorer @elastic/obs-ux-logs-team
x-pack/plugins/observability_solution/logs_shared @elastic/obs-ux-logs-team
x-pack/plugins/logstash @elastic/logstash
x-pack/platform/plugins/private/logstash @elastic/logstash
packages/kbn-managed-content-badge @elastic/kibana-visualizations
packages/kbn-managed-vscode-config @elastic/kibana-operations
packages/kbn-managed-vscode-config-cli @elastic/kibana-operations
Expand Down Expand Up @@ -1938,7 +1938,7 @@ x-pack/solutions/security/plugins/security_solution/server/lib/security_integrat
/x-pack/solutions/security/plugins/security_solution_serverless/**/*.scss @elastic/security-design

# Logstash
#CC# /x-pack/plugins/logstash/ @elastic/logstash
#CC# /x-pack/platform/plugins/private/logstash/ @elastic/logstash

# EUI team
/src/plugins/kibana_react/public/page_template/ @elastic/eui-team @elastic/appex-sharedux
Expand Down
2 changes: 1 addition & 1 deletion docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ using the CURL scripts in the scripts folder.
|Exposes the shared components and APIs to access and visualize logs.
|{kib-repo}blob/{branch}/x-pack/plugins/logstash[logstash]
|{kib-repo}blob/{branch}/x-pack/platform/plugins/private/logstash[logstash]
|WARNING: Missing README.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@
"@kbn/logs-data-access-plugin": "link:x-pack/plugins/observability_solution/logs_data_access",
"@kbn/logs-explorer-plugin": "link:x-pack/plugins/observability_solution/logs_explorer",
"@kbn/logs-shared-plugin": "link:x-pack/plugins/observability_solution/logs_shared",
"@kbn/logstash-plugin": "link:x-pack/plugins/logstash",
"@kbn/logstash-plugin": "link:x-pack/platform/plugins/private/logstash",
"@kbn/managed-content-badge": "link:packages/kbn-managed-content-badge",
"@kbn/management-cards-navigation": "link:src/platform/packages/shared/kbn-management/cards_navigation",
"@kbn/management-plugin": "link:src/platform/plugins/shared/management",
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -1174,8 +1174,8 @@
"@kbn/logs-explorer-plugin/*": ["x-pack/plugins/observability_solution/logs_explorer/*"],
"@kbn/logs-shared-plugin": ["x-pack/plugins/observability_solution/logs_shared"],
"@kbn/logs-shared-plugin/*": ["x-pack/plugins/observability_solution/logs_shared/*"],
"@kbn/logstash-plugin": ["x-pack/plugins/logstash"],
"@kbn/logstash-plugin/*": ["x-pack/plugins/logstash/*"],
"@kbn/logstash-plugin": ["x-pack/platform/plugins/private/logstash"],
"@kbn/logstash-plugin/*": ["x-pack/platform/plugins/private/logstash/*"],
"@kbn/managed-content-badge": ["packages/kbn-managed-content-badge"],
"@kbn/managed-content-badge/*": ["packages/kbn-managed-content-badge/*"],
"@kbn/managed-vscode-config": ["packages/kbn-managed-vscode-config"],
Expand Down
2 changes: 1 addition & 1 deletion x-pack/.i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"xpack.licensing": "plugins/licensing",
"xpack.lists": "solutions/security/plugins/lists",
"xpack.logstash": [
"plugins/logstash"
"platform/plugins/private/logstash"
],
"xpack.main": "legacy/plugins/xpack_main",
"xpack.maps": ["platform/plugins/shared/maps"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@

module.exports = {
preset: '@kbn/test',
rootDir: '../../..',
roots: ['<rootDir>/x-pack/plugins/logstash'],
coverageDirectory: '<rootDir>/target/kibana-coverage/jest/x-pack/plugins/logstash',
rootDir: '../../../../..',
roots: ['<rootDir>/x-pack/platform/plugins/private/logstash'],
coverageDirectory:
'<rootDir>/target/kibana-coverage/jest/x-pack/platform/plugins/private/logstash',
coverageReporters: ['text', 'html'],
collectCoverageFrom: [
'<rootDir>/x-pack/plugins/logstash/{common,public,server}/**/*.{js,ts,tsx}',
'<rootDir>/x-pack/platform/plugins/private/logstash/{common,public,server}/**/*.{js,ts,tsx}',
],
};
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

{
"extends": "../../../tsconfig.base.json",
"extends": "../../../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "target/types",
},
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6155,7 +6155,7 @@
version "0.0.0"
uid ""

"@kbn/logstash-plugin@link:x-pack/plugins/logstash":
"@kbn/logstash-plugin@link:x-pack/platform/plugins/private/logstash":
version "0.0.0"
uid ""

Expand Down

0 comments on commit 6fe3d36

Please sign in to comment.