From dd31a2c26d2c96d6f0466b9497a38436d6d4662e Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Tue, 16 Aug 2022 21:33:44 +0200
Subject: [PATCH] grafana: update grafana config file

---
 roles/grafana/templates/grafana.ini.j2 | 38 +++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/roles/grafana/templates/grafana.ini.j2 b/roles/grafana/templates/grafana.ini.j2
index 48f096954..0517a3ce1 100644
--- a/roles/grafana/templates/grafana.ini.j2
+++ b/roles/grafana/templates/grafana.ini.j2
@@ -209,7 +209,7 @@ reporting_enabled = false
 # for new versions of grafana. The check is used
 # in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to http://grafana.com to get latest versions
+# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
 check_for_updates = false
 
 # Set to false to disable all checks to https://grafana.com
@@ -312,6 +312,12 @@ strict_transport_security_max_age_seconds = 86400
 # 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.
@@ -378,6 +384,9 @@ 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 =
 
@@ -439,6 +448,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
@@ -635,8 +647,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]
@@ -721,6 +731,9 @@ mode = syslog
 # 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 =
 
@@ -736,6 +749,18 @@ mode = syslog
 # 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
@@ -832,10 +857,15 @@ enabled = 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
-enabled = false
+;enabled = false
 
 # Makes it possible to turn off alert execution but alerting UI is visible
 ;execute_alerts = true
-- 
GitLab