improve dashboard
Build and Publish / go-binaries (push) Has been skipped
Build and Publish / container-images (push) Has been skipped
Build and Publish / helm-release (push) Successful in 15s
Build and Publish / check-chart (push) Successful in 12s

This commit is contained in:
2026-07-06 11:01:23 -04:00
parent 44d43b0ac8
commit f89e2be74b
2 changed files with 39 additions and 15 deletions
+1 -1
View File
@@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # 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. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # 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 # 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 # incremented each time you make changes to the application. Versions are not expected to
+38 -14
View File
@@ -1117,7 +1117,7 @@
}, },
{ {
"color": "#EAB839", "color": "#EAB839",
"value": 15 "value": 10
}, },
{ {
"color": "red", "color": "red",
@@ -1136,9 +1136,19 @@
"y": 23 "y": 23
}, },
"id": 34, "id": 34,
"interval": "1h",
"options": { "options": {
"minVizHeight": 75, "displayMode": "gradient",
"minVizWidth": 75, "legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": false
},
"maxVizHeight": 300,
"minVizHeight": 16,
"minVizWidth": 8,
"namePlacement": "auto",
"orientation": "auto", "orientation": "auto",
"reduceOptions": { "reduceOptions": {
"calcs": [ "calcs": [
@@ -1147,18 +1157,18 @@
"fields": "", "fields": "",
"values": false "values": false
}, },
"showThresholdLabels": false, "showUnfilled": true,
"showThresholdMarkers": true, "sizing": "auto",
"sizing": "auto" "valueMode": "color"
}, },
"pluginVersion": "12.3.1", "pluginVersion": "12.3.1",
"targets": [ "targets": [
{ {
"editorMode": "code", "editorMode": "code",
"exemplar": false, "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, "instant": true,
"legendFormat": "{{econet_friendly_name}}: 12h Usage", "legendFormat": "{{econet_friendly_name}}: 6h Usage",
"range": false, "range": false,
"refId": "A" "refId": "A"
}, },
@@ -1169,7 +1179,7 @@
}, },
"editorMode": "code", "editorMode": "code",
"exemplar": false, "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, "hide": false,
"instant": true, "instant": true,
"legendFormat": "{{econet_friendly_name}}: 24h Usage", "legendFormat": "{{econet_friendly_name}}: 24h Usage",
@@ -1183,7 +1193,7 @@
}, },
"editorMode": "code", "editorMode": "code",
"exemplar": false, "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, "hide": false,
"instant": true, "instant": true,
"legendFormat": "{{econet_friendly_name}}: 2d Usage", "legendFormat": "{{econet_friendly_name}}: 2d Usage",
@@ -1197,7 +1207,7 @@
}, },
"editorMode": "code", "editorMode": "code",
"exemplar": false, "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, "hide": false,
"instant": true, "instant": true,
"legendFormat": "{{econet_friendly_name}}: 7d Usage", "legendFormat": "{{econet_friendly_name}}: 7d Usage",
@@ -1211,16 +1221,30 @@
}, },
"editorMode": "code", "editorMode": "code",
"exemplar": false, "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, "hide": false,
"instant": true, "instant": true,
"legendFormat": "{{econet_friendly_name}}: 30d Usage", "legendFormat": "{{econet_friendly_name}}: 30d Usage",
"range": false, "range": false,
"refId": "E" "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", "title": "Energy Usage Rollups",
"type": "gauge" "type": "bargauge"
}, },
{ {
"datasource": { "datasource": {
@@ -1895,5 +1919,5 @@
"timezone": "", "timezone": "",
"title": "EcoNet Water Heater", "title": "EcoNet Water Heater",
"uid": "econet-exporter", "uid": "econet-exporter",
"version": 2 "version": 3
} }