IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix migration to not add label "alertname" (#56509)

Browse Source 
* 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
This commit is contained in:
Yuriy Tseretyan
2022-10-07 15:06:53 -04:00
committed by GitHub
parent 4b2a940659
commit e2f1201382
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/services/ngalert/state/cache.go
View File

@@ -56,16 +56,18 @@ func (rs *ruleStates) getOrCreate(ctx context.Context, log log.Logger, alertRule
lbs[key] = val
}
for key, val := range ruleLabels {
_, ok := lbs[key]
ruleVal, ok := lbs[key]
// if duplicate labels exist, reserved label will take precedence
if ok {
dupes[key] = val
if ruleVal != val {
dupes[key] = val
}
} else {
lbs[key] = val
}
}
if len(dupes) > 0 {
log.Warn("rule declares one or many reserved labels. Those rules labels will be ignored", "labels", dupes)
log.Warn("Rule declares one or many reserved labels. Those rules labels will be ignored", "labels", dupes)
}
dupes = make(data.Labels)
for key, val := range result.Instance {