Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

### Improvements and bug fixes

- feat: use Grafana 12.2.1 (#4965 - @swiffer)

#### Build, CI, internal

#### Dashboards
Expand Down
6 changes: 5 additions & 1 deletion grafana/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Ensure selecting a tag that is available for arm/v7, arm64, and amd64
# https://hub.docker.com/r/grafana/grafana/tags
FROM grafana/grafana:12.1.1
FROM grafana/grafana:12.2.1

ENV GF_ANALYTICS_REPORTING_ENABLED=false \
GF_AUTH_ANONYMOUS_ENABLED=false \
Expand All @@ -22,6 +22,10 @@ ENV GF_ANALYTICS_REPORTING_ENABLED=false \
USER grafana

COPY logo.svg /usr/share/grafana/public/img/grafana_icon.svg

RUN LOGO_PATH=$(find /usr/share/grafana/public/build/static/img/ -type f -name 'grafana_icon.*.svg') && \
cp /usr/share/grafana/public/img/grafana_icon.svg "$LOGO_PATH" || true

COPY favicon.png /usr/share/grafana/public/img/fav32.png
COPY apple-touch-icon.png /usr/share/grafana/public/img/apple-touch-icon.png

Expand Down
25 changes: 13 additions & 12 deletions grafana/dashboards/battery-health.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"textMode": "value_and_name",
"wideLayout": true
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -240,7 +240,7 @@
"textMode": "value_and_name",
"wideLayout": true
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -329,7 +329,7 @@
"textMode": "value_and_name",
"wideLayout": true
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -531,14 +531,15 @@
"fields": "",
"values": false
},
"sort": "desc",
"tooltip": {
"hideZeros": false,
"maxHeight": 600,
"mode": "single",
"sort": "none"
}
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -632,7 +633,7 @@
"showThresholdMarkers": true,
"sizing": "auto"
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -733,7 +734,7 @@
"sizing": "auto",
"valueMode": "color"
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -862,7 +863,7 @@
"textMode": "value_and_name",
"wideLayout": true
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1067,7 +1068,7 @@
"text": {},
"valueMode": "color"
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1239,7 +1240,7 @@
"textMode": "value",
"wideLayout": true
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1344,7 +1345,7 @@
"text": {},
"valueMode": "color"
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1547,7 +1548,7 @@
"sort": "none"
}
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1612,7 +1613,7 @@
],
"preload": false,
"refresh": "",
"schemaVersion": 41,
"schemaVersion": 42,
"tags": [
"tesla"
],
Expand Down
5 changes: 3 additions & 2 deletions grafana/dashboards/charge-level.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"type": "linear"
},
"showPoints": "never",
"showValues": false,
"spanNulls": true,
"stacking": {
"group": "A",
Expand Down Expand Up @@ -138,7 +139,7 @@
"sort": "none"
}
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -263,7 +264,7 @@
],
"preload": false,
"refresh": "",
"schemaVersion": 41,
"schemaVersion": 42,
"tags": [
"tesla"
],
Expand Down
50 changes: 20 additions & 30 deletions grafana/dashboards/charges.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"textMode": "auto",
"wideLayout": true
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -222,7 +222,7 @@
"textMode": "auto",
"wideLayout": true
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -322,7 +322,7 @@
"textMode": "auto",
"wideLayout": true
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -423,7 +423,7 @@
"textMode": "auto",
"wideLayout": true
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -467,6 +467,9 @@
"type": "auto"
},
"filterable": false,
"footer": {
"reducers": []
},
"inspect": false,
"minWidth": 150
},
Expand Down Expand Up @@ -700,7 +703,7 @@
},
"properties": [
{
"id": "custom.hidden",
"id": "custom.hideFrom.viz",
"value": true
}
]
Expand All @@ -712,7 +715,7 @@
},
"properties": [
{
"id": "custom.hidden",
"id": "custom.hideFrom.viz",
"value": true
}
]
Expand Down Expand Up @@ -946,7 +949,7 @@
},
"properties": [
{
"id": "custom.hidden",
"id": "custom.hideFrom.viz",
"value": true
}
]
Expand Down Expand Up @@ -1019,7 +1022,7 @@
},
"properties": [
{
"id": "custom.hidden",
"id": "custom.hideFrom.viz",
"value": true
}
]
Expand All @@ -1031,7 +1034,7 @@
},
"properties": [
{
"id": "custom.hidden",
"id": "custom.hideFrom.viz",
"value": true
}
]
Expand Down Expand Up @@ -1163,18 +1166,10 @@
"id": 6,
"options": {
"cellHeight": "sm",
"footer": {
"countRows": false,
"fields": "",
"reducer": [
"sum"
],
"show": false
},
"showHeader": true,
"sortBy": []
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1242,7 +1237,7 @@
"content": "From here you can check if you have \nincomplete data of **Charges** (charges without ending date)\nIf so, you may follow the official \nguide by <a href='https://docs.teslamate.org/docs/maintenance/manually_fixing_data' target='_blank'>Manually fixing data</a>",
"mode": "markdown"
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"title": "",
"type": "text"
},
Expand All @@ -1262,6 +1257,9 @@
"cellOptions": {
"type": "auto"
},
"footer": {
"reducers": []
},
"inspect": false
},
"links": [],
Expand All @@ -1287,18 +1285,10 @@
"id": 17,
"options": {
"cellHeight": "sm",
"footer": {
"countRows": false,
"enablePagination": true,
"fields": "",
"reducer": [
"sum"
],
"show": false
},
"enablePagination": true,
"showHeader": true
},
"pluginVersion": "12.1.1",
"pluginVersion": "12.2.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1335,7 +1325,7 @@
],
"preload": false,
"refresh": "",
"schemaVersion": 41,
"schemaVersion": 42,
"tags": [
"tesla"
],
Expand Down
Loading
Loading