Revert change of order of checks when setting up resource DB (#105514)
* Revert change of order in newResourceDBProvider * Ignore error in provisioningSecrets when working with wrong DB. * Update workspace. * Add owner.
This commit is contained in:
@@ -104,6 +104,10 @@ func newResourceDBProvider(grafanaDB infraDB.DB, cfg *setting.Cfg, tracer trace.
|
||||
return p, fmt.Errorf("invalid db type specified: %s", dbType)
|
||||
|
||||
// If we have an empty Resource API db config, try with the core Grafana database config
|
||||
case grafanaDBType != "":
|
||||
p.registerMetrics = true
|
||||
p.engine, err = getEngine(cfg)
|
||||
return p, err
|
||||
case grafanaDB != nil:
|
||||
// try to use the grafana db connection (should only happen in tests)
|
||||
if fallbackGetter.Bool(grafanaDBInstrumentQueriesKey) {
|
||||
@@ -111,10 +115,6 @@ func newResourceDBProvider(grafanaDB infraDB.DB, cfg *setting.Cfg, tracer trace.
|
||||
}
|
||||
p.engine = grafanaDB.GetEngine()
|
||||
return p, nil
|
||||
case grafanaDBType != "":
|
||||
p.registerMetrics = true
|
||||
p.engine, err = getEngine(cfg)
|
||||
return p, err
|
||||
default:
|
||||
return p, fmt.Errorf("no database type specified")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user