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

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

Browse Source 
Fix parsing of Azure settings for plugins
This commit is contained in:
Sergey Kostrukov
2022-12-21 04:37:33 -08:00
committed by GitHub
parent c35c689a96
commit 96b7fb15de
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/plugins/config/config.go
View File

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