From f0c841b9bc4fa2f4d09e68c7285fb1d83b2c40d0 Mon Sep 17 00:00:00 2001 From: Andres Martinez Gotor Date: Thu, 24 Apr 2025 15:27:13 +0200 Subject: [PATCH] Advisor: Allow to disable backend (#104445) --- pkg/registry/apps/apps.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/registry/apps/apps.go b/pkg/registry/apps/apps.go index 40e6d8c830b..9de8798d97e 100644 --- a/pkg/registry/apps/apps.go +++ b/pkg/registry/apps/apps.go @@ -2,6 +2,7 @@ package appregistry import ( "context" + "slices" "github.com/grafana/grafana-app-sdk/app" "github.com/grafana/grafana/pkg/infra/log" @@ -13,6 +14,7 @@ import ( "github.com/grafana/grafana/pkg/services/apiserver/builder" "github.com/grafana/grafana/pkg/services/apiserver/builder/runner" "github.com/grafana/grafana/pkg/services/featuremgmt" + "github.com/grafana/grafana/pkg/setting" "k8s.io/client-go/rest" ) @@ -33,6 +35,7 @@ func ProvideRegistryServiceSink( playlistAppProvider *playlist.PlaylistAppProvider, investigationAppProvider *investigations.InvestigationsAppProvider, advisorAppProvider *advisor.AdvisorAppProvider, + grafanaCfg *setting.Cfg, ) (*Service, error) { cfgWrapper := func(ctx context.Context) (*rest.Config, error) { cfg, err := restConfigProvider.GetRestConfig(ctx) @@ -55,7 +58,8 @@ func ProvideRegistryServiceSink( logger.Debug("Investigations backend is enabled") providers = append(providers, investigationAppProvider) } - if features.IsEnabledGlobally(featuremgmt.FlagGrafanaAdvisor) { + if features.IsEnabledGlobally(featuremgmt.FlagGrafanaAdvisor) && + !slices.Contains(grafanaCfg.DisablePlugins, "grafana-advisor-app") { providers = append(providers, advisorAppProvider) } apiGroupRunner, err = runner.NewAPIGroupRunner(cfg, providers...)