@@ 126,7 126,7 @@ enable_gzip = true
# For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
;cache_mode = private
-# For "mysql" only if lockingMigration feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
+# For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
;locking_attempt_timeout_sec = 0
################################### Data sources #########################
@@ 308,6 308,12 @@ strict_transport_security = true
# Controls if old angular plugins are supported or not. This will be disabled by default in future release
;angular_support_enabled = true
+# List of additional allowed URLs to pass by the CSRF check, separated by spaces. Suggested when authentication comes from an IdP.
+;csrf_trusted_origins = example.com
+
+# List of allowed headers to be set by the user, separated by spaces. Suggested to use for if authentication lives behind reverse proxies.
+;csrf_additional_headers =
+
[security.encryption]
# Defines the time-to-live (TTL) for decrypted data encryption keys stored in memory (cache).
# Please note that small values may cause performance issues due to a high frequency decryption operations.
@@ 370,8 376,11 @@ allow_sign_up = false
# Default UI theme ("dark" or "light")
;default_theme = dark
+# Default locale (supported IETF language tag, such as en-US)
+;default_locale = en-US
+
# Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
-; home_page =
+;home_page =
# External user management, these options affect the organization users view
;external_manage_link_url =
@@ 431,6 440,9 @@ oauth_auto_login = true
# Set to true to enable verbose logging of SigV4 request signing
;sigv4_verbose_logging = false
+# Set to true to enable Azure authentication option for HTTP-based datasources.
+;azure_auth_enabled = false
+
#################################### Anonymous Auth ######################
[auth.anonymous]
# enable anonymous access
@@ 554,6 566,7 @@ role_attribute_strict = true
;tls_client_key =
;tls_client_ca =
;use_pkce = false
+;auth_style =
#################################### Basic Auth ##########################
[auth.basic]
@@ 625,8 638,6 @@ role_attribute_strict = true
#################################### Role-based Access Control ###########
[rbac]
-;enabled = true
-# If enabled, cache permissions in a in memory cache (Enterprise only)
;permission_cache = true
#################################### SMTP / Emailing ##########################
[smtp]
@@ 711,6 722,9 @@ role_attribute_strict = true
# Should Sentry javascript agent be initialized
;enabled = false
+# Defines which provider to use, default is Sentry
+;provider = sentry
+
# Sentry DSN if you want to send events to Sentry.
;sentry_dsn =
@@ 726,6 740,18 @@ role_attribute_strict = true
# Max requests accepted per short interval of time for Grafana backend log ingestion endpoint (/log).
;log_endpoint_burst_limit = 15
+# Should error instrumentation be enabled, only affects Grafana Javascript Agent
+;instrumentations_errors_enabled = true
+
+# Should console instrumentation be enabled, only affects Grafana Javascript Agent
+;instrumentations_console_enabled = false
+
+# Should webvitals instrumentation be enabled, only affects Grafana Javascript Agent
+;instrumentations_webvitals_enabled = false
+
+# Api Key, only applies to Grafana Javascript Agent provider
+;api_key = testApiKey
+
#################################### Usage Quotas ########################
[quota]
; enabled = false
@@ 822,6 848,11 @@ role_attribute_strict = true
# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
;min_interval = 10s
+[unified_alerting.reserved_labels]
+# Comma-separated list of reserved labels added by the Grafana Alerting engine that should be disabled.
+# For example: `disabled_labels=grafana_folder`
+;disabled_labels =
+
#################################### Alerting ############################
[alerting]
# Disable legacy alerting engine & UI features