From f8ca04bfee6f2930da92e89441b5d591ba2ef07c Mon Sep 17 00:00:00 2001 From: Vadim Stepanov Date: Mon, 14 Jul 2025 15:03:00 +0100 Subject: [PATCH] pass notification historian in tests --- pkg/services/ngalert/api/api_alertmanager_test.go | 1 + pkg/services/ngalert/notifier/alertmanager_test.go | 2 +- .../ngalert/notifier/multiorg_alertmanager_remote_test.go | 1 + pkg/services/ngalert/notifier/multiorg_alertmanager_test.go | 1 + pkg/services/ngalert/sender/router_test.go | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/services/ngalert/api/api_alertmanager_test.go b/pkg/services/ngalert/api/api_alertmanager_test.go index ab202caa75d..bd253f5a685 100644 --- a/pkg/services/ngalert/api/api_alertmanager_test.go +++ b/pkg/services/ngalert/api/api_alertmanager_test.go @@ -611,6 +611,7 @@ func createMultiOrgAlertmanager(t *testing.T, configs map[int64]*ngmodels.AlertC log.New("testlogger"), secretsService, featuremgmt.WithManager(), + nil, ) require.NoError(t, err) err = mam.LoadAndSyncAlertmanagersForOrgs(context.Background()) diff --git a/pkg/services/ngalert/notifier/alertmanager_test.go b/pkg/services/ngalert/notifier/alertmanager_test.go index fe00b4f8331..e865fca9178 100644 --- a/pkg/services/ngalert/notifier/alertmanager_test.go +++ b/pkg/services/ngalert/notifier/alertmanager_test.go @@ -58,7 +58,7 @@ func setupAMTest(t *testing.T) *alertmanager { stateStore := NewFileStore(int64(orgID), kvStore) crypto := NewCrypto(secretsService, s, l) - am, err := NewAlertmanager(context.Background(), 1, cfg, s, stateStore, &NilPeer{}, decryptFn, nil, m, featuremgmt.WithFeatures(), crypto) + am, err := NewAlertmanager(context.Background(), 1, cfg, s, stateStore, &NilPeer{}, decryptFn, nil, m, featuremgmt.WithFeatures(), crypto, nil) require.NoError(t, err) return am } diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager_remote_test.go b/pkg/services/ngalert/notifier/multiorg_alertmanager_remote_test.go index 2a378f622d9..4c617b3a3b4 100644 --- a/pkg/services/ngalert/notifier/multiorg_alertmanager_remote_test.go +++ b/pkg/services/ngalert/notifier/multiorg_alertmanager_remote_test.go @@ -102,6 +102,7 @@ func TestMultiorgAlertmanager_RemoteSecondaryMode(t *testing.T) { nopLogger, secretsService, featuremgmt.WithFeatures(), + nil, override, ) require.NoError(t, err) diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go b/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go index 92c0209aa37..68a6a7dedea 100644 --- a/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go +++ b/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go @@ -396,6 +396,7 @@ func setupMam(t *testing.T, cfg *setting.Cfg) *MultiOrgAlertmanager { log.New("testlogger"), secretsService, featuremgmt.WithFeatures(), + nil, ) require.NoError(t, err) return mam diff --git a/pkg/services/ngalert/sender/router_test.go b/pkg/services/ngalert/sender/router_test.go index 25f0c7566aa..9aa7d8120ee 100644 --- a/pkg/services/ngalert/sender/router_test.go +++ b/pkg/services/ngalert/sender/router_test.go @@ -504,6 +504,7 @@ func createMultiOrgAlertmanager(t *testing.T, orgs []int64) *notifier.MultiOrgAl log.New("testlogger"), secretsService, featuremgmt.WithFeatures(), + nil, ) require.NoError(t, err) require.NoError(t, moa.LoadAndSyncAlertmanagersForOrgs(context.Background()))