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

feat(instrumentation): check if enabled in http api metrics route

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-06-03 21:22:34 +02:00
parent 1059a35bbc
commit 7cbaf06097
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/metrics.go
View File

@ -9,6 +9,7 @@ import (
"github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/metrics" "github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/util"
) )
func GetTestMetrics(c *middleware.Context) { func GetTestMetrics(c *middleware.Context) {
@ -40,6 +41,10 @@ func GetTestMetrics(c *middleware.Context) {
} }
func GetInternalMetrics(c *middleware.Context) Response { func GetInternalMetrics(c *middleware.Context) Response {
if metrics.UseNilMetrics {
return Json(200, util.DynMap{"message": "Metrics disabled"})
}
snapshots := metrics.MetricStats.GetSnapshots() snapshots := metrics.MetricStats.GetSnapshots()
resp := make(map[string]interface{}) resp := make(map[string]interface{})

2
pkg/metrics/settings.go
View File

@ -38,7 +38,7 @@ func readSettings() *MetricSettings {
if graphitePublisher, err := CreateGraphitePublisher(); err != nil { if graphitePublisher, err := CreateGraphitePublisher(); err != nil {
log.Error(3, "Metrics: Failed to init Graphite metric publisher", err) log.Error(3, "Metrics: Failed to init Graphite metric publisher", err)
} else if graphitePublisher != nil { } else if graphitePublisher != nil {
log.Info("Metrics: Internal metrics publisher Graphite initialized") log.Info("Metrics: Graphite publisher initialized")
settings.Publishers = append(settings.Publishers, graphitePublisher) settings.Publishers = append(settings.Publishers, graphitePublisher)
} }