Alerting: Fix migration to not add label "alertname" #56509
Merged
Conversation
This file contains 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
because it is overridden in state manager anyway
yuri-tceretian
added
area/alerting
grobinson-grafana
approved these changes
Oct 7, 2022
|
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-56509-to-v9.1.x origin/v9.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e2f1201382a2f0ada82677ba243213dce4be6ca8
# Push it to GitHub
git push --set-upstream origin backport-56509-to-v9.1.x
git switch main
# Remove the local backport branch
git branch -D backport-56509-to-v9.1.xThen, 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-56509-to-v9.2.x origin/v9.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e2f1201382a2f0ada82677ba243213dce4be6ca8
# Push it to GitHub
git push --set-upstream origin backport-56509-to-v9.2.x
git switch main
# Remove the local backport branch
git branch -D backport-56509-to-v9.2.xThen, create a pull request where the |
yuri-tceretian
added a commit
to yuri-tceretian/grafana
that referenced
this pull request
Oct 7, 2022
* do not add label alertname because it is overridden in state manager anyway * update state manager to not consider labels with same value as dupe (cherry picked from commit e2f1201) # Conflicts: # pkg/services/ngalert/state/cache.go
yuri-tceretian
added a commit
to yuri-tceretian/grafana
that referenced
this pull request
Oct 7, 2022
* do not add label alertname because it is overridden in state manager anyway * update state manager to not consider labels with same value as dupe (cherry picked from commit e2f1201) # Conflicts: # pkg/services/ngalert/state/cache.go
yuri-tceretian
added a commit
that referenced
this pull request
Oct 7, 2022
yuri-tceretian
added a commit
that referenced
this pull request
Oct 7, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does / why we need it:
The migration from legacy to the new Grafana Alerting adds a label
alertnameto the rule. That label gets overridden by the state manager when it calculates the state because the label is reserved. The state manager emits a warning log when there are labels that are overridden. This creates an avalanche of warning logs.This PR updates migration to not add the label (because it is overridden anyway).
Also, it updates state manager logic to compare values of the same label and to emit a warning only if values are different.
Which issue(s) this PR fixes:
Fixes #55670
Special notes for your reviewer: