diff --git a/conf/defaults.ini b/conf/defaults.ini index b14e1d5ea49..e164bf0fbd2 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -1729,6 +1729,12 @@ install_token = hide_angular_deprecation = # Comma separated list of plugin ids for which environment variables should be forwarded. Used only when feature flag pluginsSkipHostEnvVars is enabled. forward_host_env_vars = +# Comma separated list of plugin ids to install as part of the startup process. Used only when feature flag backgroundPluginInstaller is enabled. +preinstall = +# Controls whether preinstall plugins asynchronously (in the background) or synchronously (blocking). Useful when preinstalled plugins are used with provisioning. +preinstall_async = true +# Disables preinstall feature. It has the same effect as setting preinstall to an empty list. +preinstall_disabled = false #################################### Grafana Live ########################################## [live] diff --git a/pkg/setting/setting_plugins.go b/pkg/setting/setting_plugins.go index 54f315eef02..904dadcb20e 100644 --- a/pkg/setting/setting_plugins.go +++ b/pkg/setting/setting_plugins.go @@ -39,7 +39,7 @@ 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("")) - disablePreinstall := pluginsSection.Key("disable_preinstall").MustBool(false) + disablePreinstall := pluginsSection.Key("preinstall_disabled").MustBool(false) if !disablePreinstall { rawInstallPlugins := util.SplitString(pluginsSection.Key("preinstall").MustString("")) cfg.PreinstallPlugins = make([]InstallPlugin, len(rawInstallPlugins))