Plugins: Fix parsing of Azure settings for plugins (#60611)

Fix parsing of Azure settings for plugins
pull/60628/head
Sergey Kostrukov 3 years ago committed by GitHub
parent c35c689a96
commit 96b7fb15de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      pkg/plugins/config/config.go

@ -41,7 +41,6 @@ func ProvideConfig(settingProvider setting.Provider, grafanaCfg *setting.Cfg) *C
func NewCfg(settingProvider setting.Provider, grafanaCfg *setting.Cfg) *Cfg {
logger := log.New("plugin.cfg")
azure := settingProvider.Section("azure")
aws := settingProvider.Section("aws")
plugins := settingProvider.Section("plugins")
@ -65,12 +64,8 @@ func NewCfg(settingProvider setting.Provider, grafanaCfg *setting.Cfg) *Cfg {
PluginsAllowUnsigned: allowedUnsigned,
AWSAllowedAuthProviders: allowedAuth,
AWSAssumeRoleEnabled: aws.KeyValue("assume_role_enabled").MustBool(grafanaCfg.AWSAssumeRoleEnabled),
Azure: &azsettings.AzureSettings{
Cloud: azure.KeyValue("cloud").MustString(grafanaCfg.Azure.Cloud),
ManagedIdentityEnabled: azure.KeyValue("managed_identity_enabled").MustBool(grafanaCfg.Azure.ManagedIdentityEnabled),
ManagedIdentityClientId: azure.KeyValue("managed_identity_client_id").MustString(grafanaCfg.Azure.ManagedIdentityClientId),
},
LogDatasourceRequests: grafanaCfg.IsFeatureToggleEnabled(featuremgmt.FlagDatasourceLogger),
Azure: grafanaCfg.Azure,
LogDatasourceRequests: grafanaCfg.IsFeatureToggleEnabled(featuremgmt.FlagDatasourceLogger),
}
}

Loading…
Cancel
Save