Skip to content

Sustainable Kibana Architecture: Fix after-relocation issues#205613

Merged
dokmic merged 2 commits intoelastic:mainfrom
dokmic:bugfix/after-relocation-bugs
Jan 6, 2025
Merged

Sustainable Kibana Architecture: Fix after-relocation issues#205613
dokmic merged 2 commits intoelastic:mainfrom
dokmic:bugfix/after-relocation-bugs

Conversation

@dokmic
Copy link
Copy Markdown
Contributor

@dokmic dokmic commented Jan 6, 2025

Summary

After merging #202748, #204959, and #201653, all of the properties in some telemetry schemas were moved completely, but node scripts/telemetry_check --fix didn't update the properties object correctly.

Also, in #202748 and #201653, the relocation script changed some paths, confusing them with @kbn/security-plugin and @kbn/cloud-plugin.

@dokmic dokmic requested review from a team as code owners January 6, 2025 14:47
@dokmic dokmic added Team:Core Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// release_note:skip Skip the PR/issue when compiling release notes v9.0.0 backport:version Backport to applied version labels v8.18.0 plugin groups Relocate all plugins and packages under their respective platform/solution groups labels Jan 6, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Contributor

@jbudz jbudz left a comment

Choose a reason for hiding this comment

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

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

@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

  • 💔 Build #264371 failed 935ca6524c740c56454fb720db26d17dd0e59720

@dokmic dokmic merged commit 5409631 into elastic:main Jan 6, 2025
@dokmic dokmic deleted the bugfix/after-relocation-bugs branch January 6, 2025 18:02
@kibanamachine
Copy link
Copy Markdown
Contributor

Starting backport for target branches: 8.x

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

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jan 6, 2025
…#205613)

After merging elastic#202748, elastic#204959, and elastic#201653, all of the properties in
some telemetry schemas were moved completely, but `node
scripts/telemetry_check --fix` didn't update the `properties` object
correctly.

Also, in elastic#202748 and elastic#201653, the relocation script changed some paths,
confusing them with `@kbn/security-plugin` and `@kbn/cloud-plugin`.

(cherry picked from commit 5409631)
@kibanamachine
Copy link
Copy Markdown
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

kibanamachine added a commit that referenced this pull request Jan 6, 2025
…205613) (#205641)

# Backport

This will backport the following commits from `main` to `8.x`:
- [Sustainable Kibana Architecture: Fix after-relocation issues
(#205613)](#205613)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT [{"author":{"name":"Michael
Dokolin","email":"mikhail.dokolin@elastic.co"},"sourceCommit":{"committedDate":"2025-01-06T18:02:36Z","message":"Sustainable
Kibana Architecture: Fix after-relocation issues (#205613)\n\nAfter
merging #202748, #204959, and #201653, all of the properties in\nsome
telemetry schemas were moved completely, but
`node\nscripts/telemetry_check --fix` didn't update the `properties`
object\ncorrectly.\n\nAlso, in #202748 and #201653, the relocation
script changed some paths,\nconfusing them with `@kbn/security-plugin`
and
`@kbn/cloud-plugin`.","sha":"540963148dc671b02655ced8285dbbd817d9d5c9","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","release_note:skip","v9.0.0","backport:version","v8.18.0","plugin
groups"],"title":"Sustainable Kibana Architecture: Fix after-relocation
issues","number":205613,"url":"https://github.com/elastic/kibana/pull/205613","mergeCommit":{"message":"Sustainable
Kibana Architecture: Fix after-relocation issues (#205613)\n\nAfter
merging #202748, #204959, and #201653, all of the properties in\nsome
telemetry schemas were moved completely, but
`node\nscripts/telemetry_check --fix` didn't update the `properties`
object\ncorrectly.\n\nAlso, in #202748 and #201653, the relocation
script changed some paths,\nconfusing them with `@kbn/security-plugin`
and
`@kbn/cloud-plugin`.","sha":"540963148dc671b02655ced8285dbbd817d9d5c9"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205613","number":205613,"mergeCommit":{"message":"Sustainable
Kibana Architecture: Fix after-relocation issues (#205613)\n\nAfter
merging #202748, #204959, and #201653, all of the properties in\nsome
telemetry schemas were moved completely, but
`node\nscripts/telemetry_check --fix` didn't update the `properties`
object\ncorrectly.\n\nAlso, in #202748 and #201653, the relocation
script changed some paths,\nconfusing them with `@kbn/security-plugin`
and
`@kbn/cloud-plugin`.","sha":"540963148dc671b02655ced8285dbbd817d9d5c9"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Michael Dokolin <mikhail.dokolin@elastic.co>
dokmic added a commit that referenced this pull request Jan 7, 2025
Follow-up of #205613. Remove check blocking empty properties from
writing.
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jan 7, 2025
Follow-up of elastic#205613. Remove check blocking empty properties from
writing.

(cherry picked from commit aa8195c)
kibanamachine added a commit that referenced this pull request Jan 7, 2025
#205786)

# Backport

This will backport the following commits from `main` to `8.x`:
- [Fix telemetry CLI to write empty properties collection
(#205746)](#205746)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT [{"author":{"name":"Michael
Dokolin","email":"mikhail.dokolin@elastic.co"},"sourceCommit":{"committedDate":"2025-01-07T16:46:43Z","message":"Fix
telemetry CLI to write empty properties collection
(#205746)\n\nFollow-up of #205613. Remove check blocking empty
properties
from\nwriting.","sha":"aa8195ced450bf97145fa27cadd3e6b8c922487f","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","release_note:skip","v9.0.0","backport:version","v8.18.0"],"title":"Fix
telemetry CLI to write empty properties
collection","number":205746,"url":"https://github.com/elastic/kibana/pull/205746","mergeCommit":{"message":"Fix
telemetry CLI to write empty properties collection
(#205746)\n\nFollow-up of #205613. Remove check blocking empty
properties
from\nwriting.","sha":"aa8195ced450bf97145fa27cadd3e6b8c922487f"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205746","number":205746,"mergeCommit":{"message":"Fix
telemetry CLI to write empty properties collection
(#205746)\n\nFollow-up of #205613. Remove check blocking empty
properties
from\nwriting.","sha":"aa8195ced450bf97145fa27cadd3e6b8c922487f"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Michael Dokolin <mikhail.dokolin@elastic.co>
viduni94 pushed a commit to viduni94/kibana that referenced this pull request Jan 23, 2025
…#205613)

After merging elastic#202748, elastic#204959, and elastic#201653, all of the properties in
some telemetry schemas were moved completely, but `node
scripts/telemetry_check --fix` didn't update the `properties` object
correctly.

Also, in elastic#202748 and elastic#201653, the relocation script changed some paths,
confusing them with `@kbn/security-plugin` and `@kbn/cloud-plugin`.
viduni94 pushed a commit to viduni94/kibana that referenced this pull request Jan 23, 2025
Follow-up of elastic#205613. Remove check blocking empty properties from
writing.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:version Backport to applied version labels 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 Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// v8.18.0 v9.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants