fix dashboard

This commit is contained in:
2026-07-05 20:53:39 -04:00
parent 307d31491e
commit b84cef01f4
2 changed files with 23 additions and 18 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.2 version: 0.2.3
# 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
+22 -17
View File
@@ -105,7 +105,8 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_connected{econet_friendly_name=~\"$device\"}", "expr": "max by (econet_friendly_name) (econet_connected{econet_friendly_name=~\"$device\"})",
"instant": true,
"legendFormat": "{{econet_friendly_name}}", "legendFormat": "{{econet_friendly_name}}",
"refId": "A" "refId": "A"
} }
@@ -146,9 +147,9 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_running{econet_friendly_name=~\"$device\"}", "expr": "max by (econet_friendly_name) (econet_running{econet_friendly_name=~\"$device\"})",
"instant": true, "instant": true,
"legendFormat": "{{econet_running_state}}", "legendFormat": "{{econet_friendly_name}}",
"refId": "A" "refId": "A"
} }
], ],
@@ -179,7 +180,8 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_mode{econet_friendly_name=~\"$device\"} == 1", "expr": "max by (econet_friendly_name, econet_mode) (econet_mode{econet_friendly_name=~\"$device\"}) == 1",
"instant": true,
"legendFormat": "{{econet_mode}}", "legendFormat": "{{econet_mode}}",
"refId": "A" "refId": "A"
} }
@@ -219,7 +221,8 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_setpoint_fahrenheit{econet_friendly_name=~\"$device\"}", "expr": "avg by (econet_friendly_name) (econet_setpoint_fahrenheit{econet_friendly_name=~\"$device\"})",
"instant": true,
"legendFormat": "{{econet_friendly_name}}", "legendFormat": "{{econet_friendly_name}}",
"refId": "A" "refId": "A"
} }
@@ -259,7 +262,8 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_hot_water_availability_percent{econet_friendly_name=~\"$device\"}", "expr": "avg by (econet_friendly_name) (econet_hot_water_availability_percent{econet_friendly_name=~\"$device\"})",
"instant": true,
"legendFormat": "{{econet_friendly_name}}", "legendFormat": "{{econet_friendly_name}}",
"refId": "A" "refId": "A"
} }
@@ -298,7 +302,8 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_alert_count{econet_friendly_name=~\"$device\"}", "expr": "max by (econet_friendly_name) (econet_alert_count{econet_friendly_name=~\"$device\"})",
"instant": true,
"legendFormat": "{{econet_friendly_name}}", "legendFormat": "{{econet_friendly_name}}",
"refId": "A" "refId": "A"
} }
@@ -361,19 +366,19 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_setpoint_fahrenheit{econet_friendly_name=~\"$device\"}", "expr": "avg by (econet_friendly_name) (econet_setpoint_fahrenheit{econet_friendly_name=~\"$device\"})",
"legendFormat": "{{econet_friendly_name}} setpoint", "legendFormat": "{{econet_friendly_name}} setpoint",
"refId": "A" "refId": "A"
}, },
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_setpoint_min_fahrenheit{econet_friendly_name=~\"$device\"}", "expr": "min by (econet_friendly_name) (econet_setpoint_min_fahrenheit{econet_friendly_name=~\"$device\"})",
"legendFormat": "{{econet_friendly_name}} min", "legendFormat": "{{econet_friendly_name}} min",
"refId": "B" "refId": "B"
}, },
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_setpoint_max_fahrenheit{econet_friendly_name=~\"$device\"}", "expr": "max by (econet_friendly_name) (econet_setpoint_max_fahrenheit{econet_friendly_name=~\"$device\"})",
"legendFormat": "{{econet_friendly_name}} max", "legendFormat": "{{econet_friendly_name}} max",
"refId": "C" "refId": "C"
} }
@@ -421,7 +426,7 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_hot_water_availability_percent{econet_friendly_name=~\"$device\"}", "expr": "avg by (econet_friendly_name) (econet_hot_water_availability_percent{econet_friendly_name=~\"$device\"})",
"legendFormat": "{{econet_friendly_name}}", "legendFormat": "{{econet_friendly_name}}",
"refId": "A" "refId": "A"
} }
@@ -475,7 +480,7 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_energy_usage_kwh * on(econet_serial) group_left(econet_friendly_name) econet_device_info{econet_friendly_name=~\"$device\"}", "expr": "max by (econet_friendly_name) (econet_energy_usage_kwh * on(econet_serial) group_left(econet_friendly_name) econet_device_info{econet_friendly_name=~\"$device\"})",
"legendFormat": "{{econet_friendly_name}}", "legendFormat": "{{econet_friendly_name}}",
"refId": "A" "refId": "A"
} }
@@ -521,7 +526,7 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_energy_cost_dollars * on(econet_serial) group_left(econet_friendly_name) econet_device_info{econet_friendly_name=~\"$device\"}", "expr": "max by (econet_friendly_name) (econet_energy_cost_dollars * on(econet_serial) group_left(econet_friendly_name) econet_device_info{econet_friendly_name=~\"$device\"})",
"legendFormat": "{{econet_friendly_name}}", "legendFormat": "{{econet_friendly_name}}",
"refId": "A" "refId": "A"
} }
@@ -567,7 +572,7 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_water_usage_gallons * on(econet_serial) group_left(econet_friendly_name) econet_device_info{econet_friendly_name=~\"$device\"}", "expr": "max by (econet_friendly_name) (econet_water_usage_gallons * on(econet_serial) group_left(econet_friendly_name) econet_device_info{econet_friendly_name=~\"$device\"})",
"legendFormat": "{{econet_friendly_name}}", "legendFormat": "{{econet_friendly_name}}",
"refId": "A" "refId": "A"
} }
@@ -616,8 +621,8 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_running{econet_friendly_name=~\"$device\"}", "expr": "max by (econet_friendly_name) (econet_running{econet_friendly_name=~\"$device\"})",
"legendFormat": "{{econet_friendly_name}} ({{econet_running_state}})", "legendFormat": "{{econet_friendly_name}}",
"refId": "A" "refId": "A"
} }
], ],
@@ -662,7 +667,7 @@
"targets": [ "targets": [
{ {
"datasource": { "type": "prometheus", "uid": "${datasource}" }, "datasource": { "type": "prometheus", "uid": "${datasource}" },
"expr": "econet_wifi_signal_db{econet_friendly_name=~\"$device\"}", "expr": "avg by (econet_friendly_name) (econet_wifi_signal_db{econet_friendly_name=~\"$device\"})",
"legendFormat": "{{econet_friendly_name}}", "legendFormat": "{{econet_friendly_name}}",
"refId": "A" "refId": "A"
} }