Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
hashworks
infrastructure
Commits
2e7cce76
Verified
Commit
2e7cce76
authored
Jul 02, 2022
by
Evangelos Foutras
🐱
Browse files
grafana: rebase grafana.ini to grafana 9.0.2-1
parent
08f87440
Changes
1
Hide whitespace changes
Inline
Side-by-side
roles/grafana/templates/grafana.ini.j2
View file @
2e7cce76
...
...
@@ -309,7 +309,7 @@ strict_transport_security_max_age_seconds = 86400
# $ROOT_PATH is server.root_url without the protocol.
;content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
# Controls if old angular plugins are supported or not. This will be disabled by default in
Grafana v9.
# Controls if old angular plugins are supported or not. This will be disabled by default in
future release
;angular_support_enabled = true
[security.encryption]
...
...
@@ -604,7 +604,7 @@ role_attribute_strict = true
# LDAP background sync (Enterprise only)
# At 1 am every day
;sync_cron = "0
0
1 * * *"
;sync_cron = "0 1 * * *"
;active_sync_enabled = true
#################################### AWS ###########################
...
...
@@ -633,6 +633,11 @@ role_attribute_strict = true
# Should be set for user-assigned identity and should be empty for system-assigned identity
;managed_identity_client_id =
#################################### Role-based Access Control ###########
[rbac]
;enabled = true
# If enabled, cache permissions in a in memory cache (Enterprise only)
;permission_cache = true
#################################### SMTP / Emailing ##########################
[smtp]
;enabled = false
...
...
@@ -908,7 +913,7 @@ enabled = false
#################################### Query History #############################
[query_history]
# Enable the Query history
;enabled =
fals
e
;enabled =
tru
e
#################################### Internal Grafana Metrics ##########################
# Metrics available at HTTP URL /metrics and /metrics/plugins/:pluginId
...
...
@@ -942,6 +947,7 @@ enabled = false
;url = https://grafana.com
#################################### Distributed tracing ############
# Opentracing is deprecated use opentelemetry instead
[tracing.jaeger]
# Enable by setting the address sending traces to jaeger (ex localhost:6831)
;address = localhost:6831
...
...
@@ -968,6 +974,15 @@ enabled = false
[tracing.opentelemetry.jaeger]
# jaeger destination (ex http://localhost:14268/api/traces)
; address = http://localhost:14268/api/traces
# Propagation specifies the text map propagation format: w3c, jaeger
; propagation = jaeger
# This is a configuration for OTLP exporter with GRPC protocol
[tracing.opentelemetry.otlp]
# otlp destination (ex localhost:4317)
; address = localhost:4317
# Propagation specifies the text map propagation format: w3c, jaeger
; propagation = w3c
#################################### External image storage ##########################
[external_image_storage]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment