public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into alerting

Browse Source 
Conflicts:
	conf/sample.ini
This commit is contained in:
Torkel Ödegaard
2016-08-17 10:03:33 +02:00
parent 434332f02d 6fae5a3b4e
commit 05697d5ecd
14 changed files with 119 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/installation/configuration.md
+1 -1
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.