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

Geomap: default basemap config cleanup (#37069)

Browse Source
This commit is contained in:
Ryan McKinley
2021-07-21 13:48:20 -07:00
committed by GitHub
parent f26f76df5a
commit e604e69d93
13 changed files with 91 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/api/frontendsettings.go
View File

@@ -259,8 +259,13 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *models.ReqContext) (map[string]i
"caching": map[string]bool{
"enabled": hs.Cfg.SectionWithEnvOverrides("caching").Key("enabled").MustBool(true),
},
"geomapDefaultBaseLayer": hs.Cfg.DefaultBaseLayer,
"geomapDisableCustomBaseLayer": hs.Cfg.DisableCustomBaseLayers,
}
if hs.Cfg.GeomapDefaultBaseLayerConfig != nil {
jsonObj["geomapDefaultBaseLayerConfig"] = hs.Cfg.GeomapDefaultBaseLayerConfig
}
if !hs.Cfg.GeomapEnableCustomBaseLayers {
jsonObj["geomapDisableCustomBaseLayer"] = true
}
return jsonObj, nil

19
pkg/setting/setting.go
View File

@@ -402,9 +402,9 @@ type Cfg struct {
// Grafana.com URL
GrafanaComURL string
// Geomap plugin tile server
DefaultBaseLayer map[string]interface{}
DisableCustomBaseLayers bool
// Geomap base layer config
GeomapDefaultBaseLayerConfig map[string]interface{}
GeomapEnableCustomBaseLayers bool
}
// IsLiveConfigEnabled returns true if live should be able to save configs to SQL tables
@@ -972,16 +972,17 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
}
geomapSection := iniFile.Section("geomap")
basemapJSON := valueAsString(geomapSection, "default_baselayer", "")
cfg.DefaultBaseLayer = make(map[string]interface{})
basemapJSON := valueAsString(geomapSection, "default_baselayer_config", "")
if basemapJSON != "" {
err = json.Unmarshal([]byte(basemapJSON), &cfg.DefaultBaseLayer)
layer := make(map[string]interface{})
err = json.Unmarshal([]byte(basemapJSON), &layer)
if err != nil {
cfg.Logger.Error(fmt.Sprintf("Error parsing JSON string: %s", err))
cfg.DefaultBaseLayer = nil
cfg.Logger.Error("Error reading json from default_baselayer_config", "error", err)
} else {
cfg.GeomapDefaultBaseLayerConfig = layer
}
}
cfg.DisableCustomBaseLayers = geomapSection.Key("disable_custom_baselayers").MustBool(false)
cfg.GeomapEnableCustomBaseLayers = geomapSection.Key("enable_custom_baselayers").MustBool(true)
cfg.readDateFormats()
cfg.readSentryConfig()