WIP: Fix downsampling passthrough fields #134996
Closed
Conversation
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
kkrik-es
reviewed
Sep 19, 2025
| } | ||
| } | ||
| }, | ||
| "metrics.cpu_usage": { |
There was a problem hiding this comment.
Let's add a passthrough for metrics, without time_series_dimension set.
There was a problem hiding this comment.
Isn't this covered by testDownsamplingPassthroughMetrics?
kkrik-es
reviewed
Sep 19, 2025
| addDynamicTemplateForStrings(downsampledMapping); | ||
| for (Map.Entry<String, Object> entry : sourceIndexMappings.entrySet()) { | ||
| if (entry.getKey().equals(MAPPING_DYNAMIC_TEMPLATES)) { | ||
| List<?> sourceDynamicTemplates = (List<?>) sourceIndexMappings.get(MAPPING_DYNAMIC_TEMPLATES); |
There was a problem hiding this comment.
I wonder, do we even need this for the downsample index? @martijnvg too.
kkrik-es
reviewed
Sep 19, 2025
elasticsearchmachine
pushed a commit
that referenced
this pull request
Sep 30, 2025
…pers under certain conditions. (#135431) This PR is an alternative of #134996: This fixes a bug that would be triggered when we would downsample an index that had a metric field under a passthrough field. For example: ``` "metrics": { "type": "passthrough", "priority": 10, "properties": { "cpu_usage": { "type": "double", "time_series_metric": "gauge" } } } ``` In this PR, we extend the merging possibilities of a passthrough field to allow merging with object mappers that have subobjects false and they are not a root object. They also fix merging an object mapper with a passthrough field and ensure that the result will either be a passthrough field or an error if the objects are incompatible.
gmarouli
added a commit
to gmarouli/elasticsearch
that referenced
this pull request
Sep 30, 2025
…pers under certain conditions. (elastic#135431) This PR is an alternative of elastic#134996: This fixes a bug that would be triggered when we would downsample an index that had a metric field under a passthrough field. For example: ``` "metrics": { "type": "passthrough", "priority": 10, "properties": { "cpu_usage": { "type": "double", "time_series_metric": "gauge" } } } ``` In this PR, we extend the merging possibilities of a passthrough field to allow merging with object mappers that have subobjects false and they are not a root object. They also fix merging an object mapper with a passthrough field and ensure that the result will either be a passthrough field or an error if the objects are incompatible.
|
Alternative fix in #135431 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This fixes a bug that would be triggered when we would downsample an index that had a metric field under a passthrough field. For example:
In this PR that is still WIP because we are checking if we are missing something, we try to simplify the map update by changing the fields that need adjustment directly on the source mapping. This allows us to eliminate the merge step and create the final mapping with one pass.