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

Change plugin install config syntax (#91895)

This commit is contained in:
Andres Martinez Gotor 2024-08-16 09:44:47 +02:00 committed by GitHub
parent f01263803a
commit 5bf6ffc315
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/setting/setting_plugins.go
View File

@ -39,16 +39,19 @@ func (cfg *Cfg) readPluginSettings(iniFile *ini.File) error {
cfg.DisablePlugins = util.SplitString(pluginsSection.Key("disable_plugins").MustString("")) cfg.DisablePlugins = util.SplitString(pluginsSection.Key("disable_plugins").MustString(""))
cfg.HideAngularDeprecation = util.SplitString(pluginsSection.Key("hide_angular_deprecation").MustString("")) cfg.HideAngularDeprecation = util.SplitString(pluginsSection.Key("hide_angular_deprecation").MustString(""))
cfg.ForwardHostEnvVars = util.SplitString(pluginsSection.Key("forward_host_env_vars").MustString("")) cfg.ForwardHostEnvVars = util.SplitString(pluginsSection.Key("forward_host_env_vars").MustString(""))
rawInstallPlugins := util.SplitString(pluginsSection.Key("install").MustString("")) disablePreinstall := pluginsSection.Key("disable_preinstall").MustBool(false)
cfg.InstallPlugins = make([]InstallPlugin, len(rawInstallPlugins)) if !disablePreinstall {
for i, plugin := range rawInstallPlugins { rawInstallPlugins := util.SplitString(pluginsSection.Key("preinstall").MustString(""))
parts := strings.Split(plugin, "@") cfg.InstallPlugins = make([]InstallPlugin, len(rawInstallPlugins))
id := parts[0] for i, plugin := range rawInstallPlugins {
v := "" parts := strings.Split(plugin, "@")
if len(parts) == 2 { id := parts[0]
v = parts[1] v := ""
if len(parts) == 2 {
v = parts[1]
}
cfg.InstallPlugins[i] = InstallPlugin{id, v}
} }
cfg.InstallPlugins[i] = InstallPlugin{id, v}
} }
cfg.PluginCatalogURL = pluginsSection.Key("plugin_catalog_url").MustString("https://grafana.com/grafana/plugins/") cfg.PluginCatalogURL = pluginsSection.Key("plugin_catalog_url").MustString("https://grafana.com/grafana/plugins/")