public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[release-11.6.3] Provisioning: Move OSS provisioning to Run step (#106673)

Browse Source 
Provisioning: Move OSS provisioning to Run step (#105428)

* Provisioning: Move OSS provisioning to Run step



---------


(cherry picked from commit 1435eedbc4)

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>
Co-authored-by: maicon <maiconscosta@gmail.com>
This commit is contained in:
Josh Hunt
2025-06-13 07:03:42 +01:00
committed by GitHub
co-authored by maicon
parent f9c96337cd
commit 2a29e10117
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/provisioning/provisioning.go
+22 -16
View File
@@ -171,30 +171,36 @@ type ProvisioningServiceImpl struct {
}
func (ps *ProvisioningServiceImpl) RunInitProvisioners(ctx context.Context) error {
err := ps.ProvisionDatasources(ctx)
if err != nil {
ps.log.Error("Failed to provision data sources", "error", err)
return err
}
err = ps.ProvisionPlugins(ctx)
if err != nil {
ps.log.Error("Failed to provision plugins", "error", err)
return err
}
// We had to move the initialization of OSS provisioners to Run()
// because they need the /apis/* endpoints to be ready and listening.
// They query these endpoints to retrieve folders and dashboards.
return nil
}
func (ps *ProvisioningServiceImpl) Run(ctx context.Context) error {
var err error
// Run Datasources, Plugins and Alerting Provisioning only once.
// It can't be initialized at RunInitProvisioners because it
// depends on the /apis endpoints to be already running and listeningq
ps.onceInitProvisioners.Do(func() {
// 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.ProvisionDatasources(ctx)
if err != nil {
ps.log.Error("Failed to provision data sources", "error", err)
return
}
err = ps.ProvisionPlugins(ctx)
if err != nil {
ps.log.Error("Failed to provision plugins", "error", err)
return
}
err = ps.ProvisionAlerting(ctx)
if err != nil {
ps.log.Error("Failed to provision alerting", "error", err)
return
}
})
if err != nil {