Provisioning: Ensure that enterprise provisioning runs [10.1.x] (#76686)
revert https://github.com/grafana/grafana/pull/72608 (cherry picked from commit bb3e422365d95aa44a468bc71adfffa423bec65e)
This commit is contained in:
@@ -11,18 +11,14 @@ const (
|
||||
GrafanaAPIServer string = "grafana-apiserver"
|
||||
// HTTPServer is the HTTP server for Grafana
|
||||
HTTPServer string = "http-server"
|
||||
// Provisioning sets up Grafana with preconfigured datasources, dashboards, etc.
|
||||
Provisioning string = "provisioning"
|
||||
// SecretMigrator handles legacy secrets migrations
|
||||
SecretMigrator string = "secret-migrator"
|
||||
)
|
||||
|
||||
// dependencyMap defines Module Targets => Dependencies
|
||||
var dependencyMap = map[string][]string{
|
||||
BackgroundServices: {Provisioning, HTTPServer},
|
||||
BackgroundServices: {HTTPServer},
|
||||
CertGenerator: {},
|
||||
GrafanaAPIServer: {CertGenerator},
|
||||
Provisioning: {SecretMigrator},
|
||||
|
||||
All: {BackgroundServices},
|
||||
All: {BackgroundServices},
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@ import (
|
||||
"github.com/grafana/grafana/pkg/modules"
|
||||
"github.com/grafana/grafana/pkg/server/backgroundsvcs"
|
||||
grafanaapiserver "github.com/grafana/grafana/pkg/services/grafana-apiserver"
|
||||
"github.com/grafana/grafana/pkg/services/provisioning"
|
||||
"github.com/grafana/grafana/pkg/services/secrets/kvstore/migrations"
|
||||
)
|
||||
|
||||
@@ -26,7 +25,6 @@ func ProvideRegistry(
|
||||
backgroundServiceRunner *backgroundsvcs.BackgroundServiceRunner,
|
||||
certGenerator certgenerator.ServiceInterface,
|
||||
httpServer *api.HTTPServer,
|
||||
provisioningService *provisioning.ProvisioningServiceImpl,
|
||||
secretsMigrator *migrations.SecretMigrationProviderImpl,
|
||||
) *registry {
|
||||
return newRegistry(
|
||||
@@ -36,7 +34,6 @@ func ProvideRegistry(
|
||||
backgroundServiceRunner,
|
||||
certGenerator,
|
||||
httpServer,
|
||||
provisioningService,
|
||||
secretsMigrator,
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user