replace zrepl_job_name with internal dashboard variable zrepl_replication_jobid

This makes the dashboard change not depend on the new
metric zrepl_daemon_job_up
This commit is contained in:
Christian Schwarz 2025-01-06 18:49:42 +00:00
parent 75d2071a52
commit 160e702043

View File

@ -330,7 +330,7 @@
"uid": "${DS_PROMETHEUS}" "uid": "${DS_PROMETHEUS}"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "sum(rate(zrepl_daemon_log_entries{job=\"$prom_job_name\",zrepl_job=~\"$zrepl_job_name\"}[$__rate_interval])) by (instance,zrepl_job)", "expr": "sum(rate(zrepl_daemon_log_entries{job=\"$prom_job_name\"}[$__rate_interval])) by (instance,zrepl_job)",
"format": "time_series", "format": "time_series",
"intervalFactor": 1, "intervalFactor": 1,
"range": true, "range": true,
@ -539,7 +539,7 @@
}, },
"editorMode": "code", "editorMode": "code",
"exemplar": false, "exemplar": false,
"expr": "sum by (instance,job,zrepl_job) (zrepl_replication_filesystem_errors{job=\"$prom_job_name\",zrepl_job=~\"$zrepl_job_name\"})", "expr": "sum by (instance,job,zrepl_job) (zrepl_replication_filesystem_errors{job=\"$prom_job_name\",zrepl_job=~\"$zrepl_replication_jobid\"})",
"format": "time_series", "format": "time_series",
"groupBy": [ "groupBy": [
{ {
@ -808,7 +808,7 @@
}, },
"editorMode": "code", "editorMode": "code",
"exemplar": false, "exemplar": false,
"expr": "increase(zrepl_zfs_list_unmatched_user_specified_dataset_count{job=\"$prom_job_name\",jobid=~\"$zrepl_job_name\"}[$__range])", "expr": "increase(zrepl_zfs_list_unmatched_user_specified_dataset_count{job=\"$prom_job_name\",jobid=~\"$zrepl_replication_jobid\"}[$__range])",
"format": "table", "format": "table",
"instant": true, "instant": true,
"interval": "", "interval": "",
@ -1039,7 +1039,7 @@
"uid": "${DS_PROMETHEUS}" "uid": "${DS_PROMETHEUS}"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "increase(zrepl_zfs_list_unmatched_user_specified_dataset_count{job=\"$prom_job_name\",jobid=\"$zrepl_job_name\"}[$__interval])", "expr": "increase(zrepl_zfs_list_unmatched_user_specified_dataset_count{job=\"$prom_job_name\",jobid=\"$zrepl_replication_jobid\"}[$__interval])",
"format": "time_series", "format": "time_series",
"legendFormat": "{{jobid}}", "legendFormat": "{{jobid}}",
"range": true, "range": true,
@ -1050,7 +1050,7 @@
"type": "heatmap" "type": "heatmap"
}, },
{ {
"collapsed": true, "collapsed": false,
"gridPos": { "gridPos": {
"h": 1, "h": 1,
"w": 24, "w": 24,
@ -1058,7 +1058,10 @@
"y": 34 "y": 34
}, },
"id": 59, "id": 59,
"panels": [ "panels": [],
"title": "Internals",
"type": "row"
},
{ {
"datasource": { "datasource": {
"type": "prometheus", "type": "prometheus",
@ -1108,7 +1111,8 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "green" "color": "green",
"value": null
}, },
{ {
"color": "red", "color": "red",
@ -1207,7 +1211,8 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "green" "color": "green",
"value": null
}, },
{ {
"color": "red", "color": "red",
@ -1303,7 +1308,8 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "green" "color": "green",
"value": null
}, },
{ {
"color": "red", "color": "red",
@ -1401,7 +1407,8 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "green" "color": "green",
"value": null
}, },
{ {
"color": "red", "color": "red",
@ -1498,7 +1505,8 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "green" "color": "green",
"value": null
}, },
{ {
"color": "red", "color": "red",
@ -1548,10 +1556,6 @@
"type": "timeseries" "type": "timeseries"
} }
], ],
"title": "Internals",
"type": "row"
}
],
"refresh": "5s", "refresh": "5s",
"schemaVersion": 40, "schemaVersion": 40,
"tags": [], "tags": [],
@ -1585,18 +1589,19 @@
"type": "prometheus", "type": "prometheus",
"uid": "${DS_PROMETHEUS}" "uid": "${DS_PROMETHEUS}"
}, },
"definition": "label_values(zrepl_daemon_job_up{job=\"$prom_job_name\", internal=\"false\"},zrepl_job)", "definition": "label_values(zrepl_replication_filesystem_errors{job=\"$prom_job_name\"},zrepl_job)",
"description": "multi-value variable of all replication job ids\n(implementation detail of the dashboard)",
"hide": 2,
"includeAll": true, "includeAll": true,
"label": "Zrepl Job Name",
"multi": true, "multi": true,
"name": "zrepl_job_name", "name": "zrepl_replication_jobid",
"options": [], "options": [],
"query": { "query": {
"qryType": 1, "qryType": 1,
"query": "label_values(zrepl_daemon_job_up{job=\"$prom_job_name\", internal=\"false\"},zrepl_job)", "query": "label_values(zrepl_replication_filesystem_errors{job=\"$prom_job_name\"},zrepl_job)",
"refId": "PrometheusVariableQueryEditor-VariableQuery" "refId": "PrometheusVariableQueryEditor-VariableQuery"
}, },
"refresh": 1, "refresh": 2,
"regex": "", "regex": "",
"sort": 1, "sort": 1,
"type": "query" "type": "query"
@ -1623,6 +1628,6 @@
"timezone": "", "timezone": "",
"title": "zrepl", "title": "zrepl",
"uid": "etQuvBnGz", "uid": "etQuvBnGz",
"version": 9, "version": 11,
"weekStart": "" "weekStart": ""
} }