Merge branch 'v3.1.x'

This commit is contained in:
Torkel Ödegaard 2016-08-17 10:02:08 +02:00
commit 6fae5a3b4e
2 changed files with 2 additions and 2 deletions

View File

@ -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]

View File

@ -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.