-
Notifications
You must be signed in to change notification settings - Fork 543
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
MQE: fix issue where rate
or increase
can return multiple series with the same labels
#9553
Conversation
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-9553-to-r309 origin/r309
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 25dadff171ce4edc9376c7b536f5fa39dbc2519d
# Push it to GitHub
git push --set-upstream origin backport-9553-to-r309
git switch main
# Remove the local backport branch
git branch -D backport-9553-to-r309 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-9553-to-r308 origin/r308
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 25dadff171ce4edc9376c7b536f5fa39dbc2519d
# Push it to GitHub
git push --set-upstream origin backport-9553-to-r308
git switch main
# Remove the local backport branch
git branch -D backport-9553-to-r308 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-9553-to-r310 origin/r310
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 25dadff171ce4edc9376c7b536f5fa39dbc2519d
# Push it to GitHub
git push --set-upstream origin backport-9553-to-r310
git switch main
# Remove the local backport branch
git branch -D backport-9553-to-r310 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-9553-to-r311 origin/r311
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 25dadff171ce4edc9376c7b536f5fa39dbc2519d
# Push it to GitHub
git push --set-upstream origin backport-9553-to-r311
git switch main
# Remove the local backport branch
git branch -D backport-9553-to-r311 Then, create a pull request where the |
…with the same labels (#9553) * Fix the issue where `rate` or `increase` can return multiple series with the same labels * Add changelog entry * Disable unsupported upstream test case (cherry picked from commit 25dadff) # Conflicts: # CHANGELOG.md # pkg/streamingpromql/functions/rate.go # pkg/streamingpromql/testdata/ours/functions.test
…with the same labels (#9553) * Fix the issue where `rate` or `increase` can return multiple series with the same labels * Add changelog entry * Disable unsupported upstream test case (cherry picked from commit 25dadff) # Conflicts: # CHANGELOG.md # pkg/streamingpromql/functions/rate.go # pkg/streamingpromql/testdata/ours/functions.test
…with the same labels (#9553) (#9555) * Fix the issue where `rate` or `increase` can return multiple series with the same labels * Add changelog entry * Disable unsupported upstream test case (cherry picked from commit 25dadff) # Conflicts: # CHANGELOG.md # pkg/streamingpromql/testdata/ours/functions.test
…with the same labels (#9553) (#9554) * Fix the issue where `rate` or `increase` can return multiple series with the same labels * Add changelog entry * Disable unsupported upstream test case (cherry picked from commit 25dadff) # Conflicts: # CHANGELOG.md # pkg/streamingpromql/testdata/ours/functions.test
…with the same labels (#9553) (#9557) * Fix the issue where `rate` or `increase` can return multiple series with the same labels * Add changelog entry * Disable unsupported upstream test case (cherry picked from commit 25dadff) # Conflicts: # CHANGELOG.md # pkg/streamingpromql/functions/rate.go # pkg/streamingpromql/testdata/ours/functions.test
…with the same labels (#9553) (#9556) * Fix the issue where `rate` or `increase` can return multiple series with the same labels * Add changelog entry * Disable unsupported upstream test case (cherry picked from commit 25dadff) # Conflicts: # CHANGELOG.md # pkg/streamingpromql/functions/rate.go # pkg/streamingpromql/testdata/ours/functions.test
What this PR does
This PR fixes an issue in MQE's implementation of
rate
andincrease
that can cause it to return multiple series with the same labels instead of a single series or returning avector cannot contain metrics with the same labelset
error.I have a more robust fix planned: moving
NeedsSeriesDeduplication
to a newSeriesMetadataFunc
struct, so thatNeedsSeriesDeduplication
is always true forDropSeriesName
, but I'd like to merge this simpler fix first as it will be far easier to backport.Which issue(s) this PR fixes or relates to
(none)
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]
.about-versioning.md
updated with experimental features.