PromQL: Fix start and end keywords masking label and metric names#9119
Merged
brancz merged 2 commits intoprometheus:release-2.29from Aug 4, 2021
Merged
PromQL: Fix start and end keywords masking label and metric names#9119brancz merged 2 commits intoprometheus:release-2.29from
brancz merged 2 commits intoprometheus:release-2.29from
Conversation
This commit fixes an issue with the "at modifier" that introduced two new keywords: `start` and `end`. In grouping options and in metric names, these keywords took precedence over metric or label names, so that those metrics and labels could no longer be referenced. Signed-off-by: Clayton Peters <clayton.peters@man.com>
Member
|
Can you please add tests in promql/parser/parse_test.go's testExpr where start and end are used as metrics ? |
Author
Sure, I'll sort that in the next hour or two. |
Signed-off-by: Clayton Peters <clayton.peters@man.com>
Author
|
@roidelapluie Tests when |
Member
|
I have closed/reopen for CI to run |
Member
|
I have tested the goyacc also, it's fine. @brancz can we have this in 2.29? Thanks! |
roidelapluie
approved these changes
Aug 4, 2021
Merged
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
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 an issue with the "at modifier" that introduced two new keywords:
startandend. In grouping options and in metric names, these keywords took precedence over metric or label names, so that those metrics and labels could no longer be referenced.Fixes #9040
Signed-off-by: Clayton Peters clayton.peters@man.com