fix(metrics): restored prefix default to prod.grafana..

conf/defaults.ini

@@ -350,13 +350,13 @@ 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]
 # Enable by setting the address setting (ex localhost:2003)
 address =
-prefix = service.grafana.%(instance_name)s.
+prefix = prod.grafana.%(instance_name)s.
 
 [grafana_net]
 url = https://grafana.net

conf/sample.ini

@@ -297,18 +297,18 @@ check_for_updates = true
 # Metrics available at HTTP API Url /api/metrics
 [metrics]
 # Disable / Enable internal metrics
-enabled           = true
+;enabled           = true
 
 # Publish interval
-interval_seconds  = 10
+;interval_seconds  = 10
 
 # Send internal metrics to Graphite
 [metrics.graphite]
 # Enable by setting the address setting (ex localhost:2003)
-address =
-prefix = service.grafana.%(instance_name)s.
+;address =
+;prefix = prod.grafana.%(instance_name)s.
 
 #################################### Internal Grafana Metrics ##########################
 # Url used to to import dashboards directly from Grafana.net
 [grafana_net]
-url = https://grafana.net
+;url = https://grafana.net

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.

pkg/metrics/graphite_test.go

@@ -19,7 +19,7 @@ func TestGraphitePublisher(t *testing.T) {
 		So(err, ShouldBeNil)
 
 		sec, err := setting.Cfg.NewSection("metrics.graphite")
-		sec.NewKey("prefix", "service.grafana.%(instance_name)s.")
+		sec.NewKey("prefix", "prod.grafana.%(instance_name)s.")
 		sec.NewKey("address", "localhost:2001")
 
 		So(err, ShouldBeNil)
@@ -30,7 +30,7 @@ func TestGraphitePublisher(t *testing.T) {
 		So(err, ShouldBeNil)
 		So(publisher, ShouldNotBeNil)
 
-		So(publisher.prefix, ShouldEqual, "service.grafana.hostname_with_dots_com.")
+		So(publisher.prefix, ShouldEqual, "prod.grafana.hostname_with_dots_com.")
 		So(publisher.address, ShouldEqual, "localhost:2001")
 	})
 
@@ -53,7 +53,7 @@ func TestGraphitePublisher(t *testing.T) {
 		So(err, ShouldBeNil)
 		So(publisher, ShouldNotBeNil)
 
-		So(publisher.prefix, ShouldEqual, "service.grafana.hostname_with_dots_com.")
+		So(publisher.prefix, ShouldEqual, "prod.grafana.hostname_with_dots_com.")
 		So(publisher.address, ShouldEqual, "localhost:2001")
 	})