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 12, 2022 · c620e2d · c620e2d
1 parent 883b9ea
commit c620e2d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/docs/mixin/dashboards/promscale.json b/docs/mixin/dashboards/promscale.json
@@ -1774,7 +1774,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": true,
-          "expr": "1 - promscale_sql_database_health_check_errors_total / promscale_sql_database_health_check_total",
+          "expr": "1 - rate(promscale_sql_database_health_check_errors_total[$__rate_interval] / promscale_sql_database_health_check_total[$__rate_interval]",
           "interval": "",
           "legendFormat": "{{ instance }}",
           "refId": "A"
@@ -2274,7 +2274,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max(promscale_sql_database_worker_maintenance_job_long_running_total)",
+          "expr": "max(promscale_sql_database_worker_long_running_maintenance_jobs)",
           "interval": "",
           "legendFormat": "total",
           "range": true,
@@ -2496,7 +2496,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max(promscale_sql_database_worker_maintenance_job_long_running_total)",
+          "expr": "max(promscale_sql_database_worker_long_running_maintenance_jobs)",
           "interval": "",
           "legendFormat": "total",
           "range": true,
@@ -2670,7 +2670,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max(promscale_sql_database_worker_maintenance_job_locks_total)",
+          "expr": "max(promscale_sql_database_worker_maintenance_job_locks)",
           "interval": "",
           "legendFormat": "total",
           "range": true,
@@ -3392,4 +3392,4 @@
   "uid": "IcOe3VPnz",
   "version": 3,
   "weekStart": ""
-}
+}
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.",
 			},
 		),