Browse Source

Don't reset FiredAt for inactive alerts

Otherwise AlertManager receives resolved alerts where StartsAt is zero which
fails the validation.
pull/3724/head
Simon Pasquier 7 years ago
parent
commit
81c0ab69e0
  1. 2
      cmd/prometheus/main.go
  2. 1
      rules/alerting.go

2
cmd/prometheus/main.go

@ -649,7 +649,7 @@ func computeExternalURL(u, listenAddr string) (*url.URL, error) {
return eu, nil
}
// sendAlerts implements a the rules.NotifyFunc for a Notifier.
// sendAlerts implements the rules.NotifyFunc for a Notifier.
// It filters any non-firing alerts from the input.
func sendAlerts(n *notifier.Notifier, externalURL string) rules.NotifyFunc {
return func(ctx context.Context, expr string, alerts ...*rules.Alert) error {

1
rules/alerting.go

@ -266,7 +266,6 @@ func (r *AlertingRule) Eval(ctx context.Context, ts time.Time, query QueryFunc,
if a.State != StateInactive {
a.State = StateInactive
a.ResolvedAt = ts
a.FiredAt = time.Time{}
}
continue
}

Loading…
Cancel
Save