fix: make metric name consistent with rest of ory ecosystem (ory#1010)

JarekKa · Sep 13, 2022 · c3c5854 · c3c5854
1 parent 6504c0a
commit c3c5854
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/contrib/grafana/Oathkeeper-Dashboard.json b/contrib/grafana/Oathkeeper-Dashboard.json
@@ -345,25 +345,25 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.90, avg(rate(ory_oathkeeper_request_duration_seconds_bucket[5m])) by (le, instance))",
+          "expr": "histogram_quantile(0.90, avg(rate(ory_oathkeeper_requests_duration_seconds_bucket[5m])) by (le, instance))",
           "interval": "",
           "legendFormat": "{{ instance }} - p90",
           "refId": "A"
         },
         {
-          "expr": "histogram_quantile(0.95, avg(rate(ory_oathkeeper_request_duration_seconds_bucket[5m])) by (le, instance))",
+          "expr": "histogram_quantile(0.95, avg(rate(ory_oathkeeper_requests_duration_seconds_bucket[5m])) by (le, instance))",
           "interval": "",
           "legendFormat": "{{ instance }} - p95",
           "refId": "B"
         },
         {
-          "expr": "histogram_quantile(0.99, avg(rate(ory_oathkeeper_request_duration_seconds_bucket[5m])) by (le, instance))",
+          "expr": "histogram_quantile(0.99, avg(rate(ory_oathkeeper_requests_duration_seconds_bucket[5m])) by (le, instance))",
           "interval": "",
           "legendFormat": "{{ instance }} - p99",
           "refId": "C"
         },
         {
-          "expr": "histogram_quantile(1, avg(rate(ory_oathkeeper_request_duration_seconds_bucket[5m])) by (le, instance))",
+          "expr": "histogram_quantile(1, avg(rate(ory_oathkeeper_requests_duration_seconds_bucket[5m])) by (le, instance))",
           "interval": "",
           "legendFormat": "{{ instance }} - p100",
           "refId": "D"

diff --git a/metrics/prometheus.go b/metrics/prometheus.go
@@ -24,7 +24,7 @@ var (
 	// HistogramRequestDuration provides the duration of requests
 	HistogramRequestDuration = prometheus.NewHistogramVec(
 		prometheus.HistogramOpts{
-			Name:    "ory_oathkeeper_request_duration_seconds",
+			Name:    "ory_oathkeeper_requests_duration_seconds",
 			Help:    "Time spent serving requests.",
 			Buckets: prometheus.DefBuckets,
 		},
@@ -58,7 +58,7 @@ func NewConfigurablePrometheusRepository(d driver.Driver, logger *logrusx.Logger
 	)
 	HistogramRequestDuration = prometheus.NewHistogramVec(
 		prometheus.HistogramOpts{
-			Name:    d.Configuration().PrometheusMetricsNamePrefix() + "request_duration_seconds",
+			Name:    d.Configuration().PrometheusMetricsNamePrefix() + "requests_duration_seconds",
 			Help:    "Time spent serving requests.",
 			Buckets: prometheus.DefBuckets,
 		},