root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 236 Packages Projects Releases Wiki Activity

Prometheus: Add missing Azure setting (#84094)

This commit is contained in:
Andreas Christou 2024-03-11 08:57:42 +00:00 committed by GitHub
parent ea84a66ff4
commit 07676ab8a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/setting/setting_azure.go
View File

@ -9,6 +9,10 @@ func (cfg *Cfg) readAzureSettings() {
azureSettings := &azsettings.AzureSettings{}
azureSection := cfg.Raw.Section("azure")
authSection := cfg.Raw.Section("auth")
// This setting is specific to Prometheus
azureSettings.AzureAuthEnabled = authSection.Key("azure_auth_enabled").MustBool(false)
// Cloud
cloudName := azureSection.Key("cloud").MustString(azsettings.AzurePublic)

21
pkg/setting/setting_azure_test.go
View File

@ -64,6 +64,27 @@ func TestAzureSettings(t *testing.T) {
}
})
t.Run("prometheus", func(t *testing.T) {
t.Run("should enable azure auth", func(t *testing.T) {
cfg := NewCfg()
authSection, err := cfg.Raw.NewSection("auth")
require.NoError(t, err)
_, err = authSection.NewKey("azure_auth_enabled", "true")
require.NoError(t, err)
cfg.readAzureSettings()
require.NotNil(t, cfg.Azure.AzureAuthEnabled)
assert.True(t, cfg.Azure.AzureAuthEnabled)
})
t.Run("should default to disabled", func(t *testing.T) {
cfg := NewCfg()
cfg.readAzureSettings()
require.NotNil(t, cfg.Azure.AzureAuthEnabled)
assert.False(t, cfg.Azure.AzureAuthEnabled)
})
})
t.Run("User Identity", func(t *testing.T) {
t.Run("should be disabled by default", func(t *testing.T) {
cfg := NewCfg()