From 72e26ec2dab92a51ee3d49486f52f466e722ef73 Mon Sep 17 00:00:00 2001 From: youzer-name <57046429+youzer-name@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:36:55 -0500 Subject: [PATCH 1/3] Update dashboard.json Stack powerwall current energy values in Powerwall Capacity panel. Add "Off Grid" indicators to the bottom of the Frequency and Voltages panels. Set all 3 panels "Connect null values" = "Threshold 1h" --- dashboards/dashboard.json | 293 +++++++++++++++++++++++++++++++++++++- 1 file changed, 289 insertions(+), 4 deletions(-) diff --git a/dashboards/dashboard.json b/dashboards/dashboard.json index 17ef84c3..dd1a0670 100644 --- a/dashboards/dashboard.json +++ b/dashboards/dashboard.json @@ -7004,6 +7004,8 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMax": 15000, + "axisSoftMin": 0, "barAlignment": 0, "drawStyle": "line", "fillOpacity": 0, @@ -7020,7 +7022,7 @@ "type": "linear" }, "showPoints": "never", - "spanNulls": true, + "spanNulls": 3600000, "stacking": { "group": "A", "mode": "none" @@ -7066,6 +7068,17 @@ ], "fill": "dash" } + }, + { + "id": "custom.axisPlacement", + "value": "right" + }, + { + "id": "custom.stacking", + "value": { + "group": "A", + "mode": "normal" + } } ] }, @@ -8253,7 +8266,7 @@ "type": "linear" }, "showPoints": "never", - "spanNulls": true, + "spanNulls": 3600000, "stacking": { "group": "A", "mode": "none" @@ -8294,6 +8307,55 @@ } } ] + }, + { + "matcher": { + "id": "byName", + "options": "Off Grid" + }, + "properties": [ + { + "id": "mappings", + "value": [ + { + "options": { + "1": { + "index": 0, + "text": "Off Grid" + } + }, + "type": "value" + } + ] + }, + { + "id": "custom.fillOpacity", + "value": 50 + }, + { + "id": "min", + "value": 0 + }, + { + "id": "max", + "value": 24 + }, + { + "id": "color", + "value": { + "fixedColor": "red", + "mode": "fixed" + } + }, + { + "id": "custom.axisPlacement", + "value": "hidden" + }, + { + "id": "custom.lineWidth", + "value": 0 + } + ] } ] }, @@ -9076,6 +9138,116 @@ ] ], "tags": [] + }, + { + "alias": "Off Grid", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB}" + }, + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "http", + "orderByTime": "ASC", + "policy": "grid", + "query": "SELECT min(\"grid_status\") +1 FROM \"grid\".\"http\" WHERE (\"grid_status\" = 0) AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": true, + "refId": "S", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "grid_status" + ], + "type": "field" + }, + { + "params": [], + "type": "min" + }, + { + "params": [ + "+1" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "grid_status", + "operator": "=", + "value": "0" + } + ] + }, + { + "alias": "Off Grid", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB}" + }, + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "http", + "orderByTime": "ASC", + "policy": "grid", + "refId": "T", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "grid_status" + ], + "type": "field" + }, + { + "params": [], + "type": "min" + }, + { + "params": [ + "+1" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "grid_status", + "operator": "=", + "value": "0" + } + ] } ], "title": "Frequency", @@ -9114,7 +9286,7 @@ "type": "linear" }, "showPoints": "never", - "spanNulls": true, + "spanNulls": 3600000, "stacking": { "group": "A", "mode": "none" @@ -9152,6 +9324,63 @@ "value": "right" } ] + }, + { + "matcher": { + "id": "byName", + "options": "Grid Status" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 50 + }, + { + "id": "custom.axisPlacement", + "value": "hidden" + }, + { + "id": "min", + "value": 0 + }, + { + "id": "max", + "value": 24 + }, + { + "id": "color", + "value": { + "fixedColor": "red", + "mode": "fixed" + } + }, + { + "id": "custom.lineWidth", + "value": 0 + }, + { + "id": "mappings", + "value": [ + { + "options": { + "1": { + "index": 0, + "text": "Off Grid" + } + }, + "type": "value" + } + ] + }, + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": false, + "viz": false + } + } + ] } ] }, @@ -11167,6 +11396,62 @@ "rawQuery": true, "refId": "BB", "resultFormat": "time_series" + }, + { + "alias": "Grid Status", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB}" + }, + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "http", + "orderByTime": "ASC", + "policy": "grid", + "query": "SELECT min(\"grid_status\") +1 FROM \"grid\".\"http\" WHERE (\"grid_status\" = 0) AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": true, + "refId": "BC", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "grid_status" + ], + "type": "field" + }, + { + "params": [], + "type": "min" + }, + { + "params": [ + "+1" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "grid_status", + "operator": "=", + "value": "0" + } + ] } ], "title": "Voltages", @@ -12297,6 +12582,6 @@ "timezone": "${VAR_TZ}", "title": "Powerwall - Power Flow", "uid": "RSabAvRRzZ", - "version": 52, + "version": 53, "weekStart": "" } From 3c8a68ba135f14bf1ea3f32c639bc0181bbe3536 Mon Sep 17 00:00:00 2001 From: Jason Cox Date: Fri, 16 Feb 2024 20:36:52 -0800 Subject: [PATCH 2/3] Treat Energy Usage graph --- dashboards/dashboard.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dashboards/dashboard.json b/dashboards/dashboard.json index dd1a0670..8948e4e3 100644 --- a/dashboards/dashboard.json +++ b/dashboards/dashboard.json @@ -174,7 +174,7 @@ "type": "linear" }, "showPoints": "never", - "spanNulls": true, + "spanNulls": 3600000, "stacking": { "group": "A", "mode": "none" @@ -12582,6 +12582,6 @@ "timezone": "${VAR_TZ}", "title": "Powerwall - Power Flow", "uid": "RSabAvRRzZ", - "version": 53, + "version": 54, "weekStart": "" } From b878e8b51972bd50dd261d90dd06e3723b1f9275 Mon Sep 17 00:00:00 2001 From: Jason Cox Date: Fri, 16 Feb 2024 20:37:10 -0800 Subject: [PATCH 3/3] v4.0.2 --- RELEASE.md | 6 ++++++ VERSION | 2 +- dashboards/{dashboard-new.json => dashboard-alt.json} | 0 upgrade.sh | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) rename dashboards/{dashboard-new.json => dashboard-alt.json} (100%) diff --git a/RELEASE.md b/RELEASE.md index df5ede73..ed51612c 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,5 +1,11 @@ # RELEASE NOTES +## v4.0.2 - Dashboard Update + +* Update default `dashboard.json` to not connect null values over 1hr threshhold (corrctly representing data gaps) by @youzer-name in #430. +* Stack powerwall current energy values in Powerwall Capacity panel by @youzer-name in #430. +* Add "Off Grid" indicators to the bottom of the Frequency and Voltages panels by @youzer-name in #430. + ## v4.0.1 - Powerwall Voltages * Added CQs and updated `dashboard.json` to include voltages from battery block vitals by @mcbirse in https://github.com/jasonacox/Powerwall-Dashboard/pull/426. This addresses users no longer seeing Powerwall voltages in the dashboard with firmware 23.44.0 or later - See related https://github.com/jasonacox/Powerwall-Dashboard/discussions/109#discussioncomment-8263020 diff --git a/VERSION b/VERSION index 1454f6ed..4d54dadd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.1 +4.0.2 diff --git a/dashboards/dashboard-new.json b/dashboards/dashboard-alt.json similarity index 100% rename from dashboards/dashboard-new.json rename to dashboards/dashboard-alt.json diff --git a/upgrade.sh b/upgrade.sh index e7e013c5..bd8225c9 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -6,7 +6,7 @@ set -e # Set Globals -VERSION="4.0.1" +VERSION="4.0.2" CURRENT="Unknown" COMPOSE_ENV_FILE="compose.env" INFLUXDB_ENV_FILE="influxdb.env"