Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sustainable Kibana Architecture: Move modules owned by @elastic/logstash #202756

Merged

Conversation

gsoldevila
Copy link
Contributor

@gsoldevila gsoldevila commented Dec 3, 2024

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 Slack channel for feedback.

Are you trying to rebase this PR to solve merge conflicts? Please follow the steps describe here.

1 plugin(s) are going to be relocated:

Id Target folder
@kbn/logstash-plugin x-pack/platform/plugins/private/logstash
Updated relative paths
x-pack/platform/plugins/private/logstash/jest.config.js:10
x-pack/platform/plugins/private/logstash/tsconfig.json:3
x-pack/platform/plugins/private/logstash/tsconfig.type_check.json:18
x-pack/platform/plugins/private/logstash/tsconfig.type_check.json:2
x-pack/platform/plugins/private/logstash/tsconfig.type_check.json:21
x-pack/platform/plugins/private/logstash/tsconfig.type_check.json:24
x-pack/platform/plugins/private/logstash/tsconfig.type_check.json:33
x-pack/platform/plugins/private/logstash/tsconfig.type_check.json:36
x-pack/platform/plugins/private/logstash/tsconfig.type_check.json:39
x-pack/platform/plugins/private/logstash/tsconfig.type_check.json:42
x-pack/platform/plugins/private/logstash/tsconfig.type_check.json:45
x-pack/platform/plugins/private/logstash/tsconfig.type_check.json:48
x-pack/platform/plugins/private/logstash/tsconfig.type_check.json:51
x-pack/platform/plugins/private/logstash/tsconfig.type_check.json:54

Copy link
Contributor

github-actions bot commented Dec 3, 2024

A documentation preview will be available soon.

Request a new doc build by commenting
  • Rebuild this PR: run docs-build
  • Rebuild this PR and all Elastic docs: run docs-build rebuild

run docs-build is much faster than run docs-build rebuild. A rebuild should only be needed in rare situations.

If your PR continues to fail for an unknown reason, the doc build pipeline may be broken. Elastic employees can check the pipeline status here.

@gsoldevila gsoldevila added Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc Team:Logstash release_note:skip Skip the PR/issue when compiling release notes backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) labels Dec 3, 2024
@gsoldevila gsoldevila marked this pull request as ready for review December 3, 2024 15:21
@gsoldevila gsoldevila requested review from a team as code owners December 3, 2024 15:21
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-core (Team:Core)

@gsoldevila gsoldevila added backport:skip This commit does not require backporting and removed backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) labels Dec 4, 2024
@gsoldevila gsoldevila force-pushed the kbn-team-1309-move-kibana-logstash branch 3 times, most recently from 8873028 to 68a03f9 Compare December 9, 2024 15:36
Copy link
Contributor

@TinaHeiligers TinaHeiligers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only change in core-code is .i18nrc.json.
LGTM

@gsoldevila gsoldevila force-pushed the kbn-team-1309-move-kibana-logstash branch from eb8da0f to 1b3e630 Compare December 11, 2024 17:44
@gsoldevila gsoldevila enabled auto-merge (squash) December 11, 2024 17:45
@rudolf rudolf added the plugin groups Relocate all plugins and packages under their respective platform/solution groups label Dec 18, 2024
@pgayvallet pgayvallet force-pushed the kbn-team-1309-move-kibana-logstash branch from 9132c16 to bf4e967 Compare December 23, 2024 15:38
Copy link
Contributor

@mashhurs mashhurs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@gsoldevila gsoldevila added backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) and removed backport:skip This commit does not require backporting labels Dec 24, 2024
@gsoldevila gsoldevila merged commit 49956ec into elastic:main Dec 24, 2024
8 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.x

https://github.com/elastic/kibana/actions/runs/12479445849

@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #24 / discover/security/context_awareness security root profile cell renderers host.name DataView mode should open host.name flyout

Metrics [docs]

✅ unchanged

History

@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
8.x Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 202756

Questions ?

Please refer to the Backport tool documentation

@pgayvallet
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

pgayvallet pushed a commit to pgayvallet/kibana that referenced this pull request Dec 24, 2024
…tash` (elastic#202756)

## 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.

#### 1 plugin(s) are going to be relocated:

| Id | Target folder |
| -- | ------------- |
| `@kbn/logstash-plugin` | `x-pack/platform/plugins/private/logstash` |

<details >
<summary>Updated references</summary>

```
./docs/developer/plugin-list.asciidoc
./package.json
./packages/kbn-repo-packages/package-map.json
./packages/kbn-synthetic-package-map/synthetic-packages.json
./packages/kbn-ts-projects/config-paths.json
./tsconfig.base.json
./tsconfig.base.type_check.json
./tsconfig.refs.json
./x-pack/.i18nrc.json
./x-pack/build/plugin/kibana/x-pack/.i18nrc.json
./x-pack/platform/plugins/private/logstash/jest.config.js
./yarn.lock
```

</details><details >
<summary>Updated relative paths</summary>

```
x-pack/platform/plugins/private/logstash/jest.config.js:10
x-pack/platform/plugins/private/logstash/tsconfig.json:3
```

</details>

(cherry picked from commit 49956ec)

# Conflicts:
#	.github/CODEOWNERS
#	package.json
#	tsconfig.base.json
pgayvallet added a commit that referenced this pull request Dec 24, 2024
…c/logstash` (#202756) (#205131)

# Backport

This will backport the following commits from `main` to `8.x`:
- [Sustainable Kibana Architecture: Move modules owned by
`@elastic/logstash`
(#202756)](#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`
(#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`
(#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`
(#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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) plugin groups Relocate all plugins and packages under their respective platform/solution groups release_note:skip Skip the PR/issue when compiling release notes Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc Team:Logstash v8.18.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants