Merge pull request #205 from jasonacox/max

Change graph queries from mean() to max()
jasonacox · Mar 11, 2023 · a7f577c · a7f577c
2 parents 838d557 + 504ff5c
commit a7f577c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,5 +1,10 @@
 # RELEASE NOTES
 
+## v2.8.7 - Preserve Peaks in Graphs
+
+* Update Live Monitoring graph queries for Dashboard to use `max()` instead of `mean()` for Solar, Home, Grid and Powerwall to preserve peaks across all time filters as raised in https://github.com/jasonacox/Powerwall-Dashboard/issues/203
+* Update pyPowerwall proxy service to v0.6.1 Proxy t24 (see https://github.com/jasonacox/pypowerwall/releases/tag/v0.6.1)
+
 ## v2.8.6 - Weather Updates
 
 * Weather411 v0.2.0 - Upgrade InfluxDB Client to support InfluxDB 1.8 and 2.x by @jasonacox in https://github.com/jasonacox/Powerwall-Dashboard/pull/196 closes https://github.com/jasonacox/Powerwall-Dashboard/issues/195 re: https://github.com/jasonacox/Powerwall-Dashboard/discussions/191#discussioncomment-5112333

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.8.6
+2.8.7
diff --git a/dashboard.json b/dashboard.json
@@ -628,7 +628,7 @@
               },
               {
                 "params": [],
-                "type": "mean"
+                "type": "max"
               }
             ]
           ],
@@ -664,7 +664,7 @@
               },
               {
                 "params": [],
-                "type": "mean"
+                "type": "max"
               }
             ]
           ],
@@ -688,7 +688,7 @@
           "measurement": "http",
           "orderByTime": "ASC",
           "policy": "autogen",
-          "query": "SELECT mean(from_pw) - mean(to_pw) FROM autogen.http WHERE $timeFilter GROUP BY time($__interval) ",
+          "query": "SELECT max(from_pw) - max(to_pw) FROM autogen.http WHERE $timeFilter GROUP BY time($__interval) ",
           "rawQuery": true,
           "refId": "C",
           "resultFormat": "time_series",
@@ -733,7 +733,7 @@
           "measurement": "http",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(from_grid) - mean(to_grid) FROM autogen.http WHERE $timeFilter GROUP BY time($__interval) ",
+          "query": "SELECT max(from_grid) - max(to_grid) FROM autogen.http WHERE $timeFilter GROUP BY time($__interval) ",
           "rawQuery": true,
           "refId": "D",
           "resultFormat": "time_series",
@@ -810,7 +810,9 @@
             "uid": "${DS_SUN_AND MOON}"
           },
           "refId": "F",
-          "target": "sun_altitude"
+          "target": [
+            "sun_altitude"
+          ]
         },
         {
           "alias": "Temperature",
@@ -5880,7 +5882,7 @@
               },
               {
                 "params": [],
-                "type": "mean"
+                "type": "max"
               }
             ]
           ],
@@ -5922,7 +5924,7 @@
               },
               {
                 "params": [],
-                "type": "mean"
+                "type": "max"
               }
             ]
           ],
@@ -5964,7 +5966,7 @@
               },
               {
                 "params": [],
-                "type": "mean"
+                "type": "max"
               }
             ]
           ],
@@ -6006,7 +6008,7 @@
               },
               {
                 "params": [],
-                "type": "mean"
+                "type": "max"
               }
             ]
           ],
@@ -9646,6 +9648,6 @@
   "timezone": "browser",
   "title": "Powerwall Power Flow",
   "uid": "RSabAvRRzV",
-  "version": 24,
+  "version": 31,
   "weekStart": ""
 }
diff --git a/upgrade.sh b/upgrade.sh
@@ -4,7 +4,7 @@
 set -e
 
 # Set Globals
-VERSION="2.8.6"
+VERSION="2.8.7"
 CURRENT="Unknown"
 COMPOSE_ENV_FILE="compose.env"
 TELEGRAF_LOCAL="telegraf.local"