Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Commit b0a963e

Browse files
committed
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 <[email protected]>
1 parent a628ad0 commit b0a963e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

docs/mixin/dashboards/promscale.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,7 +2274,7 @@
22742274
},
22752275
"editorMode": "code",
22762276
"exemplar": false,
2277-
"expr": "max(promscale_sql_database_worker_maintenance_job_long_running_total)",
2277+
"expr": "max(promscale_sql_database_worker_long_running_maintenance_jobs)",
22782278
"interval": "",
22792279
"legendFormat": "total",
22802280
"range": true,
@@ -2496,7 +2496,7 @@
24962496
},
24972497
"editorMode": "code",
24982498
"exemplar": false,
2499-
"expr": "max(promscale_sql_database_worker_maintenance_job_long_running_total)",
2499+
"expr": "max(promscale_sql_database_worker_long_running_maintenance_jobs)",
25002500
"interval": "",
25012501
"legendFormat": "total",
25022502
"range": true,
@@ -2670,7 +2670,7 @@
26702670
},
26712671
"editorMode": "code",
26722672
"exemplar": false,
2673-
"expr": "max(promscale_sql_database_worker_maintenance_job_locks_total)",
2673+
"expr": "max(promscale_sql_database_worker_maintenance_job_locks)",
26742674
"interval": "",
26752675
"legendFormat": "total",
26762676
"range": true,

pkg/pgmodel/metrics/database/metrics.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ var metrics = []metricQueryWrap{
242242
prometheus.GaugeOpts{
243243
Namespace: util.PromNamespace,
244244
Subsystem: "sql_database",
245-
Name: "worker_maintenance_job_locks_total",
245+
Name: "worker_maintenance_job_locks",
246246
Help: "Number of locks held by Promscale maintenance workers.",
247247
},
248248
),
@@ -319,7 +319,7 @@ var metrics = []metricQueryWrap{
319319
prometheus.GaugeOpts{
320320
Namespace: util.PromNamespace,
321321
Subsystem: "sql_database",
322-
Name: "worker_maintenance_job_long_running_total",
322+
Name: "worker_long_running_maintenance_jobs",
323323
Help: "Number of Promscale maintenance workers executing long running queries.",
324324
},
325325
),

0 commit comments

Comments
 (0)