IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

provisioning: handle nil configs

Browse Source
This commit is contained in:
bergquist
2018-02-14 11:22:24 +01:00
parent 3091697a2c
commit 165304a342
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/provisioning/datasources/config_reader.go
View File

@@ -57,6 +57,10 @@ func (cr *configReader) parseDatasourceConfig(path string, file os.FileInfo) (*D
return nil, err return nil, err
} }
if apiVersion == nil {
apiVersion = &ConfigVersion{ApiVersion: 0}
}
if apiVersion.ApiVersion > 0 { if apiVersion.ApiVersion > 0 {
var v1 *DatasourcesAsConfigV1 var v1 *DatasourcesAsConfigV1
err = yaml.Unmarshal(yamlFile, &v1) err = yaml.Unmarshal(yamlFile, &v1)

8
pkg/services/provisioning/datasources/types.go
View File

@@ -111,6 +111,10 @@ func (cfg *DatasourcesAsConfigV1) mapToDatasourceFromConfig(apiVersion int64) *D
r.ApiVersion = apiVersion r.ApiVersion = apiVersion
if cfg == nil {
return r
}
for _, ds := range cfg.Datasources { for _, ds := range cfg.Datasources {
r.Datasources = append(r.Datasources, &DataSourceFromConfig{ r.Datasources = append(r.Datasources, &DataSourceFromConfig{
OrgId: ds.OrgId, OrgId: ds.OrgId,
@@ -148,6 +152,10 @@ func (cfg *DatasourcesAsConfigV0) mapToDatasourceFromConfig(apiVersion int64) *D
r.ApiVersion = apiVersion r.ApiVersion = apiVersion
if cfg == nil {
return r
}
for _, ds := range cfg.Datasources { for _, ds := range cfg.Datasources {
r.Datasources = append(r.Datasources, &DataSourceFromConfig{ r.Datasources = append(r.Datasources, &DataSourceFromConfig{
OrgId: ds.OrgId, OrgId: ds.OrgId,