Skip to content

Commit

Permalink
Merge pull request #430 from youzer-name/main
Browse files Browse the repository at this point in the history 
Update dashboard.json
  • Loading branch information
@jasonacox
jasonacox authored Feb 17, 2024
2 parents 7dd1297 + b878e8b commit ba52cbe
Show file tree
Hide file tree
Showing 5 changed files with 298 additions and 7 deletions.
6 changes: 6 additions & 0 deletions RELEASE.md
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.1
4.0.2
0 dashboards/dashboard-new.json → dashboards/dashboard-alt.json
View file
File renamed without changes.
295 changes: 290 additions & 5 deletions dashboards/dashboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"type": "linear"
},
"showPoints": "never",
"spanNulls": true,
"spanNulls": 3600000,
"stacking": {
"group": "A",
"mode": "none"
Expand Down Expand Up @@ -7004,6 +7004,8 @@
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"axisSoftMax": 15000,
"axisSoftMin": 0,
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
Expand All @@ -7020,7 +7022,7 @@
"type": "linear"
},
"showPoints": "never",
"spanNulls": true,
"spanNulls": 3600000,
"stacking": {
"group": "A",
"mode": "none"
Expand Down Expand Up @@ -7066,6 +7068,17 @@
],
"fill": "dash"
}
},
{
"id": "custom.axisPlacement",
"value": "right"
},
{
"id": "custom.stacking",
"value": {
"group": "A",
"mode": "normal"
}
}
]
},
Expand Down Expand Up @@ -8253,7 +8266,7 @@
"type": "linear"
},
"showPoints": "never",
"spanNulls": true,
"spanNulls": 3600000,
"stacking": {
"group": "A",
"mode": "none"
Expand Down Expand Up @@ -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
}
]
}
]
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -9114,7 +9286,7 @@
"type": "linear"
},
"showPoints": "never",
"spanNulls": true,
"spanNulls": 3600000,
"stacking": {
"group": "A",
"mode": "none"
Expand Down Expand Up @@ -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
}
}
]
}
]
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -12297,6 +12582,6 @@
"timezone": "${VAR_TZ}",
"title": "Powerwall - Power Flow",
"uid": "RSabAvRRzZ",
"version": 52,
"version": 54,
"weekStart": ""
}
2 changes: 1 addition & 1 deletion upgrade.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit ba52cbe

Please sign in to comment.