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

Instrumentation: Removes invalid chars from label names (#27921)

Browse Source
This commit is contained in:
Carl Bergquist
2020-09-30 20:12:57 +02:00
committed by GitHub
parent e26b8636a9
commit 7b891d10ee
3 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/models/datasource_cache.go
View File

@@ -10,6 +10,7 @@ import (
"sync"
"time"
"github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/setting"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -72,7 +73,14 @@ type dataSourceTransport struct {
func instrumentRoundtrip(datasourceName string, next http.RoundTripper) promhttp.RoundTripperFunc {
return promhttp.RoundTripperFunc(func(r *http.Request) (*http.Response, error) {
datasourceLabel := prometheus.Labels{"datasource": datasourceName}
datasourceLabelName, err := metrics.SanitizeLabelName(datasourceName)
// if the datasource named cannot be turned into a prometheus
// label we will skip instrumenting these metrics.
if err != nil {
return next.RoundTrip(r)
}
datasourceLabel := prometheus.Labels{"datasource": datasourceLabelName}
requestCounter := datasourceRequestCounter.MustCurryWith(datasourceLabel)
requestSummary := datasourceRequestSummary.MustCurryWith(datasourceLabel)