From 6db07b901cb431e009569b23dcf517017d768a72 Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Thu, 31 Jul 2025 09:55:08 +0200
Subject: [PATCH] Alerting: Enable HA clustering in remote primary mode
 (#108930)

---
 pkg/services/ngalert/ngalert.go                        | 1 -
 pkg/services/ngalert/notifier/multiorg_alertmanager.go | 8 ++------
 pkg/setting/setting_unified_alerting.go                | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkg/services/ngalert/ngalert.go b/pkg/services/ngalert/ngalert.go
index 3861fa60c54..e794460fc5e 100644
--- a/pkg/services/ngalert/ngalert.go
+++ b/pkg/services/ngalert/ngalert.go
@@ -225,7 +225,6 @@ func (ng *AlertNG) init() error {
 		if remotePrimary {
 			ng.Log.Debug("Starting Grafana with remote primary mode enabled")
 			m.Info.WithLabelValues(metrics.ModeRemotePrimary).Set(1)
-			ng.Cfg.UnifiedAlerting.SkipClustering = true
 			// This function will be used by the MOA to create new Alertmanagers.
 			override = notifier.WithAlertmanagerOverride(func(factoryFn notifier.OrgAlertmanagerFactory) notifier.OrgAlertmanagerFactory {
 				return func(ctx context.Context, orgID int64) (notifier.Alertmanager, error) {
diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager.go b/pkg/services/ngalert/notifier/multiorg_alertmanager.go
index 4ce738c08a9..4aa0151d18f 100644
--- a/pkg/services/ngalert/notifier/multiorg_alertmanager.go
+++ b/pkg/services/ngalert/notifier/multiorg_alertmanager.go
@@ -161,12 +161,8 @@ func NewMultiOrgAlertmanager(
 		peer:                        &NilPeer{},
 	}
 
-	if cfg.UnifiedAlerting.SkipClustering {
-		l.Info("Skipping setting up clustering for MOA")
-	} else {
-		if err := moa.setupClustering(cfg); err != nil {
-			return nil, err
-		}
+	if err := moa.setupClustering(cfg); err != nil {
+		return nil, err
 	}
 
 	// Set up the default per tenant Alertmanager factory.
diff --git a/pkg/setting/setting_unified_alerting.go b/pkg/setting/setting_unified_alerting.go
index 665c751532f..0187652cb0e 100644
--- a/pkg/setting/setting_unified_alerting.go
+++ b/pkg/setting/setting_unified_alerting.go
@@ -121,7 +121,6 @@ type UnifiedAlertingSettings struct {
 	DefaultRuleEvaluationInterval time.Duration
 	Screenshots                   UnifiedAlertingScreenshotSettings
 	ReservedLabels                UnifiedAlertingReservedLabelSettings
-	SkipClustering                bool
 	StateHistory                  UnifiedAlertingStateHistorySettings
 	NotificationHistory           UnifiedAlertingNotificationHistorySettings
 	RemoteAlertmanager            RemoteAlertmanagerSettings