Resolve drive-details merge conflicts

teslamate-org · Feb 23, 2024 · f6471e1 · f6471e1
2 parents 446498e + fb52b47
commit f6471e1
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 27 deletions.
diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml
@@ -3,7 +3,7 @@ name: Publish Docker images
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 3 * * 0"
+    - cron: "0 3 * * *"
   push:
     tags:
       - "v*"
@@ -35,7 +35,7 @@ jobs:
 
   teslamate_build:
     needs: check_paths
-    if: needs.check_paths.outputs.githubfolder == 'false'
+    if: needs.check_paths.outputs.githubfolder == 'false' || github.event_name == 'schedule'
     strategy:
       fail-fast: false
       matrix:
@@ -71,7 +71,7 @@ jobs:
     needs:
       - check_paths
       - teslamate_build
-    if: needs.check_paths.outputs.githubfolder == 'false'
+    if: needs.check_paths.outputs.githubfolder == 'false' || github.event_name == 'schedule'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -92,7 +92,7 @@ jobs:
             type=edge
   grafana:
     needs: check_paths
-    if: needs.check_paths.outputs.githubfolder == 'false'
+    if: needs.check_paths.outputs.githubfolder == 'false' || github.event_name == 'schedule'
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,14 +4,29 @@
 
 ### New features
 
