root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 83 Packages Projects Releases Wiki Activity

Provisioning: Add provisioning api server to clients (#110721)

This commit is contained in:
Stephanie Hingtgen 2025-09-05 14:36:52 -06:00 committed by GitHub
parent d58b8aff7b
commit 2750a3516a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/operators/provisioning/config.go
View File

@ -153,7 +153,7 @@ func setupFromConfig(cfg *setting.Cfg) (controllerCfg *provisioningControllerCon
return nil, fmt.Errorf("folders_server_url is required in [operator] section")
}
apiServerURLs := []string{dashboardsServerURL, foldersServerURL}
apiServerURLs := []string{dashboardsServerURL, foldersServerURL, provisioningServerURL}
configProviders := make([]apiserver.RestConfigProvider, len(apiServerURLs))
for i, url := range apiServerURLs {
@ -306,6 +306,7 @@ func setupUnifiedStorageClient(cfg *setting.Cfg, tracer tracing.Tracer, resource
if address == "" {
return nil, fmt.Errorf("grpc_address is required in [unified_storage] section")
}
// FIXME: These metrics are not going to show up in /metrics
registry := prometheus.NewPedanticRegistry()
conn, err := unified.GrpcConn(address, registry)
if err != nil {
@ -316,7 +317,10 @@ func setupUnifiedStorageClient(cfg *setting.Cfg, tracer tracing.Tracer, resource
indexConn := conn
indexAddress := unifiedStorageSec.Key("grpc_index_address").String()
if indexAddress != "" {
indexConn, err = unified.GrpcConn(indexAddress, registry)
// FIXME: These metrics are not going to show up in /metrics. We will also need to wrap these metrics
// to start with something else so it doesn't collide with the storage api metrics.
registry2 := prometheus.NewPedanticRegistry()
indexConn, err = unified.GrpcConn(indexAddress, registry2)
if err != nil {
return nil, fmt.Errorf("create unified storage index gRPC connection: %w", err)
}