Alerting: Support Unified Alerting with Grafana HA (#37920)

* Alerting: Support Unified Alerting in Grafana's HA mode.

pkg/tests/api/alerting/api_admin_configuration_test.go

@@ -21,9 +21,9 @@ import (
 
 func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
 	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
-		EnableFeatureToggles:              []string{"ngalert"},
-		DisableAnonymous:                  true,
-		NGAlertAdminConfigIntervalSeconds: 2,
+		EnableFeatureToggles:           []string{"ngalert"},
+		DisableAnonymous:               true,
+		NGAlertAdminConfigPollInterval: 2 * time.Second,
 	})
 
 	grafanaListedAddr, s := testinfra.StartGrafana(t, dir, path)

pkg/tests/api/alerting/api_alertmanager_configuration_test.go

@@ -8,8 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
-
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
@@ -19,16 +17,10 @@ import (
 )
 
 func TestAlertmanagerConfigurationIsTransactional(t *testing.T) {
-	// TODO: We need a reliable way to ensure Alertmanagers have synced correctly.
-	// For now, make them sync quicker.
-	p := notifier.SyncOrgsPollInterval
-	notifier.SyncOrgsPollInterval = 2 * time.Second
-	t.Cleanup(func() {
-		notifier.SyncOrgsPollInterval = p
-	})
 	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
-		EnableFeatureToggles: []string{"ngalert"},
-		DisableAnonymous:     true,
+		EnableFeatureToggles:                  []string{"ngalert"},
+		NGAlertAlertmanagerConfigPollInterval: 2 * time.Second,
+		DisableAnonymous:                      true,
 	})
 
 	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)

pkg/tests/testinfra/testinfra.go

@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/grafana/grafana/pkg/api"
 	"github.com/grafana/grafana/pkg/infra/fs"
@@ -204,13 +205,18 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
 			_, err = featureSection.NewKey("enable", strings.Join(o.EnableFeatureToggles, " "))
 			require.NoError(t, err)
 		}
-		if o.NGAlertAdminConfigIntervalSeconds != 0 {
-			ngalertingSection, err := cfg.NewSection("ngalerting")
+		if o.NGAlertAdminConfigPollInterval != 0 {
+			ngalertingSection, err := cfg.NewSection("unified_alerting")
 			require.NoError(t, err)
-			_, err = ngalertingSection.NewKey("admin_config_poll_interval_seconds", fmt.Sprintf("%d", o.NGAlertAdminConfigIntervalSeconds))
+			_, err = ngalertingSection.NewKey("admin_config_poll_interval", o.NGAlertAdminConfigPollInterval.String())
+			require.NoError(t, err)
+		}
+		if o.NGAlertAlertmanagerConfigPollInterval != 0 {
+			ngalertingSection, err := cfg.NewSection("unified_alerting")
+			require.NoError(t, err)
+			_, err = ngalertingSection.NewKey("alertmanager_config_poll_interval", o.NGAlertAlertmanagerConfigPollInterval.String())
 			require.NoError(t, err)
 		}
-
 		if o.AnonymousUserRole != "" {
 			_, err = anonSect.NewKey("org_role", string(o.AnonymousUserRole))
 			require.NoError(t, err)
@@ -252,13 +258,14 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
 }
 
 type GrafanaOpts struct {
-	EnableCSP                         bool
-	EnableFeatureToggles              []string
-	NGAlertAdminConfigIntervalSeconds int
-	AnonymousUserRole                 models.RoleType
-	EnableQuota                       bool
-	DisableAnonymous                  bool
-	CatalogAppEnabled                 bool
-	ViewersCanEdit                    bool
-	PluginAdminEnabled                bool
+	EnableCSP                             bool
+	EnableFeatureToggles                  []string
+	NGAlertAdminConfigPollInterval        time.Duration
+	NGAlertAlertmanagerConfigPollInterval time.Duration
+	AnonymousUserRole                     models.RoleType
+	EnableQuota                           bool
+	DisableAnonymous                      bool
+	CatalogAppEnabled                     bool
+	ViewersCanEdit                        bool
+	PluginAdminEnabled                    bool
 }