From 429ed4b4ee44abc32e3d1642c41333fd95acfb25 Mon Sep 17 00:00:00 2001 From: Yuriy Tseretyan Date: Wed, 13 Jul 2022 10:34:35 -0400 Subject: [PATCH] remove unused orgStore from scheduler (#52157) --- pkg/services/ngalert/ngalert.go | 1 - pkg/services/ngalert/schedule/schedule.go | 3 --- 2 files changed, 4 deletions(-) diff --git a/pkg/services/ngalert/ngalert.go b/pkg/services/ngalert/ngalert.go index 0b7338af609..49ef4d16577 100644 --- a/pkg/services/ngalert/ngalert.go +++ b/pkg/services/ngalert/ngalert.go @@ -155,7 +155,6 @@ func (ng *AlertNG) init() error { Evaluator: eval.NewEvaluator(ng.Cfg, ng.Log, ng.DataSourceCache, ng.SecretsService, ng.ExpressionService), InstanceStore: store, RuleStore: store, - OrgStore: store, Metrics: ng.Metrics.GetSchedulerMetrics(), AlertSender: alertsRouter, } diff --git a/pkg/services/ngalert/schedule/schedule.go b/pkg/services/ngalert/schedule/schedule.go index 61f6ce7edb2..deb0d2b09e3 100644 --- a/pkg/services/ngalert/schedule/schedule.go +++ b/pkg/services/ngalert/schedule/schedule.go @@ -79,7 +79,6 @@ type schedule struct { ruleStore store.RuleStore instanceStore store.InstanceStore - orgStore store.OrgStore stateManager *state.Manager @@ -111,7 +110,6 @@ type SchedulerCfg struct { StopAppliedFunc func(ngmodels.AlertRuleKey) Evaluator eval.Evaluator RuleStore store.RuleStore - OrgStore store.OrgStore InstanceStore store.InstanceStore Metrics *metrics.Scheduler AlertSender AlertsSender @@ -133,7 +131,6 @@ func NewScheduler(cfg SchedulerCfg, appURL *url.URL, stateManager *state.Manager evaluator: cfg.Evaluator, ruleStore: cfg.RuleStore, instanceStore: cfg.InstanceStore, - orgStore: cfg.OrgStore, metrics: cfg.Metrics, appURL: appURL, disableGrafanaFolder: cfg.Cfg.ReservedLabels.IsReservedLabelDisabled(ngmodels.FolderTitleLabel),