RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-26 16:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not expose resolved alerts & do not send resolved if never firing (#820)

Browse Source 
Do not expose resolved alerts on the /alerts endpoint. Do not send
resolved alerts to receivers if the alerts have never been fired before.
This commit is contained in:
Max Inden 2017-05-29 14:07:05 +02:00 committed by stuart nelson
parent 0819ee8a87
commit a217e162a8
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/api.go
View File

@ -300,6 +300,11 @@ func (api *API) listAlerts(w http.ResponseWriter, r *http.Request) {
continue
}
// Continue if alert is resolved
if !a.Alert.EndsAt.IsZero() && a.Alert.EndsAt.Before(time.Now()) {
continue
}
status := api.getAlertStatus(a.Fingerprint())
if !showSilenced && len(status.SilencedBy) != 0 {

2
notify/notify.go
View File

@ -474,7 +474,7 @@ func (n *DedupStage) needsUpdate(entry *nflogpb.Entry, firing, resolved map[uint
// If we haven't notified about the alert group before, notify right away
// unless we only have resolved alerts.
if entry == nil {
return ((len(firing) > 0) || (n.sendResolved && len(resolved) > 0)), nil
return len(firing) > 0, nil
}
if !entry.IsFiringSubset(firing) {