merge with master

2016-09-28 13:02:15 +02:00
parent 248ed2672f 10e63e5dd2
commit 5ccdbf01fd
164 changed files with 7241 additions and 1917 deletions
@@ -161,7 +161,13 @@ external_enabled = true
 external_snapshot_url = https://snapshots-origin.raintank.io
 external_snapshot_name = Publish to snapshot.raintank.io

-#################################### Users ###############################
+# remove expired snapshot
+snapshot_remove_expired = true
+
+# remove snapshots after 90 days
+snapshot_TTL_days = 90
+
+#################################### Users ####################################
 [users]
 # disable user signup / registration
 allow_sign_up = true
@@ -276,7 +282,7 @@ from_address = admin@grafana.localhost
 welcome_email_on_sign_up = false
 templates_pattern = emails/*.html

-#################################### Logging #############################
+#################################### Logging ##########################
 [log]
 # Either "console", "file", "syslog". Default is console and  file
 # Use space to separate multiple modes, e.g. "console file"