opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-29 22:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

ExploreMetrics: Preinstall metrics drilldown app (#100094)

Browse Source 
* feat: preinstall metrics drilldown app

* refactor: simplify

* fix: read feature toggles before plugin settings
This commit is contained in:
Nick Richmond
2025-03-12 09:23:10 -04:00
committed by GitHub
parent b224751374
commit 00d9916113
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/setting/setting.go
View File

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

3
pkg/setting/setting_plugins.go
View File

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