@@ -192,20 +192,20 @@ func New(cfg *Config, reg *prometheus.Registry) (*Alertmanager, error) {
192192
193193 am .wg .Add (1 )
194194 var err error
195+
195196 am .nflog , err = nflog .New (
196197 nflog .WithRetention (cfg .Retention ),
197198 nflog .WithSnapshot (filepath .Join (cfg .TenantDataDir , notificationLogSnapshot )),
198199 nflog .WithMaintenance (maintenancePeriod , am .stop , am .wg .Done , nil ),
199200 nflog .WithMetrics (am .registry ),
200201 nflog .WithLogger (log .With (am .logger , "component" , "nflog" )),
201202 )
203+
202204 if err != nil {
203205 return nil , fmt .Errorf ("failed to create notification log: %v" , err )
204206 }
205-
206207 c := am .state .AddState ("nfl:" + cfg .UserID , am .nflog , am .registry )
207208 am .nflog .SetBroadcast (c .Broadcast )
208-
209209 am .marker = types .NewMarker (am .registry )
210210
211211 silencesFile := filepath .Join (cfg .TenantDataDir , silencesSnapshot )
@@ -218,10 +218,8 @@ func New(cfg *Config, reg *prometheus.Registry) (*Alertmanager, error) {
218218 if err != nil {
219219 return nil , fmt .Errorf ("failed to create silences: %v" , err )
220220 }
221-
222221 c = am .state .AddState ("sil:" + cfg .UserID , am .silences , am .registry )
223222 am .silences .SetBroadcast (c .Broadcast )
224-
225223 // State replication needs to be started after the state keys are defined.
226224 if service , ok := am .state .(services.Service ); ok {
227225 if err := service .StartAsync (context .Background ()); err != nil {
@@ -320,7 +318,7 @@ func (am *Alertmanager) ApplyConfig(userID string, conf *config.Config, rawCfg s
320318 templateFiles [i ] = templateFilepath
321319 }
322320
323- tmpl , err := template .FromGlobs (templateFiles ... )
321+ tmpl , err := template .FromGlobs (templateFiles )
324322 if err != nil {
325323 return err
326324 }
@@ -461,7 +459,7 @@ func (am *Alertmanager) getFullState() (*clusterpb.FullState, error) {
461459
462460// buildIntegrationsMap builds a map of name to the list of integration notifiers off of a
463461// list of receiver config.
464- func buildIntegrationsMap (nc []* config.Receiver , tmpl * template.Template , firewallDialer * util_net.FirewallDialer , logger log.Logger , notifierWrapper func (string , notify.Notifier ) notify.Notifier ) (map [string ][]notify.Integration , error ) {
462+ func buildIntegrationsMap (nc []config.Receiver , tmpl * template.Template , firewallDialer * util_net.FirewallDialer , logger log.Logger , notifierWrapper func (string , notify.Notifier ) notify.Notifier ) (map [string ][]notify.Integration , error ) {
465463 integrationsMap := make (map [string ][]notify.Integration , len (nc ))
466464 for _ , rcv := range nc {
467465 integrations , err := buildReceiverIntegrations (rcv , tmpl , firewallDialer , logger , notifierWrapper )
@@ -476,7 +474,7 @@ func buildIntegrationsMap(nc []*config.Receiver, tmpl *template.Template, firewa
476474// buildReceiverIntegrations builds a list of integration notifiers off of a
477475// receiver config.
478476// Taken from https://github.com/prometheus/alertmanager/blob/94d875f1227b29abece661db1a68c001122d1da5/cmd/alertmanager/main.go#L112-L159.
479- func buildReceiverIntegrations (nc * config.Receiver , tmpl * template.Template , firewallDialer * util_net.FirewallDialer , logger log.Logger , wrapper func (string , notify.Notifier ) notify.Notifier ) ([]notify.Integration , error ) {
477+ func buildReceiverIntegrations (nc config.Receiver , tmpl * template.Template , firewallDialer * util_net.FirewallDialer , logger log.Logger , wrapper func (string , notify.Notifier ) notify.Notifier ) ([]notify.Integration , error ) {
480478 var (
481479 errs types.MultiError
482480 integrations []notify.Integration
0 commit comments