+- Add navigation active route drive state data (#3657 - @longzheng)
+
 ### Improvements and bug fixes
 
+- ci: prevent workflow runs for certain conditions and allow scheduled runs ([f71cc51](https://github.com/teslamate-org/teslamate/commit/f71cc51271007da70e7dc57c00e292acdf20e8d6) and [596a10f](https://github.com/teslamate-org/teslamate/commit/596a10f1eeb5c81f1f79293684a06241cc68d465) - @JakobLichterfeld)
+- feat: Upgrade web development framework to Phoenix 1.7 (#3615 - @marvelm and @JakobLichterfeld)
+- ci: stale after 30 days ([07670fa](https://github.com/teslamate-org/teslamate/commit/07670fa014b4d79d6907e7198960ec13c5cdae71) -@JakobLichterfeld)
+- Add stat panel for selected duration in drive details dashboard (#3667 - @oivindoh)
+- ci: run edge build every night ([206d731](https://github.com/teslamate-org/teslamate/commit/206d731935a5e8ebc350a7981df8c6d92480b88b) - @JakobLichterfeld)
+
 #### Dashboards
 
 #### Translations
 
+- Add Thai Translation (#3566 - @tomzt)
+- Update default.po missing french translations (#3662 - @pquattro)
+- update zh_Hans text (#3664 - @mrgaolei)
+
 #### Documentation
 
+- Add details how to configuring the TZ environment variable (#3650 - @NirKli)
+- doc: add instructions, how to connect to database before editing cars (#3656 - @JakobLichterfeld)
+
 ## [1.28.3] - 2024-02-02
 
 ### New features
@@ -50,8 +65,9 @@
 - update docker-compose.yml for Docker Compose version v2.24.1 (#3626 - @realJustinLee)
 
 ### Configure Timezone Setting for Accurate Local Time Display
-To ensure time-related features display accurately in your local timezone, configure the TZ environment variable.  
-Detailed instructions are available in our [configuration guide](https://docs.teslamate.org/docs/configuration/environment_variables/).   
+
+To ensure time-related features display accurately in your local timezone, configure the TZ environment variable.
+Detailed instructions are available in our [configuration guide](https://docs.teslamate.org/docs/configuration/environment_variables/).
 
 ## [1.28.2] - 2023-11-27
 
@@ -643,6 +659,7 @@ Users who are already signed in in do not have to worry about it. TeslaMate will
 >
 > **To immediately obtain new tokens after upgrading**, go to the TeslaMate settings page, **sign out via the button** at the bottom of the page and then sign in again.
 
+Additional:
 > **⚠️ NOTE**: This release changes TeslaMate's base Docker image to Debian. If you have any customizations on top of TeslaMate (like healthchecks), they could need updates to work on top of this new image.
 
 ### Enhancements
@@ -853,6 +870,7 @@ Users who are already signed in in do not have to worry about it. TeslaMate will
 - Drives: Add column header for reduced range ([#662](https://github.com/adriankumpf/teslamate/pull/662) by [Dulanic](https://github.com/Dulanic))
 - Charging Stats: Show map with frequently used chargers ([#666](https://github.com/adriankumpf/teslamate/pull/666) by [Dulanic](https://github.com/Dulanic))
   - _Manual install: requires Grafana plugin **grafana-map-panel**_
+
     ```bash
     grafana-cli --pluginUrl https://github.com/panodata/grafana-map-panel/releases/download/0.9.0/grafana-map-panel-0.9.0.zip plugins install grafana-worldmap-panel-ng
     ```
@@ -925,7 +943,7 @@ As the first and only Tesla logging app out there, TeslaMate now use the Tesla s
 - Update French translation ([#598](https://github.com/adriankumpf/teslamate/pull/598) by [tomS3210](https://github.com/tomS3210) and [MaxG88](https://github.com/MaxG88))
 - Updated Labels to Title Case ([#578](https://github.com/adriankumpf/teslamate/pull/578) by [jmiverson](https://github.com/jmiverson))
 
-#### Other enhancements:
+#### Other enhancements
 
 - Send credentials with manifest request ([#555](https://github.com/adriankumpf/teslamate/pull/555) by [MaxG88](https://github.com/MaxG88))
 - Add option to change the language of the web interface
@@ -1187,17 +1205,17 @@ The docs were revised (once again). You can find them at **[docs.teslamate.org](
 
 ### Enhancements
 
-**Documentation**
+#### Documentation
 
 [@gundalow](https://github.com/gundalow) has revamped the docs ([#292](https://github.com/adriankumpf/teslamate/pull/292), [#314](https://github.com/adriankumpf/teslamate/pull/314)). The new documentation is available here: [teslamate.readthedocs.io](https://teslamate.readthedocs.io)
 
-**Automatic phase correction**
+#### Automatic phase correction
 
 The phase correction is now applied automatically.
 
 Background: some vehicles incorrectly report 2 instead of 1 or 3 phases when charging. This led to an incorrect calculation of the 'kWh used'. Furthermore, the calculation did not work reliably in three-phase networks with e.g. 127/220V. Therefore it was necessary in the past to manually activate a phase correction for specific geo-fences. With this update the correction is now applied automatically.
 
-**Other enhancements**
+#### Other enhancements
 
 - Refactored API module
 - Increased polling frequency in asleep state
@@ -1377,7 +1395,7 @@ Currently, a firmware bug in some vehicles may cause the wrong number of phases
 - Generally improve error handling and error messages
 - Improve landscape mode on devices with a notch
 
-* Open the geo-fence editor by clicking on the start or destination address of
+- Open the geo-fence editor by clicking on the start or destination address of
   a trip
 
   **Note:** For this feature to work Grafana needs to know the base URL of the
@@ -1525,7 +1543,7 @@ superuser rights (temporarily):
 
 ### Added / Changed
 
-**Dashboards**
+#### Dashboards
 
 - Display car name instead of its id and replace dropdown with separate row for each car
 - Improve States dashboard:
@@ -1535,7 +1553,7 @@ superuser rights (temporarily):
 - Drive Details: add estimated range graph
 - Degradation: Increase resolution of projected 100% range
 
-**Web UI**
+#### Web UI
 
 - Add favicons
 - Fetch last known values from database after (re)starting TeslaMate
@@ -1600,7 +1618,7 @@ superuser rights (temporarily):
 
 ## 1.4
 
-**1. New custom grafana image: `teslamate/grafana`**
+### 1. New custom grafana image: `teslamate/grafana`**
 
 Starting with this release there is a customized Grafana docker image
 (`teslamate/grafana`) that auto provisions the datasource and dashboards which
@@ -1638,12 +1656,12 @@ volumes:
 
 Find the full example in the updated README.
 
-**2. Switch to imperial units**
+### 2. Switch to imperial units
 
 There is a new settings view in the web interface. To use imperial measurements
 in grafana and on the status screen just tick the checkbox it shows!
 
-**3. Deprecation of TESLA_USERNAME and TESLA_PASSWORD**
+### 3. Deprecation of TESLA_USERNAME and TESLA_PASSWORD
 
 With this release API tokens are stored in the database. After starting
 TeslaMate v1.4 once, you can safely remove both environment variables.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.28.3
+1.28.4
diff --git a/grafana/dashboards/internal/drive-details.json b/grafana/dashboards/internal/drive-details.json
@@ -338,7 +338,6 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "8.5.4",
       "targets": [
         {
           "alias": "",
@@ -487,13 +486,87 @@
       ],
       "type": "stat"
     },
+    {
+      "datasource": "TeslaMate",
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "decimals": 1,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "semi-dark-blue",
+                "value": null
+              }
+            ]
+          },
+          "unit": "dtdurations"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 3,
+        "x": 18,
+        "y": 0
+      },
+      "id": 34,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "targets": [
+        {
+          "datasource": "TeslaMate",
+          "editorMode": "code",
+          "format": "table",
+          "rawQuery": true,
+          "rawSql": "SELECT ${__to:date:seconds} - ${__from:date:seconds}",
+          "refId": "A",
+          "sql": {
+            "columns": [
+              {
+                "parameters": [],
+                "type": "function"
+              }
+            ],
+            "groupBy": [
+              {
+                "property": {
+                  "type": "string"
+                },
+                "type": "groupBy"
+              }
+            ],
+            "limit": 50
+          }
+        }
+      ],
+      "title": "Selected duration",
+      "type": "stat"
+    },
     {
       "datasource": "TeslaMate",
       "description": "",
       "fieldConfig": {
         "defaults": {
           "decimals": 1,
-          "displayName": "Duration",
           "mappings": [
             {
               "options": {
@@ -520,8 +593,8 @@
       },
       "gridPos": {
         "h": 2,
-        "w": 6,
-        "x": 18,
+        "w": 3,
+        "x": 21,
         "y": 0
       },
       "id": 14,
@@ -539,7 +612,8 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "textMode": "auto",
+        "wideLayout": true
       },
       "pluginVersion": "10.1.2",
       "targets": [
@@ -572,6 +646,7 @@
           ]
         }
       ],
+      "title": "Drive duration",
       "type": "stat"
     },
     {
@@ -1182,7 +1257,6 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "8.5.4",
       "targets": [
         {
           "alias": "",
@@ -1336,7 +1410,6 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "8.5.4",
       "targets": [
         {
           "datasource": "TeslaMate",
@@ -1596,7 +1669,6 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "8.5.4",
       "targets": [
         {
           "datasource": "TeslaMate",
@@ -1681,7 +1753,6 @@
         },
         "textMode": "value_and_name"
       },
-      "pluginVersion": "8.5.6",
       "targets": [
         {
           "format": "table",
@@ -1756,7 +1827,6 @@
         "text": {},
         "textMode": "value_and_name"
       },
-      "pluginVersion": "8.5.6",
       "targets": [
         {
           "datasource": "TeslaMate",