Avoid using total suffix for gauge metrics and apply rate for counters

Latest mixtool linter which relies on grafana-linter pkg is failing when gauge metrics with name ending with `total`[1]. [1] https://github.com/grafana/dashboard-linter/blob/44d415fb6bdc4d8e6585e514c448174d4de1ff02/lint/rule_target_counter_agg.go#L30 Signed-off-by: Arunprasad Rajkumar <ar.arunprasad@gmail.com>
timescale · Oct 31, 2022 · b597f0e · b597f0e
1 parent 0606634
commit b597f0e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docs/mixin/dashboards/promscale.json b/docs/mixin/dashboards/promscale.json
@@ -2291,7 +2291,7 @@
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "max(promscale_sql_database_worker_maintenance_job_long_running_total{namespace=~\"$namespace\"})",
+              "expr": "max(promscale_sql_database_worker_long_running_maintenance_jobs{namespace=~\"$namespace\"})",
               "interval": "",
               "legendFormat": "total",
               "range": true,
@@ -2513,7 +2513,7 @@
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "max(promscale_sql_database_worker_maintenance_job_long_running_total{namespace=~\"$namespace\"})",
+              "expr": "max(promscale_sql_database_worker_long_running_maintenance_jobs{namespace=~\"$namespace\"})",
               "interval": "",
               "legendFormat": "total",
               "range": true,
@@ -2687,7 +2687,7 @@
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "max(promscale_sql_database_worker_maintenance_job_locks_total{namespace=~\"$namespace\"})",
+              "expr": "max(promscale_sql_database_worker_maintenance_job_locks{namespace=~\"$namespace\"})",
               "interval": "",
               "legendFormat": "total",
               "range": true,

diff --git a/pkg/pgmodel/metrics/database/metrics.go b/pkg/pgmodel/metrics/database/metrics.go
@@ -242,7 +242,7 @@ var metrics = []metricQueryWrap{
 			prometheus.GaugeOpts{
 				Namespace: util.PromNamespace,
 				Subsystem: "sql_database",
-				Name:      "worker_maintenance_job_locks_total",
+				Name:      "worker_maintenance_job_locks",
 				Help:      "Number of locks held by Promscale maintenance workers.",
 			},
 		),
@@ -319,7 +319,7 @@ var metrics = []metricQueryWrap{
 			prometheus.GaugeOpts{
 				Namespace: util.PromNamespace,
 				Subsystem: "sql_database",
-				Name:      "worker_maintenance_job_long_running_total",
+				Name:      "worker_long_running_maintenance_jobs",
 				Help:      "Number of Promscale maintenance workers executing long running queries.",
 			},
 		),