From f29941c335e374fe6600d1b3e2f871053fe15356 Mon Sep 17 00:00:00 2001 From: Fayzal Ghantiwala <114010985+fayzal-g@users.noreply.github.com> Date: Tue, 22 Apr 2025 10:40:48 +0100 Subject: [PATCH] Alerting: Use value of ha_redis_cluster_mode_enabled in redisPeer config (#104269) fix assignment of redis cluster mode cfg --- .../ngalert/notifier/multiorg_alertmanager.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager.go b/pkg/services/ngalert/notifier/multiorg_alertmanager.go index c66cc6a7772..4a30c8fa95b 100644 --- a/pkg/services/ngalert/notifier/multiorg_alertmanager.go +++ b/pkg/services/ngalert/notifier/multiorg_alertmanager.go @@ -179,15 +179,16 @@ func (moa *MultiOrgAlertmanager) setupClustering(cfg *setting.Cfg) error { // Redis setup. if cfg.UnifiedAlerting.HARedisAddr != "" { redisPeer, err := newRedisPeer(redisConfig{ - addr: cfg.UnifiedAlerting.HARedisAddr, - name: cfg.UnifiedAlerting.HARedisPeerName, - prefix: cfg.UnifiedAlerting.HARedisPrefix, - password: cfg.UnifiedAlerting.HARedisPassword, - username: cfg.UnifiedAlerting.HARedisUsername, - db: cfg.UnifiedAlerting.HARedisDB, - maxConns: cfg.UnifiedAlerting.HARedisMaxConns, - tlsEnabled: cfg.UnifiedAlerting.HARedisTLSEnabled, - tls: cfg.UnifiedAlerting.HARedisTLSConfig, + addr: cfg.UnifiedAlerting.HARedisAddr, + name: cfg.UnifiedAlerting.HARedisPeerName, + prefix: cfg.UnifiedAlerting.HARedisPrefix, + password: cfg.UnifiedAlerting.HARedisPassword, + username: cfg.UnifiedAlerting.HARedisUsername, + db: cfg.UnifiedAlerting.HARedisDB, + maxConns: cfg.UnifiedAlerting.HARedisMaxConns, + tlsEnabled: cfg.UnifiedAlerting.HARedisTLSEnabled, + tls: cfg.UnifiedAlerting.HARedisTLSConfig, + clusterMode: cfg.UnifiedAlerting.HARedisClusterModeEnabled, }, clusterLogger, moa.metrics.Registerer, cfg.UnifiedAlerting.HAPushPullInterval) if err != nil { return fmt.Errorf("unable to initialize redis: %w", err)