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

fix(metrics): make metrics cfg backwards compatible

Browse Source
This commit is contained in:
bergquist
2016-08-10 11:15:49 +02:00
parent c5d0c9f088
commit 03f0bc46a1
4 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/metrics/graphite.go
+6 -2
View File
@@ -30,9 +30,13 @@ func CreateGraphitePublisher() (*GraphitePublisher, error) {
publisher.address = graphiteSection.Key("address").MustString("localhost:2003")
safeInstanceName := strings.Replace(setting.InstanceName, ".", "_", -1)
prefix := graphiteSection.Key("prefix").MustString("service.grafana.%instance_name%")
prefix := graphiteSection.Key("prefix").Value()
publisher.prefix = strings.Replace(prefix, "%instance_name%", safeInstanceName, -1)
if prefix == "" {
prefix = "service.grafana.%(instance_name)s"
}
publisher.prefix = strings.Replace(prefix, "%(instance_name)s", safeInstanceName, -1)
return publisher, nil
}