Fixed issue with overriding default config values via command line

This commit is contained in:
Torkel Ödegaard
2015-04-10 10:58:32 +02:00
parent 4c6d7630cd
commit 2020fedfdb
10 changed files with 257 additions and 57 deletions
+19 -5
View File
@@ -96,10 +96,13 @@ google_analytics_ua_id =
[security]
# default admin user, created on startup
admin_user = admin
# default admin password, can be changed before first start of grafana, or in profile settings
admin_password = admin
# used for signing
secret_key = SW2YcwTIb9zpOOhoPsMm
# Auto-login remember days
login_remember_days = 7
cookie_username = grafana_user
@@ -109,10 +112,13 @@ cookie_remember_name = grafana_remember
[users]
# disable user signup / registration
allow_sign_up = true
# Allow non admin users to create organizations
allow_org_create = true
# Set to true to automatically assign new users to the default organization (id 1)
auto_assign_org = true
# Default role new users will be automatically assigned (if disabled above is set to true)
auto_assign_org_role = Viewer
@@ -120,8 +126,10 @@ auto_assign_org_role = Viewer
[auth.anonymous]
# enable anonymous access
enabled = false
# specify organization name that should be used for unauthenticated users
org_name = Main Org.
# specify role for unauthenticated users
org_role = Viewer
@@ -152,8 +160,10 @@ token_url = https://accounts.google.com/o/oauth2/token
# Either "console", "file", default is "console"
# Use comma to separate multiple modes, e.g. "console, file"
mode = console, file
# Buffer length of channel, keep it as it is if you don't know what it is.
buffer_len = 10000
# Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
level = Info
@@ -164,15 +174,19 @@ level =
# For "file" mode only
[log.file]
level =
; This enables automated log rotate(switch of following options), default is true
# This enables automated log rotate(switch of following options), default is true
log_rotate = true
; Max line number of single file, default is 1000000
# Max line number of single file, default is 1000000
max_lines = 1000000
; Max size shift of single file, default is 28 means 1 << 28, 256MB
# Max size shift of single file, default is 28 means 1 << 28, 256MB
max_lines_shift = 28
; Segment log daily, default is true
# Segment log daily, default is true
daily_rotate = true
; Expired days of log file(delete after max days), default is 7
# Expired days of log file(delete after max days), default is 7
max_days = 7
#################################### AMPQ Event Publisher ##########################