mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-24 21:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove unneeded state modifications

Browse source 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
This commit is contained in:
Levi Harrison 2021-08-20 16:42:31 -04:00
parent 54dfee02b2
commit 8c29046ab2
No known key found for this signature in database
GPG key ID: 23A7BDEAE860B57D
3 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rules/alerting.go
View file

@ -300,8 +300,6 @@ const resolvedRetention = 15 * time.Minute
func (r *AlertingRule) Eval(ctx context.Context, ts time.Time, query QueryFunc, externalURL *url.URL) (promql.Vector, error) { func (r *AlertingRule) Eval(ctx context.Context, ts time.Time, query QueryFunc, externalURL *url.URL) (promql.Vector, error) {
res, err := query(ctx, r.vector.String(), ts) res, err := query(ctx, r.vector.String(), ts)
if err != nil { if err != nil {
r.SetHealth(HealthBad)
r.SetLastError(err)
return nil, err return nil, err
} }
@ -366,12 +364,7 @@ func (r *AlertingRule) Eval(ctx context.Context, ts time.Time, query QueryFunc,
resultFPs[h] = struct{}{} resultFPs[h] = struct{}{}
if _, ok := alerts[h]; ok { if _, ok := alerts[h]; ok {
err = fmt.Errorf("vector contains metrics with the same labelset after applying alert labels") return nil, fmt.Errorf("vector contains metrics with the same labelset after applying alert labels")
// We have already acquired the lock above hence using SetHealth and
// SetLastError will deadlock.
r.health = HealthBad
r.lastError = err
return nil, err
} }
alerts[h] = &Alert{ alerts[h] = &Alert{
@ -421,10 +414,6 @@ func (r *AlertingRule) Eval(ctx context.Context, ts time.Time, query QueryFunc,
} }
} }
// We have already acquired the lock above hence using SetHealth and
// SetLastError will deadlock.
r.health = HealthGood
r.lastError = err
return vec, nil return vec, nil
} }

2
rules/manager.go
View file

@ -604,6 +604,8 @@ func (g *Group) Eval(ctx context.Context, ts time.Time) {
} }
return return
} }
rule.SetHealth(HealthGood)
rule.SetLastError(nil)
samplesTotal += float64(len(vector)) samplesTotal += float64(len(vector))
if ar, ok := rule.(*AlertingRule); ok { if ar, ok := rule.(*AlertingRule); ok {

7
rules/recording.go
View file

@ -96,14 +96,9 @@ func (rule *RecordingRule) Eval(ctx context.Context, ts time.Time, query QueryFu
// Check that the rule does not produce identical metrics after applying // Check that the rule does not produce identical metrics after applying
// labels. // labels.
if vector.ContainsSameLabelset() { if vector.ContainsSameLabelset() {
err = fmt.Errorf("vector contains metrics with the same labelset after applying rule labels") return nil, fmt.Errorf("vector contains metrics with the same labelset after applying rule labels")
rule.SetHealth(HealthBad)
rule.SetLastError(err)
return nil, err
} }
rule.SetHealth(HealthGood)
rule.SetLastError(err)
return vector, nil return vector, nil
} }