From 710a5d29e94d3cbda9e895439f67036cc64cbd50 Mon Sep 17 00:00:00 2001 From: Andrew Hackmann <5140848+bossinc@users.noreply.github.com> Date: Fri, 11 Apr 2025 10:51:40 -0500 Subject: [PATCH] Azure Prometheus: Add Azure prom to Azure forward auth setting (#103910) add azure prom to the azure auth forward setting --- conf/defaults.ini | 4 ++-- conf/sample.ini | 2 +- pkg/services/pluginsintegration/pluginconfig/request_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 1678a620278..e5b1f010c8f 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -1067,8 +1067,8 @@ user_identity_federated_credential_audience = username_assertion = # Set the plugins that will receive Azure settings for each request (via plugin context) -# By default this will include all Grafana Labs owned Azure plugins, or those that make use of Azure settings (Azure Monitor, Azure Data Explorer, Prometheus, MSSQL). -forward_settings_to_plugins = grafana-azure-monitor-datasource, prometheus, grafana-azure-data-explorer-datasource, mssql +# By default this will include all Grafana Labs owned Azure plugins, or those that make use of Azure settings (Azure Monitor, Azure Data Explorer, Prometheus, MSSQL, Azure Prometheus). +forward_settings_to_plugins = grafana-azure-monitor-datasource, prometheus, grafana-azure-data-explorer-datasource, mssql, grafana-azureprometheus-datasource # Specifies whether Entra password auth can be used for the MSSQL data source # Disabled by default, needs to be explicitly enabled diff --git a/conf/sample.ini b/conf/sample.ini index e23dd0631c5..39afdec6fea 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -1048,7 +1048,7 @@ # Set the plugins that will receive Azure settings for each request (via plugin context) # By default this will include all Grafana Labs owned Azure plugins, or those that make use of Azure settings (Azure Monitor, Azure Data Explorer, Prometheus, MSSQL). -;forward_settings_to_plugins = grafana-azure-monitor-datasource, prometheus, grafana-azure-data-explorer-datasource, mssql +;forward_settings_to_plugins = grafana-azure-monitor-datasource, prometheus, grafana-azure-data-explorer-datasource, mssql, grafana-azureprometheus-datasourc # Specifies whether Entra password auth can be used for the MSSQL data source # Disabled by default, needs to be explicitly enabled diff --git a/pkg/services/pluginsintegration/pluginconfig/request_test.go b/pkg/services/pluginsintegration/pluginconfig/request_test.go index f8aa0cbc9f2..8153c24f10a 100644 --- a/pkg/services/pluginsintegration/pluginconfig/request_test.go +++ b/pkg/services/pluginsintegration/pluginconfig/request_test.go @@ -311,7 +311,7 @@ func TestRequestConfigProvider_PluginRequestConfig_azure(t *testing.T) { UsernameAssertion: true, }, UserIdentityFallbackCredentialsEnabled: true, - ForwardSettingsPlugins: []string{"grafana-azure-monitor-datasource", "prometheus", "grafana-azure-data-explorer-datasource", "mssql"}, + ForwardSettingsPlugins: []string{"grafana-azure-monitor-datasource", "prometheus", "grafana-azure-data-explorer-datasource", "mssql", "grafana-azureprometheus-datasource"}, AzureEntraPasswordCredentialsEnabled: true, }