From badd9c094718e0609de0061b374a0b6f089d8401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorben=20G=C3=BCnther?= Date: Fri, 14 Oct 2022 13:00:05 +0200 Subject: [PATCH] grafana: Update config 9.2.0 release. --- roles/grafana/templates/grafana.ini.j2 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/roles/grafana/templates/grafana.ini.j2 b/roles/grafana/templates/grafana.ini.j2 index 2112f85..adc23f2 100644 --- a/roles/grafana/templates/grafana.ini.j2 +++ b/roles/grafana/templates/grafana.ini.j2 @@ -218,6 +218,9 @@ check_for_updates = false # Google Analytics universal tracking code, only enabled if you specify an id here ;google_analytics_ua_id = +# Google Analytics 4 tracking code, only enabled if you specify an id here +;google_analytics_4_id = + # Google Tag Manager ID, only enabled if you specify an id here ;google_tag_manager_id = @@ -247,6 +250,9 @@ disable_initial_admin_creation = true # default admin password, can be changed before first start of grafana, or in profile settings ;admin_password = admin +# default admin email, created on startup +;admin_email = admin@localhost + # used for signing secret_key = {{ grafana_secrets['secret_key'] }} @@ -606,8 +612,11 @@ role_attribute_strict = true ;cache_ttl = 60m ;expected_claims = {"aud": ["foo", "bar"]} ;key_file = /path/to/key/file +;role_attribute_path = +;role_attribute_strict = false ;auto_sign_up = false ;url_login = false +;allow_assign_grafana_admin = false #################################### Auth LDAP ########################## [auth.ldap] @@ -905,6 +914,10 @@ role_attribute_strict = true # Configures the batch size for the annotation clean-up job. This setting is used for dashboard, API, and alert annotations. ;cleanupjob_batchsize = 100 +# Enforces the maximum allowed length of the tags for any newly introduced annotations. It can be between 500 and 4096 inclusive (which is the respective's column length). Default value is 500. +# Setting it to a higher value would impact performance therefore is not recommended. +;tags_length = 500 + [annotations.dashboard] # Dashboard annotations means that annotations are associated with the dashboard they are created on. @@ -1002,6 +1015,10 @@ role_attribute_strict = true # Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure. ;disable_shared_zipkin_spans = false +[tracing.opentelemetry] +# attributes that will always be included in when creating new spans. ex (key1:value1,key2:value2) +;custom_attributes = key1:value1,key2:value2 + [tracing.opentelemetry.jaeger] # jaeger destination (ex http://localhost:14268/api/traces) ; address = http://localhost:14268/api/traces -- 2.44.0