Commit 6fbe134
# Backport
This will backport the following commits from `main` to `9.0`:
- [[UII] Remove system-managed properties (dates) when updating index
templates (#231524)](#231524)
<!--- Backport version: 9.6.6 -->
### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)
<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-08-13T19:23:04Z","message":"[UII]
Remove system-managed properties (dates) when updating index templates
(#231524)\n\n## Summary\n\nResolves #230902. This PR removes
system-managed properties (dates) from\nthe retrieved index templates
when updating the same index template\n(triggered when experimental
datastream feature settings have been\nchanged). The test that was
failing is now re-enabled.\n\nSimilar to
#231505, this is due to\nES
introducing these new date/timestamp fields
in\nhttps://github.com/elastic/elasticsearch/pull/131536.","sha":"9cdbe77e42ef8985daaf719da7c9895c6a56444d","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:version","v9.2.0","v9.1.3","v8.19.3","v9.0.6"],"title":"[UII]
Remove system-managed properties (dates) when updating index
templates","number":231524,"url":"https://github.com/elastic/kibana/pull/231524","mergeCommit":{"message":"[UII]
Remove system-managed properties (dates) when updating index templates
(#231524)\n\n## Summary\n\nResolves #230902. This PR removes
system-managed properties (dates) from\nthe retrieved index templates
when updating the same index template\n(triggered when experimental
datastream feature settings have been\nchanged). The test that was
failing is now re-enabled.\n\nSimilar to
#231505, this is due to\nES
introducing these new date/timestamp fields
in\nhttps://github.com/elastic/elasticsearch/pull/131536.","sha":"9cdbe77e42ef8985daaf719da7c9895c6a56444d"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19","9.0"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/231524","number":231524,"mergeCommit":{"message":"[UII]
Remove system-managed properties (dates) when updating index templates
(#231524)\n\n## Summary\n\nResolves #230902. This PR removes
system-managed properties (dates) from\nthe retrieved index templates
when updating the same index template\n(triggered when experimental
datastream feature settings have been\nchanged). The test that was
failing is now re-enabled.\n\nSimilar to
#231505, this is due to\nES
introducing these new date/timestamp fields
in\nhttps://github.com/elastic/elasticsearch/pull/131536.","sha":"9cdbe77e42ef8985daaf719da7c9895c6a56444d"}},{"branch":"9.1","label":"v9.1.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
---------
Co-authored-by: Jen Huang <[email protected]>
1 parent 02d0bd6 commit 6fbe134
File tree
2 files changed
+18
-3
lines changed2 files changed
+18
-3
lines changedLines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
749 | 749 | | |
750 | 750 | | |
751 | 751 | | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
| 755 | + | |
| 756 | + | |
| 757 | + | |
| 758 | + | |
752 | 759 | | |
753 | 760 | | |
754 | 761 | | |
| |||
Lines changed: 11 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
199 | 199 | | |
200 | 200 | | |
201 | 201 | | |
202 | | - | |
203 | | - | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
204 | 213 | | |
205 | 214 | | |
206 | 215 | | |
| |||
220 | 229 | | |
221 | 230 | | |
222 | 231 | | |
223 | | - | |
224 | 232 | | |
225 | 233 | | |
226 | 234 | | |
| |||
0 commit comments