ExploreMetrics: Preinstall metrics drilldown app (#100094)

* feat: preinstall metrics drilldown app

* refactor: simplify

* fix: read feature toggles before plugin settings
pull/102032/head
Nick Richmond 10 months ago committed by GitHub
parent b224751374
commit 00d9916113
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 6
      pkg/setting/setting.go
  2. 3
      pkg/setting/setting_plugins.go

@ -1248,12 +1248,12 @@ func (cfg *Cfg) parseINIFile(iniFile *ini.File) error {
panelsSection := iniFile.Section("panels")
cfg.DisableSanitizeHtml = panelsSection.Key("disable_sanitize_html").MustBool(false)
if err := cfg.readPluginSettings(iniFile); err != nil {
// nolint:staticcheck
if err := cfg.readFeatureToggles(iniFile); err != nil {
return err
}
// nolint:staticcheck
if err := cfg.readFeatureToggles(iniFile); err != nil {
if err := cfg.readPluginSettings(iniFile); err != nil {
return err
}

@ -58,6 +58,9 @@ func (cfg *Cfg) readPluginSettings(iniFile *ini.File) error {
if cfg.IsFeatureToggleEnabled("grafanaAdvisor") { // Use literal string to avoid circular dependency
preinstallPlugins["grafana-advisor-app"] = InstallPlugin{"grafana-advisor-app", "", ""}
}
if cfg.IsFeatureToggleEnabled("exploreMetricsUseExternalAppPlugin") { // Use literal string to avoid circular dependency
preinstallPlugins["grafana-metricsdrilldown-app"] = InstallPlugin{"grafana-metricsdrilldown-app", "", ""}
}
// Add the plugins defined in the configuration
for _, plugin := range rawInstallPlugins {
parts := strings.Split(plugin, "@")

Loading…
Cancel
Save