Skip to content

Commit 7c24408

Browse files
swifferswiffer
committed
Grafana 12.4.0
1 parent 4fc7272 commit 7c24408

25 files changed

+332
-434
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
- feat: use Logger instead of IO.puts in DB check (#5050 - @swiffer)
1010
- feat: Increase max_header_value_length to support oauth2-proxy (#5031 - @ultravail)
11+
- feat: use Grafana 12.4.0 (#4965 - @swiffer)
1112

1213
#### Build, CI, internal
1314

‎grafana/Dockerfile‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Ensure selecting a tag that is available for arm/v7, arm64, and amd64
22
# https://hub.docker.com/r/grafana/grafana/tags
3-
FROM grafana/grafana:12.1.1
3+
FROM grafana/grafana:12.4.0-20904407122
44

55
ENV GF_ANALYTICS_REPORTING_ENABLED=false \
66
GF_AUTH_ANONYMOUS_ENABLED=false \
@@ -16,14 +16,20 @@ ENV GF_ANALYTICS_REPORTING_ENABLED=false \
1616
GF_DATE_FORMATS_USE_BROWSER_LOCALE=true \
1717
GF_PLUGINS_PREINSTALL_DISABLED=true \
1818
GF_UNIFIED_ALERTING_ENABLED=false \
19+
GF_METRICS_ENABLED=false \
20+
GF_RECORDING_RULES_ENABLED=false \
1921
DATABASE_PORT=5432 \
2022
DATABASE_SSL_MODE=disable
2123

2224
USER grafana
2325

2426
COPY logo.svg /usr/share/grafana/public/img/grafana_icon.svg
25-
COPY favicon.png /usr/share/grafana/public/img/fav32.png
26-
COPY apple-touch-icon.png /usr/share/grafana/public/img/apple-touch-icon.png
27+
28+
RUN LOGO_PATH=$(find /usr/share/grafana/public/build/static/img/ -type f -name 'grafana_icon.*.svg') && \
29+
cp /usr/share/grafana/public/img/grafana_icon.svg "$LOGO_PATH" || true
30+
31+
COPY favicon.png /usr/share/grafana/public/build/img/fav32.png
32+
COPY apple-touch-icon.png /usr/share/grafana/public/build/img/apple-touch-icon.png
2733

2834
COPY datasource.yml /etc/grafana/provisioning/datasources/
2935
COPY dashboards.yml /etc/grafana/provisioning/dashboards/

‎grafana/dashboards/battery-health.json‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"textMode": "value_and_name",
9797
"wideLayout": true
9898
},
99-
"pluginVersion": "12.1.1",
99+
"pluginVersion": "12.4.0",
100100
"targets": [
101101
{
102102
"datasource": {
@@ -240,7 +240,7 @@
240240
"textMode": "value_and_name",
241241
"wideLayout": true
242242
},
243-
"pluginVersion": "12.1.1",
243+
"pluginVersion": "12.4.0",
244244
"targets": [
245245
{
246246
"datasource": {
@@ -329,7 +329,7 @@
329329
"textMode": "value_and_name",
330330
"wideLayout": true
331331
},
332-
"pluginVersion": "12.1.1",
332+
"pluginVersion": "12.4.0",
333333
"targets": [
334334
{
335335
"datasource": {
@@ -531,14 +531,15 @@
531531
"fields": "",
532532
"values": false
533533
},
534+
"sort": "desc",
534535
"tooltip": {
535536
"hideZeros": false,
536537
"maxHeight": 600,
537538
"mode": "single",
538539
"sort": "none"
539540
}
540541
},
541-
"pluginVersion": "12.1.1",
542+
"pluginVersion": "12.4.0",
542543
"targets": [
543544
{
544545
"datasource": {
@@ -632,7 +633,7 @@
632633
"showThresholdMarkers": true,
633634
"sizing": "auto"
634635
},
635-
"pluginVersion": "12.1.1",
636+
"pluginVersion": "12.4.0",
636637
"targets": [
637638
{
638639
"datasource": {
@@ -733,7 +734,7 @@
733734
"sizing": "auto",
734735
"valueMode": "color"
735736
},
736-
"pluginVersion": "12.1.1",
737+
"pluginVersion": "12.4.0",
737738
"targets": [
738739
{
739740
"datasource": {
@@ -862,7 +863,7 @@
862863
"textMode": "value_and_name",
863864
"wideLayout": true
864865
},
865-
"pluginVersion": "12.1.1",
866+
"pluginVersion": "12.4.0",
866867
"targets": [
867868
{
868869
"datasource": {
@@ -1067,7 +1068,7 @@
10671068
"text": {},
10681069
"valueMode": "color"
10691070
},
1070-
"pluginVersion": "12.1.1",
1071+
"pluginVersion": "12.4.0",
10711072
"targets": [
10721073
{
10731074
"datasource": {
@@ -1239,7 +1240,7 @@
12391240
"textMode": "value",
12401241
"wideLayout": true
12411242
},
1242-
"pluginVersion": "12.1.1",
1243+
"pluginVersion": "12.4.0",
12431244
"targets": [
12441245
{
12451246
"datasource": {
@@ -1344,7 +1345,7 @@
13441345
"text": {},
13451346
"valueMode": "color"
13461347
},
1347-
"pluginVersion": "12.1.1",
1348+
"pluginVersion": "12.4.0",
13481349
"targets": [
13491350
{
13501351
"datasource": {
@@ -1547,7 +1548,7 @@
15471548
"sort": "none"
15481549
}
15491550
},
1550-
"pluginVersion": "12.1.1",
1551+
"pluginVersion": "12.4.0",
15511552
"targets": [
15521553
{
15531554
"datasource": {
@@ -1612,7 +1613,7 @@
16121613
],
16131614
"preload": false,
16141615
"refresh": "",
1615-
"schemaVersion": 41,
1616+
"schemaVersion": 42,
16161617
"tags": [
16171618
"tesla"
16181619
],

‎grafana/dashboards/charge-level.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
"type": "linear"
8787
},
8888
"showPoints": "never",
89+
"showValues": false,
8990
"spanNulls": true,
9091
"stacking": {
9192
"group": "A",
@@ -138,7 +139,7 @@
138139
"sort": "none"
139140
}
140141
},
141-
"pluginVersion": "12.1.1",
142+
"pluginVersion": "12.4.0",
142143
"targets": [
143144
{
144145
"datasource": {
@@ -263,7 +264,7 @@
263264
],
264265
"preload": false,
265266
"refresh": "",
266-
"schemaVersion": 41,
267+
"schemaVersion": 42,
267268
"tags": [
268269
"tesla"
269270
],

‎grafana/dashboards/charges.json‎

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
"textMode": "auto",
124124
"wideLayout": true
125125
},
126-
"pluginVersion": "12.1.1",
126+
"pluginVersion": "12.4.0",
127127
"targets": [
128128
{
129129
"datasource": {
@@ -222,7 +222,7 @@
222222
"textMode": "auto",
223223
"wideLayout": true
224224
},
225-
"pluginVersion": "12.1.1",
225+
"pluginVersion": "12.4.0",
226226
"targets": [
227227
{
228228
"datasource": {
@@ -322,7 +322,7 @@
322322
"textMode": "auto",
323323
"wideLayout": true
324324
},
325-
"pluginVersion": "12.1.1",
325+
"pluginVersion": "12.4.0",
326326
"targets": [
327327
{
328328
"datasource": {
@@ -423,7 +423,7 @@
423423
"textMode": "auto",
424424
"wideLayout": true
425425
},
426-
"pluginVersion": "12.1.1",
426+
"pluginVersion": "12.4.0",
427427
"targets": [
428428
{
429429
"datasource": {
@@ -467,6 +467,9 @@
467467
"type": "auto"
468468
},
469469
"filterable": false,
470+
"footer": {
471+
"reducers": []
472+
},
470473
"inspect": false,
471474
"minWidth": 150
472475
},
@@ -700,7 +703,7 @@
700703
},
701704
"properties": [
702705
{
703-
"id": "custom.hidden",
706+
"id": "custom.hideFrom.viz",
704707
"value": true
705708
}
706709
]
@@ -712,7 +715,7 @@
712715
},
713716
"properties": [
714717
{
715-
"id": "custom.hidden",
718+
"id": "custom.hideFrom.viz",
716719
"value": true
717720
}
718721
]
@@ -946,7 +949,7 @@
946949
},
947950
"properties": [
948951
{
949-
"id": "custom.hidden",
952+
"id": "custom.hideFrom.viz",
950953
"value": true
951954
}
952955
]
@@ -1019,7 +1022,7 @@
10191022
},
10201023
"properties": [
10211024
{
1022-
"id": "custom.hidden",
1025+
"id": "custom.hideFrom.viz",
10231026
"value": true
10241027
}
10251028
]
@@ -1031,7 +1034,7 @@
10311034
},
10321035
"properties": [
10331036
{
1034-
"id": "custom.hidden",
1037+
"id": "custom.hideFrom.viz",
10351038
"value": true
10361039
}
10371040
]
@@ -1163,18 +1166,10 @@
11631166
"id": 6,
11641167
"options": {
11651168
"cellHeight": "sm",
1166-
"footer": {
1167-
"countRows": false,
1168-
"fields": "",
1169-
"reducer": [
1170-
"sum"
1171-
],
1172-
"show": false
1173-
},
11741169
"showHeader": true,
11751170
"sortBy": []
11761171
},
1177-
"pluginVersion": "12.1.1",
1172+
"pluginVersion": "12.4.0",
11781173
"targets": [
11791174
{
11801175
"datasource": {
@@ -1242,7 +1237,7 @@
12421237
"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>",
12431238
"mode": "markdown"
12441239
},
1245-
"pluginVersion": "12.1.1",
1240+
"pluginVersion": "12.4.0",
12461241
"title": "",
12471242
"type": "text"
12481243
},
@@ -1262,6 +1257,9 @@
12621257
"cellOptions": {
12631258
"type": "auto"
12641259
},
1260+
"footer": {
1261+
"reducers": []
1262+
},
12651263
"inspect": false
12661264
},
12671265
"links": [],
@@ -1287,18 +1285,10 @@
12871285
"id": 17,
12881286
"options": {
12891287
"cellHeight": "sm",
1290-
"footer": {
1291-
"countRows": false,
1292-
"enablePagination": true,
1293-
"fields": "",
1294-
"reducer": [
1295-
"sum"
1296-
],
1297-
"show": false
1298-
},
1288+
"enablePagination": true,
12991289
"showHeader": true
13001290
},
1301-
"pluginVersion": "12.1.1",
1291+
"pluginVersion": "12.4.0",
13021292
"targets": [
13031293
{
13041294
"datasource": {
@@ -1335,7 +1325,7 @@
13351325
],
13361326
"preload": false,
13371327
"refresh": "",
1338-
"schemaVersion": 41,
1328+
"schemaVersion": 42,
13391329
"tags": [
13401330
"tesla"
13411331
],

0 commit comments

Comments
 (0)