diff --git a/conf/defaults.ini b/conf/defaults.ini index c52788da583..091140c7cc1 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -1757,8 +1757,6 @@ public_key_retrieval_disabled = false public_key_retrieval_on_startup = false # Enter a comma-separated list of plugin identifiers to avoid loading (including core plugins). These plugins will be hidden in the catalog. disable_plugins = -# Auth token for plugin installations and removal in managed instances -install_token = # Comma separated list of plugin ids for which angular deprecation UI should be disabled hide_angular_deprecation = # Comma separated list of plugin ids for which environment variables should be forwarded. Used only when feature flag pluginsSkipHostEnvVars is enabled. diff --git a/pkg/api/grafana_com_proxy.go b/pkg/api/grafana_com_proxy.go index 9c2c0a23547..ac7ee28f626 100644 --- a/pkg/api/grafana_com_proxy.go +++ b/pkg/api/grafana_com_proxy.go @@ -51,7 +51,7 @@ func ReverseProxyGnetReq(logger log.Logger, proxyPath, version, grafanaComAPIUrl func (hs *HTTPServer) ProxyGnetRequest(c *contextmodel.ReqContext) { proxyPath := web.Params(c.Req)["*"] - proxy := ReverseProxyGnetReq(c.Logger, proxyPath, hs.Cfg.BuildVersion, hs.Cfg.GrafanaComAPIURL, hs.Cfg.PluginInstallToken) + proxy := ReverseProxyGnetReq(c.Logger, proxyPath, hs.Cfg.BuildVersion, hs.Cfg.GrafanaComAPIURL, hs.Cfg.GrafanaComSSOAPIToken) proxy.Transport = grafanaComProxyTransport proxy.ServeHTTP(c.Resp, c.Req) } diff --git a/pkg/services/pluginsintegration/pluginconfig/config.go b/pkg/services/pluginsintegration/pluginconfig/config.go index d2ae8849fd6..71952c64eb8 100644 --- a/pkg/services/pluginsintegration/pluginconfig/config.go +++ b/pkg/services/pluginsintegration/pluginconfig/config.go @@ -39,7 +39,7 @@ func ProvidePluginManagementConfig(cfg *setting.Cfg, settingProvider setting.Pro cfg.DisablePlugins, cfg.HideAngularDeprecation, cfg.ForwardHostEnvVars, - cfg.PluginInstallToken, + cfg.GrafanaComSSOAPIToken, ), nil } diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index f0039db5ae2..4cbf43e0eb7 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -196,7 +196,6 @@ type Cfg struct { PluginSkipPublicKeyDownload bool DisablePlugins []string HideAngularDeprecation []string - PluginInstallToken string ForwardHostEnvVars []string PreinstallPlugins []InstallPlugin PreinstallPluginsAsync bool diff --git a/pkg/setting/setting_plugins.go b/pkg/setting/setting_plugins.go index 8ba9fd134b0..f85ca79d4e8 100644 --- a/pkg/setting/setting_plugins.go +++ b/pkg/setting/setting_plugins.go @@ -91,8 +91,5 @@ func (cfg *Cfg) readPluginSettings(iniFile *ini.File) error { cfg.PluginsCDNURLTemplate = strings.TrimRight(pluginsSection.Key("cdn_base_url").MustString(""), "/") cfg.PluginLogBackendRequests = pluginsSection.Key("log_backend_requests").MustBool(false) - // Installation token for managed plugins - cfg.PluginInstallToken = pluginsSection.Key("install_token").MustString("") - return nil }