From f89e2be74b2f27f8583427d29110db8acd55ca7b Mon Sep 17 00:00:00 2001 From: Ryan D McGuire Date: Mon, 6 Jul 2026 11:01:23 -0400 Subject: [PATCH] improve dashboard --- helm/Chart.yaml | 2 +- helm/dashboards/econet-exporter.json | 52 ++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 310444e..e4e1f79 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.6 +version: 0.2.7 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/helm/dashboards/econet-exporter.json b/helm/dashboards/econet-exporter.json index 77a7c80..04ca9d7 100644 --- a/helm/dashboards/econet-exporter.json +++ b/helm/dashboards/econet-exporter.json @@ -1117,7 +1117,7 @@ }, { "color": "#EAB839", - "value": 15 + "value": 10 }, { "color": "red", @@ -1136,9 +1136,19 @@ "y": 23 }, "id": 34, + "interval": "1h", "options": { - "minVizHeight": 75, - "minVizWidth": 75, + "displayMode": "gradient", + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": false + }, + "maxVizHeight": 300, + "minVizHeight": 16, + "minVizWidth": 8, + "namePlacement": "auto", "orientation": "auto", "reduceOptions": { "calcs": [ @@ -1147,18 +1157,18 @@ "fields": "", "values": false }, - "showThresholdLabels": false, - "showThresholdMarkers": true, - "sizing": "auto" + "showUnfilled": true, + "sizing": "auto", + "valueMode": "color" }, "pluginVersion": "12.3.1", "targets": [ { "editorMode": "code", "exemplar": false, - "expr": "sum by (econet_friendly_name) (\n increase(econet_energy_usage_kwh[12h]) \n * on(econet_serial) group_left(econet_friendly_name) \n econet_device_info{econet_friendly_name=~\"$device\"}\n)", + "expr": "sum by (econet_friendly_name) (\n increase(econet_energy_usage_kwh[6h]) \n * on(econet_serial) group_left(econet_friendly_name) \n (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)", "instant": true, - "legendFormat": "{{econet_friendly_name}}: 12h Usage", + "legendFormat": "{{econet_friendly_name}}: 6h Usage", "range": false, "refId": "A" }, @@ -1169,7 +1179,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (econet_friendly_name) (\n increase(econet_energy_usage_kwh[24h]) \n * on(econet_serial) group_left(econet_friendly_name) \n econet_device_info{econet_friendly_name=~\"$device\"}\n)", + "expr": "sum by (econet_friendly_name) (\n increase(econet_energy_usage_kwh[24h]) \n * on(econet_serial) group_left(econet_friendly_name) \n (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)", "hide": false, "instant": true, "legendFormat": "{{econet_friendly_name}}: 24h Usage", @@ -1183,7 +1193,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (econet_friendly_name) (\n increase(econet_energy_usage_kwh[2d]) \n * on(econet_serial) group_left(econet_friendly_name) \n econet_device_info{econet_friendly_name=~\"$device\"}\n)", + "expr": "sum by (econet_friendly_name) (\n increase(econet_energy_usage_kwh[2d]) \n * on(econet_serial) group_left(econet_friendly_name) \n (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)", "hide": false, "instant": true, "legendFormat": "{{econet_friendly_name}}: 2d Usage", @@ -1197,7 +1207,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (econet_friendly_name) (\n increase(econet_energy_usage_kwh[7d]) \n * on(econet_serial) group_left(econet_friendly_name) \n econet_device_info{econet_friendly_name=~\"$device\"}\n)", + "expr": "sum by (econet_friendly_name) (\n increase(econet_energy_usage_kwh[7d]) \n * on(econet_serial) group_left(econet_friendly_name) \n (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)", "hide": false, "instant": true, "legendFormat": "{{econet_friendly_name}}: 7d Usage", @@ -1211,16 +1221,30 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (econet_friendly_name) (\n increase(econet_energy_usage_kwh[30d]) \n * on(econet_serial) group_left(econet_friendly_name) \n econet_device_info{econet_friendly_name=~\"$device\"}\n)", + "expr": "sum by (econet_friendly_name) (\n increase(econet_energy_usage_kwh[30d]) \n * on(econet_serial) group_left(econet_friendly_name) \n (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)", "hide": false, "instant": true, "legendFormat": "{{econet_friendly_name}}: 30d Usage", "range": false, "refId": "E" + }, + { + "datasource": { + "type": "prometheus", + "uid": "000000003" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum by (econet_friendly_name) (\n increase(econet_energy_usage_kwh[12h]) \n * on(econet_serial) group_left(econet_friendly_name) \n (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)", + "hide": false, + "instant": true, + "legendFormat": "{{econet_friendly_name}}: 12h Usage", + "range": false, + "refId": "F" } ], "title": "Energy Usage Rollups", - "type": "gauge" + "type": "bargauge" }, { "datasource": { @@ -1895,5 +1919,5 @@ "timezone": "", "title": "EcoNet Water Heater", "uid": "econet-exporter", - "version": 2 + "version": 3 }