IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(metrics): add ending dot for graphite prefix

Browse Source
This commit is contained in:
bergquist 2016-08-12 08:06:54 +02:00
parent f07b2ac446
commit 2fa97427eb
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/defaults.ini
View File

@ -358,7 +358,7 @@ interval_seconds = 60
# Send internal Grafana metrics to graphite # Send internal Grafana metrics to graphite
; [metrics.graphite] ; [metrics.graphite]
; address = localhost:2003 ; address = localhost:2003
; prefix = service.grafana.%(instance_name)s ; prefix = service.grafana.%(instance_name)s.
[grafana_net] [grafana_net]
url = https://grafana.net url = https://grafana.net

2
conf/sample.ini
View File

@ -306,7 +306,7 @@ enabled = true
# Send internal metrics to Graphite # Send internal metrics to Graphite
; [metrics.graphite] ; [metrics.graphite]
; address = localhost:2003 ; address = localhost:2003
; prefix = service.grafana.%(instance_name)s ; prefix = service.grafana.%(instance_name)s.
#################################### Internal Grafana Metrics ########################## #################################### Internal Grafana Metrics ##########################
# Url used to to import dashboards directly from Grafana.net # Url used to to import dashboards directly from Grafana.net

2
pkg/metrics/graphite.go
View File

@ -33,7 +33,7 @@ func CreateGraphitePublisher() (*GraphitePublisher, error) {
prefix := graphiteSection.Key("prefix").Value() prefix := graphiteSection.Key("prefix").Value()
if prefix == "" { if prefix == "" {
prefix = "service.grafana.%(instance_name)s" prefix = "service.grafana.%(instance_name)s."
} }
publisher.prefix = strings.Replace(prefix, "%(instance_name)s", safeInstanceName, -1) publisher.prefix = strings.Replace(prefix, "%(instance_name)s", safeInstanceName, -1)

9
pkg/metrics/graphite_test.go
View File

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