Add preinstall feature to defaults.ini (grafana#92347)

andresmgot · web-flow · commit a990b77c701a · 2024-08-23T10:32:23.000+02:00
diff --git 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
@@ -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))
