From da32c5fc9f05c7416e8d84a619256b3ca40c8ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Tue, 15 Mar 2022 08:01:35 +0000 Subject: [PATCH] fix(api): sort expired silences in reverse --- internal/alertmanager/models.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/alertmanager/models.go b/internal/alertmanager/models.go index 2f8aebb37..58d5a2a62 100644 --- a/internal/alertmanager/models.go +++ b/internal/alertmanager/models.go @@ -298,7 +298,10 @@ func (am *Alertmanager) pullAlerts(version string) error { si := silences[alert.SilencedBy[i]] sj := silences[alert.SilencedBy[j]] if si != nil && sj != nil { - return si.EndsAt.Unix() < sj.EndsAt.Unix() + if alert.State == models.AlertStateSuppressed { + return si.EndsAt.Unix() < sj.EndsAt.Unix() + } + return si.EndsAt.Unix() > sj.EndsAt.Unix() } return alert.SilencedBy[i] < alert.SilencedBy[j] })