Merge branch 'v3.1.x'

Author: torkelo

conf/defaults.ini

@@ -353,7 +353,7 @@ global_session = -1
 # Metrics available at HTTP API Url /api/metrics
 [metrics]
 enabled           = true
-interval_seconds  = 60
+interval_seconds  = 10
 
 # Send internal Grafana metrics to graphite
 [metrics.graphite]

docs/sources/installation/configuration.md

@@ -466,7 +466,7 @@ Enable metrics reporting. defaults true. Available via HTTP API `/api/metrics`.
 
 ### interval_seconds
 
-Flush/Write interval when sending metrics to external TSDB. Defaults to 60s.
+Flush/Write interval when sending metrics to external TSDB. Defaults to 10s.
 
 ## [metrics.graphite]
 Include this section if you want to send internal Grafana metrics to Graphite.