Merge branch 'v3.1.x'

Conflicts: conf/defaults.ini conf/sample.ini pkg/metrics/graphite.go pkg/metrics/graphite_test.go
2016-08-17 09:53:46 +02:00
parent 2b2b64865b 0951da9c89
commit f9b628ad0e
6 changed files with 52 additions and 20 deletions
@@ -356,9 +356,10 @@ enabled           = true
 interval_seconds  = 60

 # Send internal Grafana metrics to graphite
-; [metrics.graphite]
-; address = localhost:2003
-; prefix = service.grafana.%(instance_name)s.
+[metrics.graphite]
+# Enable by setting the address setting (ex localhost:2003)
+address =
+prefix = prod.grafana.%(instance_name)s.

 [grafana_net]
 url = https://grafana.net