Skip to content

Conversation

szybia
Copy link
Contributor

@szybia szybia commented Jul 18, 2025

Add new system-managed properties to component templates:

  • created_date: when the template with a given ID was created
  • modified_date: when the template was updated

Relates to: #108754

szybia added 3 commits July 22, 2025 11:29
…-tracking

* upstream/main: (44 commits)
  Term vector API on stateless search nodes (elastic#129902)
  TEST Fix ThreadPoolMergeSchedulerStressTestIT testMergingFallsBehindAndThenCatchesUp (elastic#131636)
  Add inference.put_custom rest-api-spec (elastic#131660)
  ESQL: Fewer serverless docs in tests (elastic#131651)
  Skip search on indices with INDEX_REFRESH_BLOCK (elastic#129132)
  Mute org.elasticsearch.indices.cluster.RemoteSearchForceConnectTimeoutIT testTimeoutSetting elastic#131656
  [jdk] Resolve EA OpenJDK builds to our JDK archive (elastic#131237)
  Add optimized path for intermediate values aggregator (elastic#131390)
  Correctly handling download_database_on_pipeline_creation within a pipeline processor within a default or final pipeline (elastic#131236)
  Refresh potential lost connections at query start for `_search` (elastic#130463)
  Add template_id to patterned-text type (elastic#131401)
  Integrate LIKE/RLIKE LIST with ReplaceStringCasingWithInsensitiveRegexMatch rule (elastic#131531)
  [ES|QL] Add doc for the COMPLETION command (elastic#131010)
  ESQL: Add times to topn status (elastic#131555)
  ESQL: Add asynchronous pre-optimization step for logical plan (elastic#131440)
  ES|QL: Improve generative tests for FORK [130015] (elastic#131206)
  Update index mapping update privileges (elastic#130894)
  ESQL: Added Sample operator NamedWritable to plugin (elastic#131541)
  update `kibana_system` to grant it access to `.chat-*` system index (elastic#131419)
  Clarify heap size configuration (elastic#131607)
  ...
@szybia szybia requested a review from Copilot July 22, 2025 12:12
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR adds system-managed created_date and modified_date tracking properties to component templates in Elasticsearch. These timestamps track when templates are created and last modified.

Key Changes

  • Extended ComponentTemplate class to include createdDateMillis and modifiedDateMillis fields
  • Modified template creation/update logic to automatically set these timestamps using an injectable InstantSource
  • Added validation to prevent users from manually setting these system-managed properties

Reviewed Changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
ComponentTemplate.java Added new timestamp fields, serialization/deserialization, and date formatting
MetadataIndexTemplateService.java Implemented timestamp logic for template creation and updates with InstantSource injection
PutComponentTemplateAction.java Added validation to reject user-provided timestamp values
TransportVersions.java Added new transport version for backward compatibility
Various test files Updated constructors and assertions to handle new timestamp fields
20_tracking.yml Added REST API tests for timestamp behavior and validation
Comments suppressed due to low confidence (1)

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutComponentTemplateAction.java:34

  • [nitpick] The constant name 'COMPONENT_TEMPLATE_TRACKING_INFO' doesn't follow the same naming pattern as the existing constants which describe specific features (e.g., 'SUPPORTS_FAILURE_STORE'). Consider renaming to 'SUPPORTS_COMPONENT_TEMPLATE_TRACKING_INFO' for consistency.
    private static final String COMPONENT_TEMPLATE_TRACKING_INFO = "component_template_tracking_info";

@szybia szybia added >enhancement :Data Management/Ingest Node Execution or management of Ingest Pipelines including GeoIP Team:Data Management Meta label for data/management team labels Jul 22, 2025
@szybia szybia marked this pull request as ready for review July 22, 2025 12:19
@szybia szybia requested a review from PeteGillinElastic July 22, 2025 12:19
@elasticsearchmachine
Copy link
Collaborator

Hi @szybia, I've created a changelog YAML for you.

@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-data-management (Team:Data Management)

Copy link
Member

@PeteGillinElastic PeteGillinElastic left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM, just a couple of comments.

szybia added 3 commits July 25, 2025 19:09
…-tracking

* upstream/main: (106 commits)
  Pipelines: Add `created_date` and `modified_date` (elastic#130847)
  add thread pool change availability (elastic#131734)
  Add failure store availability info / and port over privileges (elastic#131729)
  add availability information for ssl handshake timeout settings (elastic#131786)
  add availability information for rescore_vector (elastic#131710)
  add availability to oversample value of 0 (elastic#131707)
  clarify hnsw filter heuristic setting availability (elastic#131715)
  add availability info for default heap dump path change (elastic#131713)
  clarify default algorithms per stack version (elastic#131728)
  Refine error messages in `Fork` for correctness and clarity. (elastic#131701)
  [ES|QL] Replace RoundTo linear search evaluator with manual evaluators (elastic#131733)
  ESQL: Fix buildParams in tests with --configuration-cache (elastic#131826)
  Unmute `CrossClusterEsqlRCS2EnrichUnavailableRemotesIT#testEsqlEnrichWithSkipUnavailable` (elastic#131916)
  Allow templates for `.chat-*` index template (elastic#131914)
  ESQL: Fix NPE on empty to_lower/to_upper call (elastic#131917)
  Fix score computation in ES91Int4VectorsScorer (elastic#131905)
  Register a blob cache long counter metric for total evicted regions (elastic#131862)
  Move plan attribute resolution to its own component (elastic#131830)
  Make restore support multi-project (elastic#131661)
  Use logically more correct expression (elastic#131869)
  ...
@szybia szybia requested a review from PeteGillinElastic July 25, 2025 18:27
@elasticsearchmachine elasticsearchmachine added the serverless-linked Added by automation, don't add manually label Jul 28, 2025
…-tracking

* upstream/main:
  Fix MergeWithLowDiskSpaceIT testRelocationWhileForceMerging (elastic#131806)
  [ML] Prevent the trained model deployment memory estimation from double-counting allocations. (elastic#131990)
  ES|QL Assert current thread during query planning and execution (elastic#131807)
  Add ElasticsearchIndexDeletionPolicy and EngineConfig policy wrapper (elastic#130442)
  [TEST] Adds tests for ESTestCase randomSubset methods (elastic#131745)
  Simplify esql session (elastic#131925)
  Simplify EsqlExecution info serialization (elastic#131823)
  Add utility to check for project global block (elastic#131927)
  [DOCS] Update ES|QL applies to's (elastic#131805)
  Handle structured log messages (elastic#131027)
  Mute org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT test {p0=search/600_flattened_ignore_above/flattened ignore_above multi-value field} elastic#131967
  Mute org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS2EnrichUnavailableRemotesIT testEsqlEnrichWithSkipUnavailable elastic#131965
  Mute org.elasticsearch.xpack.restart.FullClusterRestartIT testWatcherWithApiKey {cluster=UPGRADED} elastic#131964
  [ES|QL] Fix aggregate_metric_double sorting and mv_expand issues (elastic#131658)
  Reduce logging levels for meter usage tests (elastic#131935)
Copy link
Member

@PeteGillinElastic PeteGillinElastic left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM!

…-tracking

* upstream/main: (26 commits)
  Add release notes for v9.1.0 release (elastic#131953)
  Unmute multi_node generative tests (elastic#132021)
  Avoid re-enqueueing merge tasks (elastic#132020)
  Fix file entitlements for shared data dir (elastic#131748)
  ES|QL brute force l2_norm vector function (elastic#132025)
  Make ES|QL SAMPLE not a pipeline breaker (elastic#132014)
  Speed up tail computation in MemorySegmentES91OSQVectorsScorer (elastic#132001)
  Remove deprecated usages in `TransportPutFollowAction` (elastic#132038)
  Simulate impact of shard movement using shard-level write load (elastic#131406)
  Remove RemoteClusterService.getConnections() method (elastic#131948)
  Fix off by one in ValuesBytesRefAggregator (elastic#132032)
  Use unicode strings in data generation by default (elastic#132028)
  Adding index.refresh_interval as a data stream setting (elastic#131482)
  [ES|QL] Add more Min/MaxOverTime CSV tests (elastic#131070)
  Restrict remote ENRICH after FORK (elastic#131945)
  Fix decoding of non-ascii field names in ignored source (elastic#132018)
  [docs] Use centrally maintained version variables (elastic#131939)
  Configurable Inference timeout during Query time (elastic#131551)
  ESQL: Allow pruning columns added by InlineJoin (elastic#131204)
  ESQL: Fail `profile` on text response formats (elastic#128627)
  ...
@szybia szybia enabled auto-merge (squash) July 29, 2025 10:20
@szybia szybia merged commit 9543046 into elastic:main Jul 29, 2025
34 checks passed
@szybia szybia deleted the component-templates-tracking branch July 29, 2025 12:06
@szybia szybia removed the serverless-linked Added by automation, don't add manually label Jul 30, 2025
jen-huang added a commit to elastic/kibana that referenced this pull request Aug 12, 2025
## Summary

Resolves #229901. Fixes ES
promotion of this test by excluding component template timestamps from
the assertion (timestamps were introduced in
elastic/elasticsearch#131536).
mistic pushed a commit to elastic/kibana that referenced this pull request Aug 13, 2025
…mplates (#231524)

## Summary

Resolves #230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to #231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.
fkanout pushed a commit to fkanout/kibana that referenced this pull request Aug 14, 2025
## Summary

Resolves elastic#229901. Fixes ES
promotion of this test by excluding component template timestamps from
the assertion (timestamps were introduced in
elastic/elasticsearch#131536).
fkanout pushed a commit to fkanout/kibana that referenced this pull request Aug 14, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.
NicholasPeretti pushed a commit to NicholasPeretti/kibana that referenced this pull request Aug 18, 2025
## Summary

Resolves elastic#229901. Fixes ES
promotion of this test by excluding component template timestamps from
the assertion (timestamps were introduced in
elastic/elasticsearch#131536).
NicholasPeretti pushed a commit to NicholasPeretti/kibana that referenced this pull request Aug 18, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
## Summary

Resolves elastic#229901. Fixes ES
promotion of this test by excluding component template timestamps from
the assertion (timestamps were introduced in
elastic/elasticsearch#131536).

(cherry picked from commit 834e285)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
## Summary

Resolves elastic#229901. Fixes ES
promotion of this test by excluding component template timestamps from
the assertion (timestamps were introduced in
elastic/elasticsearch#131536).

(cherry picked from commit 834e285)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
## Summary

Resolves elastic#229901. Fixes ES
promotion of this test by excluding component template timestamps from
the assertion (timestamps were introduced in
elastic/elasticsearch#131536).

(cherry picked from commit 834e285)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
## Summary

Resolves elastic#229901. Fixes ES
promotion of this test by excluding component template timestamps from
the assertion (timestamps were introduced in
elastic/elasticsearch#131536).

(cherry picked from commit 834e285)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.

(cherry picked from commit 9cdbe77)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.

(cherry picked from commit 9cdbe77)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.

(cherry picked from commit 9cdbe77)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.

(cherry picked from commit 9cdbe77)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 18, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.

(cherry picked from commit 9cdbe77)
jen-huang added a commit to jen-huang/kibana that referenced this pull request Aug 18, 2025
## Summary

Resolves elastic#229901. Fixes ES
promotion of this test by excluding component template timestamps from
the assertion (timestamps were introduced in
elastic/elasticsearch#131536).

(cherry picked from commit 834e285)
kibanamachine added a commit to elastic/kibana that referenced this pull request Aug 19, 2025
…dex templates (#231524) (#232160)

# Backport

This will backport the following commits from `main` to `9.1`:
- [[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]>
kibanamachine added a commit to elastic/kibana that referenced this pull request Aug 19, 2025
)

# Backport

This will backport the following commits from `main` to `9.1`:
- [[UII] Fix input package component template test
(#231505)](#231505)

<!--- 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-12T20:50:27Z","message":"[UII]
Fix input package component template test (#231505)\n\n##
Summary\n\nResolves #229901.
Fixes ES\npromotion of this test by excluding component template
timestamps from\nthe assertion (timestamps were introduced
in\nhttps://github.com/elastic/elasticsearch/pull/131536).","sha":"834e2851016889b912229a01f65a0d2c27a213db","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"],"title":"[UII]
Fix input package component template
test","number":231505,"url":"https://github.com/elastic/kibana/pull/231505","mergeCommit":{"message":"[UII]
Fix input package component template test (#231505)\n\n##
Summary\n\nResolves #229901.
Fixes ES\npromotion of this test by excluding component template
timestamps from\nthe assertion (timestamps were introduced
in\nhttps://github.com/elastic/elasticsearch/pull/131536).","sha":"834e2851016889b912229a01f65a0d2c27a213db"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/231505","number":231505,"mergeCommit":{"message":"[UII]
Fix input package component template test (#231505)\n\n##
Summary\n\nResolves #229901.
Fixes ES\npromotion of this test by excluding component template
timestamps from\nthe assertion (timestamps were introduced
in\nhttps://github.com/elastic/elasticsearch/pull/131536).","sha":"834e2851016889b912229a01f65a0d2c27a213db"}},{"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"}]}]
BACKPORT-->

Co-authored-by: Jen Huang <[email protected]>
kibanamachine added a commit to elastic/kibana that referenced this pull request Aug 19, 2025
…2156)

# Backport

This will backport the following commits from `main` to `8.19`:
- [[UII] Fix input package component template test
(#231505)](#231505)

<!--- 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-12T20:50:27Z","message":"[UII]
Fix input package component template test (#231505)\n\n##
Summary\n\nResolves #229901.
Fixes ES\npromotion of this test by excluding component template
timestamps from\nthe assertion (timestamps were introduced
in\nhttps://github.com/elastic/elasticsearch/pull/131536).","sha":"834e2851016889b912229a01f65a0d2c27a213db","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"],"title":"[UII]
Fix input package component template
test","number":231505,"url":"https://github.com/elastic/kibana/pull/231505","mergeCommit":{"message":"[UII]
Fix input package component template test (#231505)\n\n##
Summary\n\nResolves #229901.
Fixes ES\npromotion of this test by excluding component template
timestamps from\nthe assertion (timestamps were introduced
in\nhttps://github.com/elastic/elasticsearch/pull/131536).","sha":"834e2851016889b912229a01f65a0d2c27a213db"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/231505","number":231505,"mergeCommit":{"message":"[UII]
Fix input package component template test (#231505)\n\n##
Summary\n\nResolves #229901.
Fixes ES\npromotion of this test by excluding component template
timestamps from\nthe assertion (timestamps were introduced
in\nhttps://github.com/elastic/elasticsearch/pull/131536).","sha":"834e2851016889b912229a01f65a0d2c27a213db"}},{"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"}]}]
BACKPORT-->

Co-authored-by: Jen Huang <[email protected]>
kibanamachine added a commit to elastic/kibana that referenced this pull request Aug 19, 2025
…dex templates (#231524) (#232159)

# 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]>
kibanamachine added a commit to elastic/kibana that referenced this pull request Aug 19, 2025
…ndex templates (#231524) (#232158)

# Backport

This will backport the following commits from `main` to `8.19`:
- [[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]>
jen-huang added a commit to elastic/kibana that referenced this pull request Aug 19, 2025
)

# Backport

This will backport the following commits from `main` to `9.0`:
- [[UII] Fix input package component template test
(#231505)](#231505)

<!--- Backport version: 10.0.1 -->

### 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-12T20:50:27Z","message":"[UII]
Fix input package component template test (#231505)\n\n##
Summary\n\nResolves #229901.
Fixes ES\npromotion of this test by excluding component template
timestamps from\nthe assertion (timestamps were introduced
in\nhttps://github.com/elastic/elasticsearch/pull/131536).","sha":"834e2851016889b912229a01f65a0d2c27a213db","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]
Fix input package component template
test","number":231505,"url":"https://github.com/elastic/kibana/pull/231505","mergeCommit":{"message":"[UII]
Fix input package component template test (#231505)\n\n##
Summary\n\nResolves #229901.
Fixes ES\npromotion of this test by excluding component template
timestamps from\nthe assertion (timestamps were introduced
in\nhttps://github.com/elastic/elasticsearch/pull/131536).","sha":"834e2851016889b912229a01f65a0d2c27a213db"}},"sourceBranch":"main","suggestedTargetBranches":["9.0"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/231505","number":231505,"mergeCommit":{"message":"[UII]
Fix input package component template test (#231505)\n\n##
Summary\n\nResolves #229901.
Fixes ES\npromotion of this test by excluding component template
timestamps from\nthe assertion (timestamps were introduced
in\nhttps://github.com/elastic/elasticsearch/pull/131536).","sha":"834e2851016889b912229a01f65a0d2c27a213db"}},{"branch":"9.1","label":"v9.1.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/232157","number":232157,"state":"OPEN"},{"branch":"8.19","label":"v8.19.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/232156","number":232156,"state":"OPEN"},{"branch":"9.0","label":"v9.0.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
qn895 pushed a commit to qn895/kibana that referenced this pull request Aug 26, 2025
## Summary

Resolves elastic#229901. Fixes ES
promotion of this test by excluding component template timestamps from
the assertion (timestamps were introduced in
elastic/elasticsearch#131536).
qn895 pushed a commit to qn895/kibana that referenced this pull request Aug 26, 2025
…mplates (elastic#231524)

## Summary

Resolves elastic#230902. This PR removes system-managed properties (dates) from
the retrieved index templates when updating the same index template
(triggered when experimental datastream feature settings have been
changed). The test that was failing is now re-enabled.

Similar to elastic#231505, this is due to
ES introducing these new date/timestamp fields in
elastic/elasticsearch#131536.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Data Management/Ingest Node Execution or management of Ingest Pipelines including GeoIP >enhancement Team:Data Management Meta label for data/management team v9.2.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants