From 249bb02e25221da2ce087a864fe2c9ddcae79a6f Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Tue, 30 Jan 2024 16:01:10 +0000
Subject: [PATCH] Adapt backup dashboad Loki queries for new software versions
---
.../server/grafana-dashboards/backups.json | 139 +++++++++++++-----
1 file changed, 105 insertions(+), 34 deletions(-)
diff --git a/nixos/modules/monitoring/server/grafana-dashboards/backups.json b/nixos/modules/monitoring/server/grafana-dashboards/backups.json
index e2387e1f..63487881 100644
--- a/nixos/modules/monitoring/server/grafana-dashboards/backups.json
+++ b/nixos/modules/monitoring/server/grafana-dashboards/backups.json
@@ -3,7 +3,10 @@
"list": [
{
"builtIn": 1,
- "datasource": "-- Grafana --",
+ "datasource": {
+ "type": "datasource",
+ "uid": "grafana"
+ },
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
@@ -22,12 +25,15 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
- "id": 54,
"links": [],
"liveNow": false,
"panels": [
{
"collapsed": false,
+ "datasource": {
+ "type": "prometheus",
+ "uid": "LocalPrometheus"
+ },
"gridPos": {
"h": 1,
"w": 24,
@@ -36,6 +42,15 @@
},
"id": 44,
"panels": [],
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "LocalPrometheus"
+ },
+ "refId": "A"
+ }
+ ],
"title": "Customer ciphertext backup to Borgbase.com",
"type": "row"
},
@@ -75,6 +90,10 @@
"noDataState": "no_data",
"notifications": []
},
+ "datasource": {
+ "type": "prometheus",
+ "uid": "LocalPrometheus"
+ },
"description": "Daily backup job systemd timer unit state",
"fieldConfig": {
"defaults": {
@@ -82,6 +101,9 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
@@ -93,6 +115,7 @@
"tooltip": false,
"viz": false
},
+ "insertNulls": false,
"lineInterpolation": "stepAfter",
"lineWidth": 1,
"pointSize": 5,
@@ -153,7 +176,8 @@
"legend": {
"calcs": [],
"displayMode": "list",
- "placement": "bottom"
+ "placement": "bottom",
+ "showLegend": true
},
"tooltip": {
"mode": "multi",
@@ -234,6 +258,10 @@
"noDataState": "no_data",
"notifications": []
},
+ "datasource": {
+ "type": "prometheus",
+ "uid": "LocalPrometheus"
+ },
"description": "Monthly check-repo systemd timer unit state",
"fieldConfig": {
"defaults": {
@@ -241,6 +269,9 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
@@ -252,6 +283,7 @@
"tooltip": false,
"viz": false
},
+ "insertNulls": false,
"lineInterpolation": "stepAfter",
"lineWidth": 1,
"pointSize": 5,
@@ -309,7 +341,8 @@
"legend": {
"calcs": [],
"displayMode": "list",
- "placement": "bottom"
+ "placement": "bottom",
+ "showLegend": true
},
"tooltip": {
"mode": "multi",
@@ -391,6 +424,10 @@
"noDataState": "no_data",
"notifications": []
},
+ "datasource": {
+ "type": "prometheus",
+ "uid": "LocalPrometheus"
+ },
"description": "This shows the last triggering of the borgbackup-job-daily.timer systemd unit.",
"fieldConfig": {
"defaults": {
@@ -398,6 +435,9 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
@@ -409,6 +449,7 @@
"tooltip": false,
"viz": false
},
+ "insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
@@ -453,8 +494,9 @@
"options": {
"legend": {
"calcs": [],
- "displayMode": "hidden",
- "placement": "bottom"
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": false
},
"tooltip": {
"mode": "multi",
@@ -524,6 +566,10 @@
"noDataState": "no_data",
"notifications": []
},
+ "datasource": {
+ "type": "prometheus",
+ "uid": "LocalPrometheus"
+ },
"description": "This shows the last triggering of the borgbackup-job-daily.timer systemd unit.",
"fieldConfig": {
"defaults": {
@@ -531,6 +577,9 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
@@ -542,6 +591,7 @@
"tooltip": false,
"viz": false
},
+ "insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
@@ -588,8 +638,9 @@
"options": {
"legend": {
"calcs": [],
- "displayMode": "hidden",
- "placement": "bottom"
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": false
},
"tooltip": {
"mode": "single",
@@ -659,6 +710,10 @@
"noDataState": "no_data",
"notifications": []
},
+ "datasource": {
+ "type": "prometheus",
+ "uid": "LocalPrometheus"
+ },
"description": "When was the systemd unit active?",
"fieldConfig": {
"defaults": {
@@ -666,6 +721,9 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "left",
"barAlignment": 0,
@@ -677,6 +735,7 @@
"tooltip": false,
"viz": false
},
+ "insertNulls": false,
"lineInterpolation": "stepAfter",
"lineStyle": {
"fill": "solid"
@@ -725,7 +784,8 @@
"legend": {
"calcs": [],
"displayMode": "list",
- "placement": "bottom"
+ "placement": "bottom",
+ "showLegend": true
},
"tooltip": {
"mode": "single",
@@ -793,6 +853,10 @@
"noDataState": "no_data",
"notifications": []
},
+ "datasource": {
+ "type": "prometheus",
+ "uid": "LocalPrometheus"
+ },
"description": "When was the systemd unit active?",
"fieldConfig": {
"defaults": {
@@ -800,6 +864,9 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "left",
"barAlignment": 0,
@@ -811,6 +878,7 @@
"tooltip": false,
"viz": false
},
+ "insertNulls": false,
"lineInterpolation": "stepAfter",
"lineStyle": {
"fill": "solid"
@@ -859,7 +927,8 @@
"legend": {
"calcs": [],
"displayMode": "list",
- "placement": "bottom"
+ "placement": "bottom",
+ "showLegend": true
},
"tooltip": {
"mode": "single",
@@ -902,6 +971,9 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"axisSoftMin": 0,
@@ -915,6 +987,9 @@
"lineWidth": 1,
"scaleDistribution": {
"type": "linear"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
}
},
"mappings": [],
@@ -949,11 +1024,13 @@
"options": {
"barRadius": 0,
"barWidth": 0.1,
+ "fullHighlight": false,
"groupWidth": 0.7,
"legend": {
"calcs": [],
- "displayMode": "hidden",
- "placement": "bottom"
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": false
},
"orientation": "auto",
"showValue": "auto",
@@ -973,6 +1050,7 @@
"type": "loki",
"uid": "LocalLoki"
},
+ "editorMode": "code",
"expr": "{unit=\"borgbackup-job-daily.service\"} |= \"duration\" | pattern \"<_>\\\"duration\\\": <duration>,\"",
"legendFormat": "{{host}}",
"queryType": "range",
@@ -982,12 +1060,9 @@
"title": "Daily backup job run time (as reported by borg)",
"transformations": [
{
- "id": "labelsToFields",
+ "id": "extractFields",
"options": {
- "keepLabels": [
- "duration",
- "host"
- ]
+ "source": "labels"
}
},
{
@@ -1001,10 +1076,6 @@
],
"fields": {}
}
- },
- {
- "id": "merge",
- "options": {}
}
],
"type": "barchart"
@@ -1020,6 +1091,9 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"axisSoftMin": 0,
@@ -1033,6 +1107,9 @@
"lineWidth": 1,
"scaleDistribution": {
"type": "linear"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
}
},
"mappings": [],
@@ -1059,11 +1136,13 @@
"options": {
"barRadius": 0,
"barWidth": 0.97,
+ "fullHighlight": false,
"groupWidth": 0.7,
"legend": {
"calcs": [],
"displayMode": "list",
- "placement": "bottom"
+ "placement": "bottom",
+ "showLegend": true
},
"orientation": "auto",
"showValue": "auto",
@@ -1072,6 +1151,7 @@
"mode": "single",
"sort": "none"
},
+ "xField": "host",
"xTickLabelRotation": 0,
"xTickLabelSpacing": 0
},
@@ -1101,13 +1181,9 @@
"title": "Backup set size",
"transformations": [
{
- "id": "labelsToFields",
+ "id": "extractFields",
"options": {
- "keepLabels": [
- "host",
- "unique_csize",
- "compressed_size"
- ]
+ "source": "labels"
}
},
{
@@ -1125,18 +1201,13 @@
],
"fields": {}
}
- },
- {
- "id": "merge",
- "options": {}
}
],
"type": "barchart"
}
],
"refresh": "5m",
- "schemaVersion": 35,
- "style": "dark",
+ "schemaVersion": 38,
"tags": [],
"templating": {
"list": []
--
GitLab