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): restored prefix default to prod.grafana..

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-08-17 10:01:55 +02:00
parent 0951da9c89
commit 093563ac37
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/defaults.ini
View File

@ -350,13 +350,13 @@ global_session = -1
# Metrics available at HTTP API Url /api/metrics # Metrics available at HTTP API Url /api/metrics
[metrics] [metrics]
enabled = true enabled = true
interval_seconds = 60 interval_seconds = 10
# Send internal Grafana metrics to graphite # Send internal Grafana metrics to graphite
[metrics.graphite] [metrics.graphite]
# Enable by setting the address setting (ex localhost:2003) # Enable by setting the address setting (ex localhost:2003)
address = address =
prefix = service.grafana.%(instance_name)s. prefix = prod.grafana.%(instance_name)s.
[grafana_net] [grafana_net]
url = https://grafana.net url = https://grafana.net

10
conf/sample.ini
View File

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

2
docs/sources/installation/configuration.md
View File

@ -466,7 +466,7 @@ Enable metrics reporting. defaults true. Available via HTTP API `/api/metrics`.
### interval_seconds ### 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] ## [metrics.graphite]
Include this section if you want to send internal Grafana metrics to Graphite. Include this section if you want to send internal Grafana metrics to Graphite.

6
pkg/metrics/graphite_test.go
View File

@ -19,7 +19,7 @@ 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", "prod.grafana.%(instance_name)s.")
sec.NewKey("address", "localhost:2001") sec.NewKey("address", "localhost:2001")
So(err, ShouldBeNil) So(err, ShouldBeNil)
@ -30,7 +30,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, "prod.grafana.hostname_with_dots_com.")
So(publisher.address, ShouldEqual, "localhost:2001") So(publisher.address, ShouldEqual, "localhost:2001")
}) })
@ -53,7 +53,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, "prod.grafana.hostname_with_dots_com.")
So(publisher.address, ShouldEqual, "localhost:2001") So(publisher.address, ShouldEqual, "localhost:2001")
}) })