From 047a54f1cc6adef322c360136b5e04f5354b1e64 Mon Sep 17 00:00:00 2001 From: Ben Donnelly Date: Tue, 24 Sep 2024 09:47:23 +0100 Subject: [PATCH] chore(build): resolve conflicts --- .../ngalert/notifier/alertmanager_config.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkg/services/ngalert/notifier/alertmanager_config.go b/pkg/services/ngalert/notifier/alertmanager_config.go index 68b1c64d4a..ec6472723e 100644 --- a/pkg/services/ngalert/notifier/alertmanager_config.go +++ b/pkg/services/ngalert/notifier/alertmanager_config.go @@ -14,20 +14,6 @@ import ( "github.com/grafana/grafana/pkg/services/ngalert/models" "github.com/grafana/grafana/pkg/services/ngalert/store" "github.com/grafana/grafana/pkg/util" - "github.com/grafana/grafana/pkg/util/errutil" -) - -var ( - // ErrAlertmanagerReceiverInUse is primarily meant for when a receiver is used by a rule and is being deleted. - ErrAlertmanagerReceiverInUse = errutil.BadRequest("alerting.notifications.alertmanager.receiverInUse").MustTemplate("receiver [Name: {{ .Public.Receiver }}] is used by rule: {{ .Error }}", - errutil.WithPublic( - "receiver [Name: {{ .Public.Receiver }}] is used by rule", - )) - // ErrAlertmanagerTimeIntervalInUse is primarily meant for when a time interval is used by a rule and is being deleted. - ErrAlertmanagerTimeIntervalInUse = errutil.BadRequest("alerting.notifications.alertmanager.intervalInUse").MustTemplate("time interval [Name: {{ .Public.Interval }}] is used by rule: {{ .Error }}", - errutil.WithPublic( - "time interval [Name: {{ .Public.Interval }}] is used by rule", - )) ) var (