feat: add unified data migrations for dashboard and folders (#113853)
This commit is contained in:
@@ -57,7 +57,6 @@ func ProvideUnifiedStorageClient(opts *Options,
|
||||
storageMetrics *resource.StorageMetrics,
|
||||
indexMetrics *resource.BleveIndexMetrics,
|
||||
) (resource.ResourceClient, error) {
|
||||
// See: apiserver.applyAPIServerConfig(cfg, features, o)
|
||||
apiserverCfg := opts.Cfg.SectionWithEnvOverrides("grafana-apiserver")
|
||||
client, err := newClient(options.StorageOptions{
|
||||
StorageType: options.StorageType(apiserverCfg.Key("storage_type").MustString(string(options.StorageTypeUnified))),
|
||||
@@ -165,12 +164,8 @@ func newClient(opts options.StorageOptions,
|
||||
indexConn = conn
|
||||
}
|
||||
|
||||
// Create a client instance
|
||||
client, err := resource.NewResourceClient(conn, indexConn, cfg, features, tracer)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return client, nil
|
||||
// Create a resource client
|
||||
return resource.NewResourceClient(conn, indexConn, cfg, features, tracer)
|
||||
|
||||
default:
|
||||
searchOptions, err := search.NewSearchOptions(features, cfg, tracer, docs, indexMetrics, nil)
|
||||
|
||||
Reference in New Issue
Block a user