diff --git a/pkg/server/server.go b/pkg/server/server.go index a56b6c9f184..ca1263d9e4d 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -131,7 +131,7 @@ func (s *Server) Init() error { return err } - return nil + return s.provisioningService.RunInitProvisioners(s.context) } // Run initializes and starts services. This will block until all services have diff --git a/pkg/services/provisioning/provisioning.go b/pkg/services/provisioning/provisioning.go index c283d38e7d2..3faa086e7be 100644 --- a/pkg/services/provisioning/provisioning.go +++ b/pkg/services/provisioning/provisioning.go @@ -183,21 +183,18 @@ func (ps *ProvisioningServiceImpl) RunInitProvisioners(ctx context.Context) erro return err } - err = ps.ProvisionAlerting(ctx) - if err != nil { - ps.log.Error("Failed to provision alerting", "error", err) - return err - } - return nil } func (ps *ProvisioningServiceImpl) Run(ctx context.Context) error { var err error - // run Init Provisioners only once ps.onceInitProvisioners.Do(func() { - err = ps.RunInitProvisioners(ctx) + // Run Alerting Provisioning only once. + // It can't be initialized at RunInitProvisioners because it + // depends on the Server to be already running and listening + // to /apis endpoints. + err = ps.ProvisionAlerting(ctx) }) if err != nil {