From 7cbaf060970413f48db3672776e00c3a396c03f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 3 Jun 2016 21:22:34 +0200 Subject: [PATCH] feat(instrumentation): check if enabled in http api metrics route --- pkg/api/metrics.go | 5 +++++ pkg/metrics/settings.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go index 750cd8a3e25..35359d57cdd 100644 --- a/pkg/api/metrics.go +++ b/pkg/api/metrics.go @@ -9,6 +9,7 @@ import ( "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/metrics" "github.com/grafana/grafana/pkg/middleware" + "github.com/grafana/grafana/pkg/util" ) func GetTestMetrics(c *middleware.Context) { @@ -40,6 +41,10 @@ func GetTestMetrics(c *middleware.Context) { } func GetInternalMetrics(c *middleware.Context) Response { + if metrics.UseNilMetrics { + return Json(200, util.DynMap{"message": "Metrics disabled"}) + } + snapshots := metrics.MetricStats.GetSnapshots() resp := make(map[string]interface{}) diff --git a/pkg/metrics/settings.go b/pkg/metrics/settings.go index d2cb3bbbebe..749eb8dda91 100644 --- a/pkg/metrics/settings.go +++ b/pkg/metrics/settings.go @@ -38,7 +38,7 @@ func readSettings() *MetricSettings { if graphitePublisher, err := CreateGraphitePublisher(); err != nil { log.Error(3, "Metrics: Failed to init Graphite metric publisher", err) } else if graphitePublisher != nil { - log.Info("Metrics: Internal metrics publisher Graphite initialized") + log.Info("Metrics: Graphite publisher initialized") settings.Publishers = append(settings.Publishers, graphitePublisher) }