diff --git a/RELEASE.md b/RELEASE.md index d984758b..22f7dab5 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,8 +1,14 @@ # RELEASE NOTES +## v4.0.5 - Dashboard Updates + +* Updated timezone variable in `dashboard.json` to tz:text to ensure the Time Zone string is output as-is. This will make upgrading Grafana easier later on and future-proof the variables by @s-crypt in #439. +* Removed $tz from any queries that do not have a GROUP BY statement by @s-crypt in #439. +* Updated pyPowerwall Proxy t42 - Adds Power Flow Animation style (set PW_STYLE="solar") for Solar-Only display. Removes the Powerwall image and related text to display a Grid + Solar + Home power flow animation. + ## v4.0.4 - Cloud Grid Status -* Update to pyPowerwall v0.7.9 - Bug fix to render correct grid status for Solar-Only systems on `cloud mode` (see https://github.com/jasonacox/Powerwall-Dashboard/issues/437) +* Update to pyPowerwall v0.7.9 - Bug fix to render correct grid status for Solar-Only systems on cloud mode (see #437) ## v4.0.3 - Cloud Mode Fixes diff --git a/VERSION b/VERSION index c5106e6d..7636e756 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.4 +4.0.5 diff --git a/dashboards/dashboard-alt.json b/dashboards/dashboard-alt.json index b9234b8f..1416092d 100644 --- a/dashboards/dashboard-alt.json +++ b/dashboards/dashboard-alt.json @@ -635,7 +635,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter ", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -728,7 +728,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Grid Usage", @@ -773,7 +773,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Charge", @@ -1084,7 +1084,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "default", - "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - integral(to_pw)/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM autogen.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - integral(to_pw)/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM autogen.http WHERE $timeFilter )", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1103,7 +1103,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Powerwall", @@ -1134,7 +1134,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Grid", @@ -1165,7 +1165,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Power Flow", @@ -1369,7 +1369,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "raw", - "query": "SELECT min(\"grid_status\") FROM \"grid\".\"http\" WHERE $timeFilter GROUP BY time($__interval) fill(previous) tz('$tz')", + "query": "SELECT min(\"grid_status\") FROM \"grid\".\"http\" WHERE $timeFilter GROUP BY time($__interval) fill(previous) tz('${tz:text}')", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1397,7 +1397,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT min(\"grid_status\") + 1 FROM \"grid\".\"http\" WHERE grid_status = 0 and $timeFilter GROUP BY time($__interval) fill(null) tz('$tz')", + "query": "SELECT min(\"grid_status\") + 1 FROM \"grid\".\"http\" WHERE grid_status = 0 and $timeFilter GROUP BY time($__interval) fill(null) tz('${tz:text}')", "rawQuery": true, "refId": "B", "resultFormat": "time_series" @@ -2406,7 +2406,7 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "query": "SELECT fp FROM (SELECT sum(\"from_pw\") * $avg_buy_per_kwh AS fp FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT fp FROM (SELECT sum(\"from_pw\") * $avg_buy_per_kwh AS fp FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "A", "resultFormat": "time_series" @@ -2418,7 +2418,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT s - (tp + tg) FROM (SELECT sum(\"solar\") * $avg_buy_per_kwh AS s, sum(\"to_pw\") * $avg_buy_per_kwh AS tp, sum(\"to_grid\") * $avg_buy_per_kwh AS tg FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT s - (tp + tg) FROM (SELECT sum(\"solar\") * $avg_buy_per_kwh AS s, sum(\"to_pw\") * $avg_buy_per_kwh AS tp, sum(\"to_grid\") * $avg_buy_per_kwh AS tg FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "B", "resultFormat": "time_series" @@ -2430,7 +2430,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT tgg FROM (SELECT sum(\"to_grid\") * $avg_sell_per_kwh AS tgg FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT tgg FROM (SELECT sum(\"to_grid\") * $avg_sell_per_kwh AS tgg FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "C", "resultFormat": "time_series" @@ -2442,7 +2442,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT tgg + (s - tp - tg ) + fp FROM (SELECT sum(\"to_pw\") * $avg_buy_per_kwh AS tp, sum(\"solar\") * $avg_buy_per_kwh AS s, sum(\"to_grid\") * $avg_buy_per_kwh AS tg, sum(\"from_pw\") * $avg_buy_per_kwh AS fp, sum(\"to_grid\") * $avg_sell_per_kwh AS tgg FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT tgg + (s - tp - tg ) + fp FROM (SELECT sum(\"to_pw\") * $avg_buy_per_kwh AS tp, sum(\"solar\") * $avg_buy_per_kwh AS s, sum(\"to_grid\") * $avg_buy_per_kwh AS tg, sum(\"from_pw\") * $avg_buy_per_kwh AS fp, sum(\"to_grid\") * $avg_sell_per_kwh AS tgg FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "D", "resultFormat": "time_series" @@ -2515,7 +2515,7 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - (integral(to_pw) - integral(grid_to_pw))/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM (SELECT from_solar, solar, to_pw, to_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter tz('$tz')))", + "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - (integral(to_pw) - integral(grid_to_pw))/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM (SELECT from_solar, solar, to_pw, to_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter ))", "rawQuery": true, "refId": "A", "resultFormat": "time_series" @@ -2531,7 +2531,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT integral(\"from_pw\") / 1000 / 3600 FROM \"autogen\".\"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT integral(\"from_pw\") / 1000 / 3600 FROM \"autogen\".\"http\" WHERE $timeFilter ", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -2556,7 +2556,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Grid", @@ -2569,7 +2569,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT (integral(from_grid) - integral(grid_to_pw))/1000/3600 AS from_grid FROM (SELECT from_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT (integral(from_grid) - integral(grid_to_pw))/1000/3600 AS from_grid FROM (SELECT from_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter )", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -2594,7 +2594,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Self-Powered", @@ -2949,7 +2949,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "timeFrom": "1M", @@ -3100,7 +3100,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" } ], "timeFrom": "1M", @@ -3245,7 +3245,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "timeFrom": "1M", @@ -3405,7 +3405,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "To Grid", @@ -3454,7 +3454,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "timeFrom": "1M", @@ -3632,7 +3632,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "kwh", - "query": "SELECT sum(\"home\") FROM \"kwh\".\"http\" WHERE (\"home\" > 0) GROUP BY time(1d) fill(null) tz('$tz')", + "query": "SELECT sum(\"home\") FROM \"kwh\".\"http\" WHERE (\"home\" > 0) GROUP BY time(1d) fill(null) tz('${tz:text}')", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -3682,7 +3682,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "kwh", - "query": "SELECT sum(\"solar\") FROM \"kwh\".\"http\" WHERE (\"solar\" > 0) GROUP BY time(1d) fill(0) tz('$tz')", + "query": "SELECT sum(\"solar\") FROM \"kwh\".\"http\" WHERE (\"solar\" > 0) GROUP BY time(1d) fill(0) tz('${tz:text}')", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -3715,7 +3715,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT sum(\"from_grid\") - sum(\"to_grid\") as \"grid\" FROM \"kwh\".\"http\" WHERE $timeFilter GROUP BY time(1d) fill(0) tz('$tz')", + "query": "SELECT sum(\"from_grid\") - sum(\"to_grid\") as \"grid\" FROM \"kwh\".\"http\" WHERE $timeFilter GROUP BY time(1d) fill(0) tz('${tz:text}')", "rawQuery": true, "refId": "C", "resultFormat": "time_series" diff --git a/dashboards/dashboard-min-mean-max.json b/dashboards/dashboard-min-mean-max.json index 5af17d67..ae75a759 100644 --- a/dashboards/dashboard-min-mean-max.json +++ b/dashboards/dashboard-min-mean-max.json @@ -1005,7 +1005,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter ", "rawQuery": false, "refId": "L", "resultFormat": "time_series", @@ -1043,7 +1043,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter ", "rawQuery": false, "refId": "M", "resultFormat": "time_series", @@ -1081,7 +1081,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter ", "rawQuery": false, "refId": "N", "resultFormat": "time_series", @@ -1119,7 +1119,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter ", "rawQuery": false, "refId": "O", "resultFormat": "time_series", @@ -1176,7 +1176,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Powerwall Min", @@ -1215,7 +1215,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Grid Usage Min", @@ -1260,7 +1260,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Grid Usage Max", @@ -1305,7 +1305,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Home Usage", @@ -1325,7 +1325,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter ", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -1418,7 +1418,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Grid Usage", @@ -1463,7 +1463,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Energy Usage", @@ -1504,7 +1504,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "default", - "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - integral(to_pw)/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM autogen.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - integral(to_pw)/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM autogen.http WHERE $timeFilter )", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1523,7 +1523,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Powerwall", @@ -1554,7 +1554,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Grid", @@ -1585,7 +1585,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Power Flow", @@ -1701,7 +1701,7 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "query": "SELECT min(\"grid_status\") FROM \"grid\".\"http\" WHERE $timeFilter GROUP BY time($__interval) tz('$tz')", + "query": "SELECT min(\"grid_status\") FROM \"grid\".\"http\" WHERE $timeFilter GROUP BY time($__interval) tz('${tz:text}')", "rawQuery": true, "refId": "A", "resultFormat": "time_series" @@ -2662,7 +2662,7 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "query": "SELECT fp FROM (SELECT sum(\"from_pw\") * $avg_per_kwh AS fp FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT fp FROM (SELECT sum(\"from_pw\") * $avg_per_kwh AS fp FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "A", "resultFormat": "time_series" @@ -2674,7 +2674,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT s - (tp + tg) FROM (SELECT sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"to_grid\") * $avg_per_kwh AS tg FROM kwh.http WHERE $timeFilter tz('$tz'))\n", + "query": "SELECT s - (tp + tg) FROM (SELECT sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"to_grid\") * $avg_per_kwh AS tg FROM kwh.http WHERE $timeFilter )\n", "rawQuery": true, "refId": "B", "resultFormat": "time_series" @@ -2686,7 +2686,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT tg FROM (SELECT sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_grid\") * $avg_per_kwh AS tg FROM kwh.http WHERE $timeFilter tz('$tz'))\n", + "query": "SELECT tg FROM (SELECT sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_grid\") * $avg_per_kwh AS tg FROM kwh.http WHERE $timeFilter )\n", "rawQuery": true, "refId": "C", "resultFormat": "time_series" @@ -2698,7 +2698,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT tg + (s - tp - tg ) + fp FROM (SELECT sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_grid\") * $avg_per_kwh AS tg, sum(\"from_pw\") * $avg_per_kwh AS fp FROM kwh.http WHERE $timeFilter tz('$tz'))\n", + "query": "SELECT tg + (s - tp - tg ) + fp FROM (SELECT sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_grid\") * $avg_per_kwh AS tg, sum(\"from_pw\") * $avg_per_kwh AS fp FROM kwh.http WHERE $timeFilter )\n", "rawQuery": true, "refId": "D", "resultFormat": "time_series" @@ -2799,7 +2799,7 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - (integral(to_pw) - integral(grid_to_pw))/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM (SELECT from_solar, solar, to_pw, to_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter tz('$tz')))", + "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - (integral(to_pw) - integral(grid_to_pw))/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM (SELECT from_solar, solar, to_pw, to_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter ))", "rawQuery": true, "refId": "A", "resultFormat": "time_series" @@ -2840,7 +2840,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Grid", @@ -2853,7 +2853,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT (integral(from_grid) - integral(grid_to_pw))/1000/3600 AS from_grid FROM (SELECT from_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT (integral(from_grid) - integral(grid_to_pw))/1000/3600 AS from_grid FROM (SELECT from_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter )", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -2878,7 +2878,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Self-Powered", @@ -3188,7 +3188,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -3323,7 +3323,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -3452,7 +3452,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -3589,7 +3589,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "To Grid", @@ -3638,7 +3638,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -3800,7 +3800,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Home", @@ -3849,7 +3849,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Grid", @@ -3875,7 +3875,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "kwh", - "query": "SELECT sum(\"from_grid\") - sum(\"to_grid\") as \"grid\" FROM \"kwh\".\"http\" WHERE $timeFilter GROUP BY time(1d) fill(0) tz('$tz')", + "query": "SELECT sum(\"from_grid\") - sum(\"to_grid\") as \"grid\" FROM \"kwh\".\"http\" WHERE $timeFilter GROUP BY time(1d) fill(0) tz('${tz:text}')", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -3900,7 +3900,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], diff --git a/dashboards/dashboard-no-animation.json b/dashboards/dashboard-no-animation.json index ed96141a..99a47a9a 100644 --- a/dashboards/dashboard-no-animation.json +++ b/dashboards/dashboard-no-animation.json @@ -622,7 +622,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter ", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -715,7 +715,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Grid Usage", @@ -760,7 +760,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Charge", @@ -1132,7 +1132,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Powerwall", @@ -1196,7 +1196,7 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - integral(to_pw)/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM autogen.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - integral(to_pw)/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM autogen.http WHERE $timeFilter )", "rawQuery": true, "refId": "A", "resultFormat": "time_series" @@ -1237,7 +1237,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Grid", @@ -1275,7 +1275,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Self-Powered", @@ -1358,7 +1358,7 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "query": "SELECT fp FROM (SELECT sum(\"from_pw\") * $avg_per_kwh AS fp FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT fp FROM (SELECT sum(\"from_pw\") * $avg_per_kwh AS fp FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "A", "resultFormat": "time_series" @@ -1370,7 +1370,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT s - (tp + tg) FROM (SELECT sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"to_grid\") * $avg_per_kwh AS tg FROM kwh.http WHERE $timeFilter tz('$tz'))\n", + "query": "SELECT s - (tp + tg) FROM (SELECT sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"to_grid\") * $avg_per_kwh AS tg FROM kwh.http WHERE $timeFilter )\n", "rawQuery": true, "refId": "B", "resultFormat": "time_series" @@ -1382,7 +1382,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT tg FROM (SELECT sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_grid\") * $avg_per_kwh AS tg FROM kwh.http WHERE $timeFilter tz('$tz'))\n", + "query": "SELECT tg FROM (SELECT sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_grid\") * $avg_per_kwh AS tg FROM kwh.http WHERE $timeFilter )\n", "rawQuery": true, "refId": "C", "resultFormat": "time_series" @@ -1394,7 +1394,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT tg + (s - tp - tg ) + fp FROM (SELECT sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_grid\") * $avg_per_kwh AS tg, sum(\"from_pw\") * $avg_per_kwh AS fp FROM kwh.http WHERE $timeFilter tz('$tz'))\n", + "query": "SELECT tg + (s - tp - tg ) + fp FROM (SELECT sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_grid\") * $avg_per_kwh AS tg, sum(\"from_pw\") * $avg_per_kwh AS fp FROM kwh.http WHERE $timeFilter )\n", "rawQuery": true, "refId": "D", "resultFormat": "time_series" @@ -1731,7 +1731,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Home Usage", @@ -1834,7 +1834,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "From Powerwall", @@ -1937,7 +1937,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "From Grid", @@ -2041,7 +2041,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Solar Energy", @@ -2144,7 +2144,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "To Powerwall", @@ -2247,7 +2247,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "To Grid", @@ -2359,7 +2359,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -2494,7 +2494,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -2623,7 +2623,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -2760,7 +2760,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "To Grid", @@ -2809,7 +2809,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -2961,7 +2961,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Home Usage", @@ -3010,7 +3010,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], diff --git a/dashboards/dashboard-simple.json b/dashboards/dashboard-simple.json index 6fcd5490..56468982 100644 --- a/dashboards/dashboard-simple.json +++ b/dashboards/dashboard-simple.json @@ -233,7 +233,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter ", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -252,7 +252,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Solar Energy", @@ -289,7 +289,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Powerwall", @@ -309,7 +309,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT mean(from_pw) - mean(to_pw) FROM autogen.http WHERE $timeFilter GROUP BY time(5m) tz('$tz')", + "query": "SELECT mean(from_pw) - mean(to_pw) FROM autogen.http WHERE $timeFilter GROUP BY time(5m) tz('${tz:text}')", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -328,7 +328,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Grid Usage", @@ -354,7 +354,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(from_grid) - mean(to_grid) FROM autogen.http WHERE $timeFilter GROUP BY time(5m) tz('$tz')", + "query": "SELECT mean(from_grid) - mean(to_grid) FROM autogen.http WHERE $timeFilter GROUP BY time(5m) tz('${tz:text}')", "rawQuery": true, "refId": "D", "resultFormat": "time_series", @@ -373,7 +373,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Charge", @@ -424,7 +424,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "datasource": { @@ -561,7 +561,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Powerwall", @@ -640,7 +640,7 @@ ], "orderByTime": "ASC", "policy": "default", - "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - integral(to_pw)/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM autogen.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - integral(to_pw)/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM autogen.http WHERE $timeFilter )", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -694,7 +694,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Grid", @@ -730,7 +730,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Self-powered", @@ -828,7 +828,7 @@ ], "orderByTime": "ASC", "policy": "default", - "query": "SELECT fp FROM (SELECT sum(\"from_pw\") * $avg_per_kwh AS fp FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT fp FROM (SELECT sum(\"from_pw\") * $avg_per_kwh AS fp FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -871,7 +871,7 @@ "hide": false, "orderByTime": "ASC", "policy": "default", - "query": "SELECT s - (tp + tg) FROM (SELECT sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"to_grid\") * $avg_per_kwh AS tg FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT s - (tp + tg) FROM (SELECT sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"to_grid\") * $avg_per_kwh AS tg FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -914,7 +914,7 @@ "hide": false, "orderByTime": "ASC", "policy": "default", - "query": "SELECT tg FROM (SELECT sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_grid\") * $avg_per_kwh AS tg FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT tg FROM (SELECT sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_grid\") * $avg_per_kwh AS tg FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -941,7 +941,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT tg + (s - tp - tg ) + fp FROM (SELECT sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_grid\") * $avg_per_kwh AS tg, sum(\"from_pw\") * $avg_per_kwh AS fp FROM kwh.http WHERE $timeFilter tz('$tz'))\n", + "query": "SELECT tg + (s - tp - tg ) + fp FROM (SELECT sum(\"to_pw\") * $avg_per_kwh AS tp, sum(\"solar\") * $avg_per_kwh AS s, sum(\"to_grid\") * $avg_per_kwh AS tg, sum(\"from_pw\") * $avg_per_kwh AS fp FROM kwh.http WHERE $timeFilter )\n", "rawQuery": true, "refId": "D", "resultFormat": "time_series" @@ -1275,7 +1275,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Home Usage", @@ -1378,7 +1378,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "From Powerwall", @@ -1481,7 +1481,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "From Grid", @@ -1584,7 +1584,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Solar Energy", @@ -1687,7 +1687,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "To Powerwall", @@ -1790,7 +1790,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "To Grid", @@ -1915,7 +1915,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -2048,7 +2048,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -2175,7 +2175,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -2309,7 +2309,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "To Grid", @@ -2358,7 +2358,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -2498,7 +2498,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], diff --git a/dashboards/dashboard-solar-only.json b/dashboards/dashboard-solar-only.json index d6785ad1..7dee8535 100644 --- a/dashboards/dashboard-solar-only.json +++ b/dashboards/dashboard-solar-only.json @@ -617,7 +617,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter ", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -716,7 +716,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "datasource": { @@ -933,7 +933,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "default", - "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - integral(to_pw)/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM autogen.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - integral(to_pw)/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM autogen.http WHERE $timeFilter )", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -952,7 +952,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Powerwall", @@ -983,7 +983,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Grid", @@ -1014,7 +1014,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Power Flow", @@ -1266,7 +1266,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "raw", - "query": "SELECT min(\"grid_status\") FROM \"grid\".\"http\" WHERE $timeFilter GROUP BY time($__interval) fill(previous) tz('$tz')", + "query": "SELECT min(\"grid_status\") FROM \"grid\".\"http\" WHERE $timeFilter GROUP BY time($__interval) fill(previous) tz('${tz:text}')", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1285,7 +1285,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "sync", @@ -1294,7 +1294,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT min(\"grid_status\") + 2 FROM \"grid\".\"http\" WHERE grid_status = -1 and $timeFilter GROUP BY time($__interval) fill(null) tz('$tz')", + "query": "SELECT min(\"grid_status\") + 2 FROM \"grid\".\"http\" WHERE grid_status = -1 and $timeFilter GROUP BY time($__interval) fill(null) tz('${tz:text}')", "rawQuery": true, "refId": "C", "resultFormat": "time_series" @@ -1306,7 +1306,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT min(\"grid_status\") + 1 FROM \"grid\".\"http\" WHERE grid_status = 0 and $timeFilter GROUP BY time($__interval) fill(null) tz('$tz')", + "query": "SELECT min(\"grid_status\") + 1 FROM \"grid\".\"http\" WHERE grid_status = 0 and $timeFilter GROUP BY time($__interval) fill(null) tz('${tz:text}')", "rawQuery": true, "refId": "B", "resultFormat": "time_series" @@ -2025,7 +2025,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": true, - "query": "SELECT fp FROM (SELECT sum(\"from_pw\") * $avg_buy_per_kwh AS fp FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT fp FROM (SELECT sum(\"from_pw\") * $avg_buy_per_kwh AS fp FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "A", "resultFormat": "time_series" @@ -2037,7 +2037,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT s - (tp + tg) FROM (SELECT sum(\"solar\") * $avg_buy_per_kwh AS s, sum(\"to_pw\") * $avg_buy_per_kwh AS tp, sum(\"to_grid\") * $avg_buy_per_kwh AS tg FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT s - (tp + tg) FROM (SELECT sum(\"solar\") * $avg_buy_per_kwh AS s, sum(\"to_pw\") * $avg_buy_per_kwh AS tp, sum(\"to_grid\") * $avg_buy_per_kwh AS tg FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "B", "resultFormat": "time_series" @@ -2049,7 +2049,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT tgg FROM (SELECT sum(\"to_grid\") * $avg_sell_per_kwh AS tgg FROM kwh.http WHERE $timeFilter tz('$tz'))\n", + "query": "SELECT tgg FROM (SELECT sum(\"to_grid\") * $avg_sell_per_kwh AS tgg FROM kwh.http WHERE $timeFilter )\n", "rawQuery": true, "refId": "C", "resultFormat": "time_series" @@ -2061,7 +2061,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT tgg + (s - tp - tg ) + fp FROM (SELECT sum(\"to_pw\") * $avg_buy_per_kwh AS tp, sum(\"solar\") * $avg_buy_per_kwh AS s, sum(\"to_grid\") * $avg_buy_per_kwh AS tg, sum(\"from_pw\") * $avg_buy_per_kwh AS fp, sum(\"to_grid\") * $avg_sell_per_kwh AS tgg FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT tgg + (s - tp - tg ) + fp FROM (SELECT sum(\"to_pw\") * $avg_buy_per_kwh AS tp, sum(\"solar\") * $avg_buy_per_kwh AS s, sum(\"to_grid\") * $avg_buy_per_kwh AS tg, sum(\"from_pw\") * $avg_buy_per_kwh AS fp, sum(\"to_grid\") * $avg_sell_per_kwh AS tgg FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "D", "resultFormat": "time_series" @@ -2162,7 +2162,7 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - (integral(to_pw) - integral(grid_to_pw))/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM (SELECT from_solar, solar, to_pw, to_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter tz('$tz')))", + "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - (integral(to_pw) - integral(grid_to_pw))/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM (SELECT from_solar, solar, to_pw, to_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter ))", "rawQuery": true, "refId": "A", "resultFormat": "time_series" @@ -2178,7 +2178,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT integral(\"from_pw\") / 1000 / 3600 FROM \"autogen\".\"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT integral(\"from_pw\") / 1000 / 3600 FROM \"autogen\".\"http\" WHERE $timeFilter ", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -2203,7 +2203,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Grid", @@ -2216,7 +2216,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT (integral(from_grid) - integral(grid_to_pw))/1000/3600 AS from_grid FROM (SELECT from_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT (integral(from_grid) - integral(grid_to_pw))/1000/3600 AS from_grid FROM (SELECT from_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter )", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -2241,7 +2241,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Self-Powered", @@ -2551,7 +2551,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -2686,7 +2686,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -2848,7 +2848,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Home", @@ -2897,7 +2897,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Grid", @@ -2923,7 +2923,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "kwh", - "query": "SELECT sum(\"from_grid\") - sum(\"to_grid\") as \"grid\" FROM \"kwh\".\"http\" WHERE $timeFilter GROUP BY time(1d) fill(0) tz('$tz')", + "query": "SELECT sum(\"from_grid\") - sum(\"to_grid\") as \"grid\" FROM \"kwh\".\"http\" WHERE $timeFilter GROUP BY time(1d) fill(0) tz('${tz:text}')", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -2948,7 +2948,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], @@ -3085,7 +3085,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "To Grid", @@ -3134,7 +3134,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "thresholds": [], diff --git a/dashboards/dashboard.json b/dashboards/dashboard.json index 8948e4e3..5407fd70 100644 --- a/dashboards/dashboard.json +++ b/dashboards/dashboard.json @@ -635,7 +635,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT \"mean_load_instant_power\" FROM \"http\" WHERE $timeFilter ", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -728,7 +728,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Grid Usage", @@ -773,7 +773,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "Charge", @@ -1084,7 +1084,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "default", - "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - integral(to_pw)/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM autogen.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - integral(to_pw)/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM autogen.http WHERE $timeFilter )", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1103,7 +1103,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Powerwall", @@ -1134,7 +1134,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Grid", @@ -1165,7 +1165,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Power Flow", @@ -1420,7 +1420,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "raw", - "query": "SELECT min(\"grid_status\") FROM \"grid\".\"http\" WHERE $timeFilter GROUP BY time($__interval) fill(previous) tz('$tz')", + "query": "SELECT min(\"grid_status\") FROM \"grid\".\"http\" WHERE $timeFilter GROUP BY time($__interval) fill(previous) tz('${tz:text}')", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1439,7 +1439,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "sync", @@ -1448,7 +1448,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT min(\"grid_status\") + 2 FROM \"grid\".\"http\" WHERE grid_status = -1 and $timeFilter GROUP BY time($__interval) fill(null) tz('$tz')", + "query": "SELECT min(\"grid_status\") + 2 FROM \"grid\".\"http\" WHERE grid_status = -1 and $timeFilter GROUP BY time($__interval) fill(null) tz('${tz:text}')", "rawQuery": true, "refId": "C", "resultFormat": "time_series" @@ -1460,7 +1460,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT min(\"grid_status\") + 1 FROM \"grid\".\"http\" WHERE grid_status = 0 and $timeFilter GROUP BY time($__interval) fill(null) tz('$tz')", + "query": "SELECT min(\"grid_status\") + 1 FROM \"grid\".\"http\" WHERE grid_status = 0 and $timeFilter GROUP BY time($__interval) fill(null) tz('${tz:text}')", "rawQuery": true, "refId": "B", "resultFormat": "time_series" @@ -2382,7 +2382,7 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "query": "SELECT fp FROM (SELECT sum(\"from_pw\") * $avg_buy_per_kwh AS fp FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT fp FROM (SELECT sum(\"from_pw\") * $avg_buy_per_kwh AS fp FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "A", "resultFormat": "time_series" @@ -2394,7 +2394,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT s - (tp + tg) FROM (SELECT sum(\"solar\") * $avg_buy_per_kwh AS s, sum(\"to_pw\") * $avg_buy_per_kwh AS tp, sum(\"to_grid\") * $avg_buy_per_kwh AS tg FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT s - (tp + tg) FROM (SELECT sum(\"solar\") * $avg_buy_per_kwh AS s, sum(\"to_pw\") * $avg_buy_per_kwh AS tp, sum(\"to_grid\") * $avg_buy_per_kwh AS tg FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "B", "resultFormat": "time_series" @@ -2406,7 +2406,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT tgg FROM (SELECT sum(\"to_grid\") * $avg_sell_per_kwh AS tgg FROM kwh.http WHERE $timeFilter tz('$tz'))\n", + "query": "SELECT tgg FROM (SELECT sum(\"to_grid\") * $avg_sell_per_kwh AS tgg FROM kwh.http WHERE $timeFilter )\n", "rawQuery": true, "refId": "C", "resultFormat": "time_series" @@ -2418,7 +2418,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT tgg + (s - tp - tg ) + fp FROM (SELECT sum(\"to_pw\") * $avg_buy_per_kwh AS tp, sum(\"solar\") * $avg_buy_per_kwh AS s, sum(\"to_grid\") * $avg_buy_per_kwh AS tg, sum(\"from_pw\") * $avg_buy_per_kwh AS fp, sum(\"to_grid\") * $avg_sell_per_kwh AS tgg FROM kwh.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT tgg + (s - tp - tg ) + fp FROM (SELECT sum(\"to_pw\") * $avg_buy_per_kwh AS tp, sum(\"solar\") * $avg_buy_per_kwh AS s, sum(\"to_grid\") * $avg_buy_per_kwh AS tg, sum(\"from_pw\") * $avg_buy_per_kwh AS fp, sum(\"to_grid\") * $avg_sell_per_kwh AS tgg FROM kwh.http WHERE $timeFilter )", "rawQuery": true, "refId": "D", "resultFormat": "time_series" @@ -2519,7 +2519,7 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - (integral(to_pw) - integral(grid_to_pw))/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM (SELECT from_solar, solar, to_pw, to_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter tz('$tz')))", + "query": "SELECT (1+from_solar/abs(from_solar))*from_solar/2 FROM (SELECT integral(solar)/1000/3600 - (integral(to_pw) - integral(grid_to_pw))/1000/3600 - integral(to_grid)/1000/3600 AS from_solar FROM (SELECT from_solar, solar, to_pw, to_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter ))", "rawQuery": true, "refId": "A", "resultFormat": "time_series" @@ -2535,7 +2535,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT integral(\"from_pw\") / 1000 / 3600 FROM \"autogen\".\"http\" WHERE $timeFilter tz('$tz')", + "query": "SELECT integral(\"from_pw\") / 1000 / 3600 FROM \"autogen\".\"http\" WHERE $timeFilter ", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -2560,7 +2560,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "From Grid", @@ -2573,7 +2573,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "autogen", - "query": "SELECT (integral(from_grid) - integral(grid_to_pw))/1000/3600 AS from_grid FROM (SELECT from_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter tz('$tz'))", + "query": "SELECT (integral(from_grid) - integral(grid_to_pw))/1000/3600 AS from_grid FROM (SELECT from_grid, ((from_grid - home - solar) + ABS((from_grid - home - solar))) / 2 AS grid_to_pw FROM autogen.http WHERE $timeFilter )", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -2598,7 +2598,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "title": "Self-Powered", @@ -2953,7 +2953,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "timeFrom": "1M", @@ -3104,7 +3104,7 @@ "value": "0" } ], - "tz": "$tz" + "tz": "${tz:text}" } ], "timeFrom": "1M", @@ -3249,7 +3249,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "timeFrom": "1M", @@ -3409,7 +3409,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" }, { "alias": "To Grid", @@ -3458,7 +3458,7 @@ ] ], "tags": [], - "tz": "$tz" + "tz": "${tz:text}" } ], "timeFrom": "1M", @@ -3660,7 +3660,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "kwh", - "query": "SELECT sum(\"home\") FROM \"kwh\".\"http\" WHERE (\"home\" > 0) GROUP BY time(1d) fill(null) tz('$tz')", + "query": "SELECT sum(\"home\") FROM \"kwh\".\"http\" WHERE (\"home\" > 0) GROUP BY time(1d) fill(null) tz('${tz:text}')", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -3710,7 +3710,7 @@ "measurement": "http", "orderByTime": "ASC", "policy": "kwh", - "query": "SELECT sum(\"solar\") FROM \"kwh\".\"http\" WHERE (\"solar\" > 0) GROUP BY time(1d) fill(null) tz('$tz')", + "query": "SELECT sum(\"solar\") FROM \"kwh\".\"http\" WHERE (\"solar\" > 0) GROUP BY time(1d) fill(null) tz('${tz:text}')", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -3743,7 +3743,7 @@ "uid": "${DS_INFLUXDB}" }, "hide": false, - "query": "SELECT sum(\"from_grid\") - sum(\"to_grid\") as \"grid\" FROM \"kwh\".\"http\" WHERE $timeFilter GROUP BY time(1d) fill(null) tz('$tz')", + "query": "SELECT sum(\"from_grid\") - sum(\"to_grid\") as \"grid\" FROM \"kwh\".\"http\" WHERE $timeFilter GROUP BY time(1d) fill(null) tz('${tz:text}')", "rawQuery": true, "refId": "C", "resultFormat": "time_series" diff --git a/powerwall.yml b/powerwall.yml index 53868130..b47fb443 100644 --- a/powerwall.yml +++ b/powerwall.yml @@ -20,7 +20,7 @@ services: - influxdb.env pypowerwall: - image: jasonacox/pypowerwall:0.7.9t41 + image: jasonacox/pypowerwall:0.7.9t42 container_name: pypowerwall hostname: pypowerwall restart: unless-stopped diff --git a/upgrade.sh b/upgrade.sh index a0252415..40f03149 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -6,7 +6,7 @@ set -e # Set Globals -VERSION="4.0.4" +VERSION="4.0.5" CURRENT="Unknown" COMPOSE_ENV_FILE="compose.env" INFLUXDB_ENV_FILE="influxdb.env"