mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 06:59:40 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #303 from prometheus/fix/drop-metricname

Browse source 
Ensure metric name is dropped correctly from alert labels in UI.
This commit is contained in:
juliusv 2013-06-14 05:19:05 -07:00
parent f4af4cb741 8ee7947b1e
commit 55cb835867
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rules/alerting.go
View file

@ -115,7 +115,8 @@ func (rule *AlertingRule) Eval(timestamp time.Time, storage *metric.TieredStorag
rule.mutex.Lock() rule.mutex.Lock()
defer rule.mutex.Unlock() defer rule.mutex.Unlock()
// Create pending alerts for any new vector elements in the alert expression. // Create pending alerts for any new vector elements in the alert expression
// or update the expression value for existing elements.
resultFingerprints := utility.Set{} resultFingerprints := utility.Set{}
for _, sample := range exprResult { for _, sample := range exprResult {
fp := *model.NewFingerprintFromMetric(sample.Metric) fp := *model.NewFingerprintFromMetric(sample.Metric)
@ -129,7 +130,7 @@ func (rule *AlertingRule) Eval(timestamp time.Time, storage *metric.TieredStorag
} }
rule.activeAlerts[fp] = &Alert{ rule.activeAlerts[fp] = &Alert{
Name: rule.name, Name: rule.name,
Labels: sample.Metric.ToLabelSet(), Labels: labels,
State: PENDING, State: PENDING,
ActiveSince: timestamp, ActiveSince: timestamp,
Value: sample.Value, Value: sample.Value,