Chore: Wrap provisioning in dskit service (#71598)

This commit is contained in:
Todd Treece
2023-07-18 15:37:25 -04:00
committed by GitHub
parent d3ab1c1c1e
commit d280fedb3f
7 changed files with 56 additions and 38 deletions

View File

@@ -11,14 +11,16 @@ 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"
)
// dependencyMap defines Module Targets => Dependencies
var dependencyMap = map[string][]string{
BackgroundServices: {},
BackgroundServices: {Provisioning, HTTPServer},
CertGenerator: {},
GrafanaAPIServer: {CertGenerator},
All: {BackgroundServices, HTTPServer},
All: {Provisioning, HTTPServer, BackgroundServices},
}

View File

@@ -9,6 +9,7 @@ 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"
)
type Registry interface{}
@@ -24,6 +25,7 @@ func ProvideRegistry(
backgroundServiceRunner *backgroundsvcs.BackgroundServiceRunner,
certGenerator certgenerator.ServiceInterface,
httpServer *api.HTTPServer,
provisioningService *provisioning.ProvisioningServiceImpl,
) *registry {
return newRegistry(
log.New("modules.registry"),
@@ -32,6 +34,7 @@ func ProvideRegistry(
backgroundServiceRunner,
certGenerator,
httpServer,
provisioningService,
)
}