Skip to content
Snippets Groups Projects
Verified Commit eb71ba11 authored by Evangelos Foutras's avatar Evangelos Foutras :smiley_cat:
Browse files

grafana: rebase grafana.ini to grafana 10.3.1-1

parent a6dd2fac
No related branches found
No related tags found
No related merge requests found
Pipeline #90768 passed
...@@ -869,6 +869,10 @@ role_attribute_strict = true ...@@ -869,6 +869,10 @@ role_attribute_strict = true
# By default is the same as used in AAD authentication or can be set to another application (for OBO flow) # By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
;user_identity_client_secret = ;user_identity_client_secret =
# 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
#################################### Role-based Access Control ########### #################################### Role-based Access Control ###########
[rbac] [rbac]
;permission_cache = true ;permission_cache = true
...@@ -897,6 +901,11 @@ role_attribute_strict = true ...@@ -897,6 +901,11 @@ role_attribute_strict = true
# SMTP startTLS policy (defaults to 'OpportunisticStartTLS') # SMTP startTLS policy (defaults to 'OpportunisticStartTLS')
;startTLS_policy = NoStartTLS ;startTLS_policy = NoStartTLS
[smtp.static_headers]
# Include custom static headers in all outgoing emails
;Foo-Header = bar
;Foo = bar
[emails] [emails]
;welcome_email_on_sign_up = false ;welcome_email_on_sign_up = false
;templates_pattern = emails/*.html, emails/*.txt ;templates_pattern = emails/*.html, emails/*.txt
...@@ -1601,6 +1610,7 @@ mode = syslog ...@@ -1601,6 +1610,7 @@ mode = syslog
# The address of the socks5 proxy datasources should connect to # The address of the socks5 proxy datasources should connect to
; proxy_address = ; proxy_address =
; show_ui = true ; show_ui = true
; allow_insecure = false
################################## Feature Management ############################################## ################################## Feature Management ##############################################
[feature_management] [feature_management]
...@@ -1615,3 +1625,9 @@ mode = syslog ...@@ -1615,3 +1625,9 @@ mode = syslog
;hidden_toggles = ;hidden_toggles =
# Disable updating specific feature toggles in the feature management page # Disable updating specific feature toggles in the feature management page
;read_only_toggles = ;read_only_toggles =
#################################### Public Dashboards #####################################
[public_dashboards]
# Set to false to disable public dashboards
;enabled = true
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment