public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v9.3.x] Plugins: Fix parsing of Azure settings for plugins (#60625)

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

Fix parsing of Azure settings for plugins

(cherry picked from commit 96b7fb15de)

Co-authored-by: Sergey Kostrukov <sekost@microsoft.com>
This commit is contained in:
Grot (@grafanabot)
2022-12-21 07:51:06 -05:00
committed by GitHub
co-authored by Sergey Kostrukov
parent d726a9648f
commit f05f7db37d
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/plugins/config/config.go
+2 -7
View File
@@ -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),
}
}