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

remove status label from histogram (#28387)

Browse Source 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit b036112444)
This commit is contained in:
Carl Bergquist
2020-10-22 12:47:29 +02:00
committed by Arve Knudsen
parent 983d6c8ef8
commit df2fda3f88
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/database_wrapper.go
+5 -5
View File
@@ -18,7 +18,7 @@ import (
var ( var (
databaseQueryCounter *prometheus.CounterVec databaseQueryCounter *prometheus.CounterVec
databaseQueryHistogram *prometheus.HistogramVec databaseQueryHistogram prometheus.Histogram
) )
func init() { func init() {
@@ -28,12 +28,12 @@ func init() {
Help: "The total amount of Database queries", Help: "The total amount of Database queries",
}, []string{"status"}) }, []string{"status"})
databaseQueryHistogram = prometheus.NewHistogramVec(prometheus.HistogramOpts{ databaseQueryHistogram = prometheus.NewHistogram(prometheus.HistogramOpts{
Namespace: "grafana", Namespace: "grafana",
Name: "database_queries_duration_seconds", Name: "database_queries_duration_seconds",
Help: "Database query histogram", Help: "Database query histogram",
Buckets: prometheus.ExponentialBuckets(0.0001, 4, 9), Buckets: prometheus.ExponentialBuckets(0.0001, 4, 9),
}, []string{"status"}) })
prometheus.MustRegister(databaseQueryCounter, databaseQueryHistogram) prometheus.MustRegister(databaseQueryCounter, databaseQueryHistogram)
} }
@@ -78,7 +78,7 @@ func (h *databaseQueryWrapper) After(ctx context.Context, query string, args ...
begin := ctx.Value(databaseQueryWrapperKey{}).(time.Time) begin := ctx.Value(databaseQueryWrapperKey{}).(time.Time)
elapsed := time.Since(begin) elapsed := time.Since(begin)
databaseQueryCounter.WithLabelValues("success").Inc() databaseQueryCounter.WithLabelValues("success").Inc()
databaseQueryHistogram.WithLabelValues("success").Observe(elapsed.Seconds()) databaseQueryHistogram.Observe(elapsed.Seconds())
h.log.Debug("query finished", "status", "success", "elapsed time", elapsed, "sql", query) h.log.Debug("query finished", "status", "success", "elapsed time", elapsed, "sql", query)
return ctx, nil return ctx, nil
} }
@@ -94,7 +94,7 @@ func (h *databaseQueryWrapper) OnError(ctx context.Context, err error, query str
begin := ctx.Value(databaseQueryWrapperKey{}).(time.Time) begin := ctx.Value(databaseQueryWrapperKey{}).(time.Time)
elapsed := time.Since(begin) elapsed := time.Since(begin)
databaseQueryCounter.WithLabelValues(status).Inc() databaseQueryCounter.WithLabelValues(status).Inc()
databaseQueryHistogram.WithLabelValues(status).Observe(elapsed.Seconds()) databaseQueryHistogram.Observe(elapsed.Seconds())
h.log.Debug("query finished", "status", status, "elapsed time", elapsed, "sql", query, "error", err) h.log.Debug("query finished", "status", status, "elapsed time", elapsed, "sql", query, "error", err)
return err return err
} }