From d94b8ea85cfca6bb75aae3bca488f7a0e90b90b6 Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Sat, 8 Jul 2023 01:11:24 -0400
Subject: [PATCH] update zfs dashboard

---
 .../monitoring/zfs-exporter/dashboard.yaml    | 121 +++++++++++++++---
 1 file changed, 100 insertions(+), 21 deletions(-)

diff --git a/cluster/apps/monitoring/zfs-exporter/dashboard.yaml b/cluster/apps/monitoring/zfs-exporter/dashboard.yaml
index ae09d1d..9c14c39 100644
--- a/cluster/apps/monitoring/zfs-exporter/dashboard.yaml
+++ b/cluster/apps/monitoring/zfs-exporter/dashboard.yaml
@@ -30,7 +30,7 @@ data:
           "type": "grafana",
           "id": "grafana",
           "name": "Grafana",
-          "version": "9.4.7"
+          "version": "9.5.3"
         },
         {
           "type": "datasource",
@@ -140,7 +140,7 @@ data:
             "showThresholdLabels": false,
             "showThresholdMarkers": true
           },
-          "pluginVersion": "9.4.7",
+          "pluginVersion": "9.5.3",
           "targets": [
             {
               "datasource": {
@@ -182,7 +182,8 @@ data:
                     "value": 1
                   }
                 ]
-              }
+              },
+              "unit": "percentunit"
             },
             "overrides": []
           },
@@ -192,6 +193,74 @@ data:
             "x": 3,
             "y": 0
           },
+          "id": 22,
+          "options": {
+            "colorMode": "value",
+            "graphMode": "area",
+            "justifyMode": "auto",
+            "orientation": "auto",
+            "reduceOptions": {
+              "calcs": [
+                "lastNotNull"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "9.5.3",
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "${DS_VICTORIA}"
+              },
+              "editorMode": "code",
+              "exemplar": false,
+              "expr": "(zfs_capacity{device_name=\"$viewingPool\"} - zfs_available{device_name=\"$viewingPool\"}) / zfs_capacity{device_name=\"$viewingPool\"}",
+              "format": "time_series",
+              "instant": false,
+              "legendFormat": "__auto",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "Pool Errors",
+          "type": "stat"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_VICTORIA}"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "red",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 6,
+            "w": 2,
+            "x": 6,
+            "y": 0
+          },
           "id": 6,
           "options": {
             "colorMode": "value",
@@ -207,7 +276,7 @@ data:
             },
             "textMode": "auto"
           },
-          "pluginVersion": "9.4.7",
+          "pluginVersion": "9.5.3",
           "targets": [
             {
               "datasource": {
@@ -216,7 +285,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "sum(zfs_read_errors{device_type=\"pool\",device_name=~\"$viewingPool\"}) by (device_name)",
+              "expr": "sum(zfs_read_errors{device_type=\"pool\",device_name=~\"$viewingPool\"})",
               "format": "time_series",
               "instant": false,
               "legendFormat": "__auto",
@@ -256,11 +325,11 @@ data:
           },
           "gridPos": {
             "h": 6,
-            "w": 3,
-            "x": 6,
+            "w": 2,
+            "x": 8,
             "y": 0
           },
-          "id": 7,
+          "id": 23,
           "options": {
             "colorMode": "value",
             "graphMode": "area",
@@ -275,15 +344,18 @@ data:
             },
             "textMode": "auto"
           },
-          "pluginVersion": "9.4.7",
+          "pluginVersion": "9.5.3",
           "targets": [
             {
               "datasource": {
                 "type": "prometheus",
                 "uid": "${DS_VICTORIA}"
               },
-              "editorMode": "builder",
-              "expr": "zfs_write_errors{device_name=\"$viewingPool\", device_type=\"pool\"}",
+              "editorMode": "code",
+              "exemplar": false,
+              "expr": "sum(zfs_write_errors{device_name=\"$viewingPool\", device_type=\"pool\"})",
+              "format": "time_series",
+              "instant": false,
               "legendFormat": "__auto",
               "range": true,
               "refId": "A"
@@ -321,11 +393,11 @@ data:
           },
           "gridPos": {
             "h": 6,
-            "w": 3,
-            "x": 9,
+            "w": 2,
+            "x": 10,
             "y": 0
           },
-          "id": 17,
+          "id": 24,
           "options": {
             "colorMode": "value",
             "graphMode": "area",
@@ -340,15 +412,18 @@ data:
             },
             "textMode": "auto"
           },
-          "pluginVersion": "9.4.7",
+          "pluginVersion": "9.5.3",
           "targets": [
             {
               "datasource": {
                 "type": "prometheus",
                 "uid": "${DS_VICTORIA}"
               },
-              "editorMode": "builder",
-              "expr": "zfs_checksum_errors{device_name=\"$viewingPool\", device_type=\"pool\"}",
+              "editorMode": "code",
+              "exemplar": false,
+              "expr": "sum(zfs_checksum_errors{device_name=\"$viewingPool\", device_type=\"pool\"})",
+              "format": "time_series",
+              "instant": false,
               "legendFormat": "__auto",
               "range": true,
               "refId": "A"
@@ -421,7 +496,7 @@ data:
             },
             "textMode": "auto"
           },
-          "pluginVersion": "9.4.7",
+          "pluginVersion": "9.5.3",
           "targets": [
             {
               "datasource": {
@@ -524,8 +599,9 @@ data:
                 "type": "prometheus",
                 "uid": "${DS_VICTORIA}"
               },
-              "editorMode": "builder",
+              "editorMode": "code",
               "expr": "zfs_read_bandwidth{device_type=\"pool\", device_name=\"$viewingPool\"}",
+              "hide": false,
               "legendFormat": "{{device_name}}",
               "range": true,
               "refId": "A"
@@ -721,6 +797,7 @@ data:
           },
           "id": 2,
           "options": {
+            "cellHeight": "sm",
             "footer": {
               "countRows": false,
               "enablePagination": false,
@@ -733,7 +810,7 @@ data:
             "showHeader": true,
             "sortBy": []
           },
-          "pluginVersion": "9.4.7",
+          "pluginVersion": "9.5.3",
           "targets": [
             {
               "datasource": {
@@ -786,6 +863,8 @@ data:
                   "namespace": true,
                   "pod": true,
                   "pool": false,
+                  "prometheus": true,
+                  "prometheus_replica": true,
                   "service": true,
                   "vdev": true
                 },
@@ -1325,6 +1404,6 @@ data:
       "timezone": "",
       "title": "ZFS Dashboard",
       "uid": "2GaZi3hVk",
-      "version": 2,
+      "version": 1,
       "weekStart": ""
     }
\ No newline at end of file