From f9a8e0a50de07051b9186299ad82f9e5d4c8efbb Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 16:49:26 +0300 Subject: [PATCH] [v10.0.x] Alerting: No longer silence paused alerts during legacy migration (#71761) Alerting: No longer silence paused alerts during legacy migration (#71596) * Alerting: No longer silence paused alerts during legacy migration Now that we migrate paused legacy alerts to paused UA alert rules, we no longer need to silence them. (cherry picked from commit 8c6cdf51fce181f35c22707c0ee962b91238b8c0) Co-authored-by: Matthew Jacobson --- .../set-up/migrating-alerts/_index.md | 1 - .../sqlstore/migrations/ualert/alert_rule.go | 4 -- .../sqlstore/migrations/ualert/silences.go | 37 ------------------- 3 files changed, 42 deletions(-) diff --git a/docs/sources/alerting/set-up/migrating-alerts/_index.md b/docs/sources/alerting/set-up/migrating-alerts/_index.md index f211009cd44..5c48a090d47 100644 --- a/docs/sources/alerting/set-up/migrating-alerts/_index.md +++ b/docs/sources/alerting/set-up/migrating-alerts/_index.md @@ -156,4 +156,3 @@ longer supported. **Limitations** 1. Since `Hipchat` and `Sensu` notification channels are no longer supported, legacy alerts associated with these channels are not automatically migrated to Grafana Alerting. Assign the legacy alerts to a supported notification channel so that you continue to receive notifications for those alerts. - Silences (expiring after one year) are created for all paused dashboard alerts. diff --git a/pkg/services/sqlstore/migrations/ualert/alert_rule.go b/pkg/services/sqlstore/migrations/ualert/alert_rule.go index d4319dd7974..7bacef0bd19 100644 --- a/pkg/services/sqlstore/migrations/ualert/alert_rule.go +++ b/pkg/services/sqlstore/migrations/ualert/alert_rule.go @@ -152,10 +152,6 @@ func (m *migration) makeAlertRule(l log.Logger, cond condition, da dashAlert, fo n, v := getLabelForSilenceMatching(ar.UID) ar.Labels[n] = v - if err := m.addSilence(da, ar); err != nil { - m.mg.Logger.Error("alert migration error: failed to create silence", "rule_name", ar.Title, "err", err) - } - if err := m.addErrorSilence(da, ar); err != nil { m.mg.Logger.Error("alert migration error: failed to create silence for Error", "rule_name", ar.Title, "err", err) } diff --git a/pkg/services/sqlstore/migrations/ualert/silences.go b/pkg/services/sqlstore/migrations/ualert/silences.go index c5fdfbf1948..69d1a2b320c 100644 --- a/pkg/services/sqlstore/migrations/ualert/silences.go +++ b/pkg/services/sqlstore/migrations/ualert/silences.go @@ -26,43 +26,6 @@ const ( ErrorAlertName = "DatasourceError" ) -func (m *migration) addSilence(da dashAlert, rule *alertRule) error { - if da.State != "paused" { - return nil - } - - uid, err := uuid.NewRandom() - if err != nil { - return errors.New("failed to create uuid for silence") - } - - n, v := getLabelForSilenceMatching(rule.UID) - s := &pb.MeshSilence{ - Silence: &pb.Silence{ - Id: uid.String(), - Matchers: []*pb.Matcher{ - { - Type: pb.Matcher_EQUAL, - Name: n, - Pattern: v, - }, - }, - StartsAt: time.Now(), - EndsAt: time.Now().Add(365 * 20 * time.Hour), // 1 year. - CreatedBy: "Grafana Migration", - Comment: "Created during auto migration to unified alerting", - }, - ExpiresAt: time.Now().Add(365 * 20 * time.Hour), // 1 year. - } - - _, ok := m.silences[da.OrgId] - if !ok { - m.silences[da.OrgId] = make([]*pb.MeshSilence, 0) - } - m.silences[da.OrgId] = append(m.silences[da.OrgId], s) - return nil -} - func (m *migration) addErrorSilence(da dashAlert, rule *alertRule) error { if da.ParsedSettings.ExecutionErrorState != "keep_state" { return nil