IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Fix bug when provision app plugins using Enterprise edition (#26340)

Browse Source 
In OSS provisioning service init after plugin registration, but in
Enterprise it's the opposite order and installed app plugin check
fails. This adjusts service registry init priority to make sure plugins
are registered before provisioning inits.

Which issue(s) this PR fixes:
Fixes #26336
This commit is contained in:
Marcus Efraimsson
2020-07-16 10:36:08 +02:00
committed by GitHub
parent 35f7f7b50a
commit b97d1f4170
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/services/provisioning/provisioning.go
View File

@@ -25,14 +25,18 @@ type ProvisioningService interface {
}
func init() {
registry.RegisterService(NewProvisioningServiceImpl(
func(path string) (dashboards.DashboardProvisioner, error) {
return dashboards.New(path)
},
notifiers.Provision,
datasources.Provision,
plugins.Provision,
))
registry.Register(&registry.Descriptor{
Name: "ProvisioningService",
Instance: NewProvisioningServiceImpl(
func(path string) (dashboards.DashboardProvisioner, error) {
return dashboards.New(path)
},
notifiers.Provision,
datasources.Provision,
plugins.Provision,
),
InitPriority: registry.Low,
})
}
func NewProvisioningServiceImpl(