Alertmanager: Add methods to merge nflog and silences (#108006)

pkg/services/ngalert/notifier/alerts.go

@@ -13,3 +13,7 @@ func (am *alertmanager) GetAlerts(_ context.Context, active, silenced, inhibited
 func (am *alertmanager) GetAlertGroups(_ context.Context, active, silenced, inhibited bool, filter []string, receivers string) (alertingNotify.AlertGroups, error) {
 	return am.Base.GetAlertGroups(active, silenced, inhibited, filter, receivers)
 }
+
+func (am *alertmanager) MergeNflog(b []byte) error {
+	return am.Base.MergeNflog(b)
+}

pkg/services/ngalert/notifier/multiorg_alertmanager.go

@@ -77,6 +77,12 @@ type Alertmanager interface {
 	Ready() bool
 }
 
+// StateMerger describes a type that is able to merge external state (nflog, silences) with its own.
+type StateMerger interface {
+	MergeNflog([]byte) error
+	MergeSilences([]byte) error
+}
+
 type MultiOrgAlertmanager struct {
 	Crypto    Crypto
 	ProvStore provisioningStore

pkg/services/ngalert/notifier/silences.go

@@ -21,3 +21,7 @@ func (am *alertmanager) CreateSilence(_ context.Context, ps *alertingNotify.Post
 func (am *alertmanager) DeleteSilence(_ context.Context, silenceID string) error {
 	return am.Base.DeleteSilence(silenceID)
 }
+
+func (am *alertmanager) MergeSilences(b []byte) error {
+	return am.Base.MergeSilences(b)
+}