[Fleet] Never delete @custom component templates#214232
Merged
nchaulet merged 1 commit intoelastic:mainfrom Mar 12, 2025
Merged
[Fleet] Never delete @custom component templates#214232nchaulet merged 1 commit intoelastic:mainfrom
nchaulet merged 1 commit intoelastic:mainfrom
Conversation
nchaulet
added
Team:Fleet
Contributor
|
Pinging @elastic/fleet (Team:Fleet) |
nchaulet
added
the
release_note:skip
Contributor
💚 Build Succeeded
Metrics [docs]
cc @nchaulet |
Member
+1 let's backport this. |
jen-huang
approved these changes
Mar 12, 2025
Contributor
|
Starting backport for target branches: 9.0 https://github.com/elastic/kibana/actions/runs/13820392629 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Mar 12, 2025
(cherry picked from commit fc64501)
Contributor
💚 All backports created successfully
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
Mar 12, 2025
…4279) # Backport This will backport the following commits from `main` to `9.0`: - [[Fleet] Never delete @Custom component templates (#214232)](#214232) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nicolas Chaulet","email":"nicolas.chaulet@elastic.co"},"sourceCommit":{"committedDate":"2025-03-12T19:58:40Z","message":"[Fleet] Never delete @Custom component templates (#214232)","sha":"fc64501577284038eef59bb8fc37ea4d80b49827","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-minor","v9.1.0","backport:8.18"],"title":"[Fleet] Never delete @Custom component templates","number":214232,"url":"https://github.com/elastic/kibana/pull/214232","mergeCommit":{"message":"[Fleet] Never delete @Custom component templates (#214232)","sha":"fc64501577284038eef59bb8fc37ea4d80b49827"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/214232","number":214232,"mergeCommit":{"message":"[Fleet] Never delete @Custom component templates (#214232)","sha":"fc64501577284038eef59bb8fc37ea4d80b49827"}}]}] BACKPORT--> Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Contributor
|
Starting backport for target branches: 8.18, 9.0 https://github.com/elastic/kibana/actions/runs/13822257272 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Mar 12, 2025
(cherry picked from commit fc64501)
Contributor
💔 Some backports could not be created
Note: Successful backport PRs will be merged automatically after passing CI. Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Mar 13, 2025
…14289) # Backport This will backport the following commits from `main` to `8.18`: - [[Fleet] Never delete @Custom component templates (#214232)](#214232) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nicolas Chaulet","email":"nicolas.chaulet@elastic.co"},"sourceCommit":{"committedDate":"2025-03-12T19:58:40Z","message":"[Fleet] Never delete @Custom component templates (#214232)","sha":"fc64501577284038eef59bb8fc37ea4d80b49827","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor","backport:version","v9.1.0","backport:8.18","v8.18.1"],"title":"[Fleet] Never delete @Custom component templates","number":214232,"url":"https://github.com/elastic/kibana/pull/214232","mergeCommit":{"message":"[Fleet] Never delete @Custom component templates (#214232)","sha":"fc64501577284038eef59bb8fc37ea4d80b49827"}},"sourceBranch":"main","suggestedTargetBranches":["8.18"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/214279","number":214279,"state":"MERGED","mergeCommit":{"sha":"ffc575724f73009d5d564b7c896ab162e7880c4e","message":"[9.0] [Fleet] Never delete @Custom component templates (#214232) (#214279)\n\n# Backport\n\nThis will backport the following commits from `main` to `9.0`:\n- [[Fleet] Never delete @Custom component templates\n(#214232)](https://github.com/elastic/kibana/pull/214232)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>"}},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/214232","number":214232,"mergeCommit":{"message":"[Fleet] Never delete @Custom component templates (#214232)","sha":"fc64501577284038eef59bb8fc37ea4d80b49827"}},{"branch":"8.18","label":"v8.18.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> --------- Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
CAWilson94
pushed a commit
to CAWilson94/kibana
that referenced
this pull request
Mar 22, 2025
Member
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
nchaulet
added a commit
that referenced
this pull request
Jan 12, 2026
(cherry picked from commit fc64501)
kpollich
added a commit
that referenced
this pull request
Jan 13, 2026
…48736) # Backport This will backport the following commits from `main` to `8.19`: - [[Fleet] Never delete @Custom component templates (#214232)](#214232) <!--- Backport version: 10.2.0 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nicolas Chaulet","email":"nicolas.chaulet@elastic.co"},"sourceCommit":{"committedDate":"2025-03-12T19:58:40Z","message":"[Fleet] Never delete @Custom component templates (#214232)","sha":"fc64501577284038eef59bb8fc37ea4d80b49827","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:version","v8.18.0","v9.1.0","v8.18.1","v8.19.10"],"title":"[Fleet] Never delete @Custom component templates","number":214232,"url":"https://github.com/elastic/kibana/pull/214232","mergeCommit":{"message":"[Fleet] Never delete @Custom component templates (#214232)","sha":"fc64501577284038eef59bb8fc37ea4d80b49827"}},"sourceBranch":"main","suggestedTargetBranches":["8.19"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/214279","number":214279,"state":"MERGED","mergeCommit":{"sha":"ffc575724f73009d5d564b7c896ab162e7880c4e","message":"[9.0] [Fleet] Never delete @Custom component templates (#214232) (#214279)\n\n# Backport\n\nThis will backport the following commits from `main` to `9.0`:\n- [[Fleet] Never delete @Custom component templates\n(#214232)](https://github.com/elastic/kibana/pull/214232)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>"}},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/214289","number":214289,"state":"MERGED","mergeCommit":{"sha":"e1b94117642e9a1a59773612a1cdf85b67247472","message":"[8.18] [Fleet] Never delete @Custom component templates (#214232) (#214289)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.18`:\n- [[Fleet] Never delete @Custom component templates\n(#214232)](https://github.com/elastic/kibana/pull/214232)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\n---------\n\nCo-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>"}},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/214232","number":214232,"mergeCommit":{"message":"[Fleet] Never delete @Custom component templates (#214232)","sha":"fc64501577284038eef59bb8fc37ea4d80b49827"}},{"branch":"8.19","label":"v8.19.10","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> --------- Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Resolve #212518
That PR update the code that delete component template on package removal to make sure we never delete user custom component template ( template ending with `@custom)
Test
You can create some
@customcomponent template for your package and check they are not deleted.I added some unit tests.
I think we should backport this to 8.18 and 9.0 as it seems a really weird behaviour to delete user component templates, especially global ones likes
logs@custom