mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Change plugin install config syntax (#91895)
This commit is contained in:
parent
f01263803a
commit
5bf6ffc315
@ -39,7 +39,9 @@ func (cfg *Cfg) readPluginSettings(iniFile *ini.File) error {
|
||||
cfg.DisablePlugins = util.SplitString(pluginsSection.Key("disable_plugins").MustString(""))
|
||||
cfg.HideAngularDeprecation = util.SplitString(pluginsSection.Key("hide_angular_deprecation").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)
|
||||
if !disablePreinstall {
|
||||
rawInstallPlugins := util.SplitString(pluginsSection.Key("preinstall").MustString(""))
|
||||
cfg.InstallPlugins = make([]InstallPlugin, len(rawInstallPlugins))
|
||||
for i, plugin := range rawInstallPlugins {
|
||||
parts := strings.Split(plugin, "@")
|
||||
@ -50,6 +52,7 @@ func (cfg *Cfg) readPluginSettings(iniFile *ini.File) error {
|
||||
}
|
||||
cfg.InstallPlugins[i] = InstallPlugin{id, v}
|
||||
}
|
||||
}
|
||||
|
||||
cfg.PluginCatalogURL = pluginsSection.Key("plugin_catalog_url").MustString("https://grafana.com/grafana/plugins/")
|
||||
cfg.PluginAdminEnabled = pluginsSection.Key("plugin_admin_enabled").MustBool(true)
|
||||
|
Loading…
Reference in New Issue
Block a user