Skip to content

Commit 7ce859d

Browse files
committed
Grafana 13.0.1+security-01
1 parent e749f75 commit 7ce859d

25 files changed

Lines changed: 362 additions & 243 deletions

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- perf: ensure BRIN indexes don't degrade over time (#5276 - @swiffer)
1616
- fix: fix folder creation and bash 3.2 compatibility in dashboards.sh (#5233 - @svennergr)
1717
- fix: handle nil tire pressure values in summary view (#5297 - @elemated)
18+
- feat: use Grafana 13.0.1+security-01 (#5324 - @swiffer)
1819

1920
#### Build, CI, internal
2021

grafana/Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
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.4.0
3+
FROM grafana/grafana:13.0.1-security-01
44

55
ENV GF_ANALYTICS_REPORTING_ENABLED=false \
66
GF_ANALYTICS_CHECK_FOR_UPDATES=false \
77
GF_ANALYTICS_CHECK_FOR_PLUGIN_UPDATES=false \
8+
GF_ANALYTICS_FEEDBACK_LINKS_ENABLED=false \
89
GF_AUTH_ANONYMOUS_ENABLED=false \
910
GF_AUTH_BASIC_ENABLED=false \
1011
GF_SECURITY_ADMIN_PASSWORD=admin \
@@ -20,15 +21,20 @@ ENV GF_ANALYTICS_REPORTING_ENABLED=false \
2021
GF_UNIFIED_ALERTING_ENABLED=false \
2122
GF_METRICS_ENABLED=false \
2223
GF_RECORDING_RULES_ENABLED=false \
24+
GF_CLOUD_MIGRATION_ENABLED=false \
25+
GF_FEATURE_TOGGLES_provisioning=false \
26+
GF_FEATURE_TOGGLES_splashScreen=false \
27+
GF_FEATURE_TOGGLES_newPanelPadding=false \
28+
GF_FEATURE_TOGGLES_dashboardNewLayouts=false \
2329
DATABASE_PORT=5432 \
2430
DATABASE_SSL_MODE=disable
2531

2632
USER grafana
2733

28-
COPY logo.svg /usr/share/grafana/public/img/grafana_icon.svg
34+
COPY logo.svg /usr/share/grafana/public/build/img/grafana_icon.svg
2935

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

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

grafana/dashboards/battery-health.json

Lines changed: 25 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.4.0",
99+
"pluginVersion": "13.0.1+security-01",
100100
"targets": [
101101
{
102102
"datasource": {
@@ -239,7 +239,7 @@
239239
"textMode": "value_and_name",
240240
"wideLayout": true
241241
},
242-
"pluginVersion": "12.4.0",
242+
"pluginVersion": "13.0.1+security-01",
243243
"targets": [
244244
{
245245
"datasource": {
@@ -328,7 +328,7 @@
328328
"textMode": "value_and_name",
329329
"wideLayout": true
330330
},
331-
"pluginVersion": "12.4.0",
331+
"pluginVersion": "13.0.1+security-01",
332332
"targets": [
333333
{
334334
"datasource": {
@@ -538,7 +538,7 @@
538538
"sort": "none"
539539
}
540540
},
541-
"pluginVersion": "12.4.0",
541+
"pluginVersion": "13.0.1+security-01",
542542
"targets": [
543543
{
544544
"datasource": {
@@ -620,6 +620,14 @@
620620
},
621621
"id": 17,
622622
"options": {
623+
"barShape": "flat",
624+
"barWidthFactor": 0.5,
625+
"effects": {
626+
"barGlow": false,
627+
"centerGlow": false,
628+
"gradient": false
629+
},
630+
"endpointMarker": "point",
623631
"minVizHeight": 75,
624632
"minVizWidth": 75,
625633
"orientation": "auto",
@@ -628,11 +636,16 @@
628636
"fields": "/^greatest$/",
629637
"values": false
630638
},
639+
"segmentCount": 1,
640+
"segmentSpacing": 0.3,
641+
"shape": "gauge",
631642
"showThresholdLabels": false,
632643
"showThresholdMarkers": true,
633-
"sizing": "auto"
644+
"sizing": "auto",
645+
"sparkline": false,
646+
"textMode": "auto"
634647
},
635-
"pluginVersion": "12.4.0",
648+
"pluginVersion": "13.0.1+security-01",
636649
"targets": [
637650
{
638651
"datasource": {
@@ -732,7 +745,7 @@
732745
"sizing": "auto",
733746
"valueMode": "color"
734747
},
735-
"pluginVersion": "12.4.0",
748+
"pluginVersion": "13.0.1+security-01",
736749
"targets": [
737750
{
738751
"datasource": {
@@ -861,7 +874,7 @@
861874
"textMode": "value_and_name",
862875
"wideLayout": true
863876
},
864-
"pluginVersion": "12.4.0",
877+
"pluginVersion": "13.0.1+security-01",
865878
"targets": [
866879
{
867880
"datasource": {
@@ -1066,7 +1079,7 @@
10661079
"text": {},
10671080
"valueMode": "color"
10681081
},
1069-
"pluginVersion": "12.4.0",
1082+
"pluginVersion": "13.0.1+security-01",
10701083
"targets": [
10711084
{
10721085
"datasource": {
@@ -1238,7 +1251,7 @@
12381251
"textMode": "value",
12391252
"wideLayout": true
12401253
},
1241-
"pluginVersion": "12.4.0",
1254+
"pluginVersion": "13.0.1+security-01",
12421255
"targets": [
12431256
{
12441257
"datasource": {
@@ -1342,7 +1355,7 @@
13421355
"text": {},
13431356
"valueMode": "color"
13441357
},
1345-
"pluginVersion": "12.4.0",
1358+
"pluginVersion": "13.0.1+security-01",
13461359
"targets": [
13471360
{
13481361
"datasource": {
@@ -1545,7 +1558,7 @@
15451558
"sort": "none"
15461559
}
15471560
},
1548-
"pluginVersion": "12.4.0",
1561+
"pluginVersion": "13.0.1+security-01",
15491562
"targets": [
15501563
{
15511564
"datasource": {

grafana/dashboards/charge-level.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@
122122
},
123123
"id": 2,
124124
"options": {
125+
"annotations": {
126+
"clustering": -1,
127+
"multiLane": false
128+
},
125129
"legend": {
126130
"calcs": [
127131
"mean",
@@ -139,7 +143,7 @@
139143
"sort": "none"
140144
}
141145
},
142-
"pluginVersion": "12.4.0",
146+
"pluginVersion": "13.0.1+security-01",
143147
"targets": [
144148
{
145149
"datasource": {

grafana/dashboards/charges.json

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
"textMode": "auto",
124124
"wideLayout": true
125125
},
126-
"pluginVersion": "12.4.0",
126+
"pluginVersion": "13.0.1+security-01",
127127
"targets": [
128128
{
129129
"datasource": {
@@ -134,7 +134,6 @@
134134
"refId": "A"
135135
}
136136
],
137-
"title": "",
138137
"transformations": [
139138
{
140139
"id": "filterFieldsByName",
@@ -222,7 +221,7 @@
222221
"textMode": "auto",
223222
"wideLayout": true
224223
},
225-
"pluginVersion": "12.4.0",
224+
"pluginVersion": "13.0.1+security-01",
226225
"targets": [
227226
{
228227
"datasource": {
@@ -233,7 +232,6 @@
233232
"refId": "A"
234233
}
235234
],
236-
"title": "",
237235
"transformations": [
238236
{
239237
"id": "filterFieldsByName",
@@ -322,7 +320,7 @@
322320
"textMode": "auto",
323321
"wideLayout": true
324322
},
325-
"pluginVersion": "12.4.0",
323+
"pluginVersion": "13.0.1+security-01",
326324
"targets": [
327325
{
328326
"datasource": {
@@ -333,7 +331,6 @@
333331
"refId": "A"
334332
}
335333
],
336-
"title": "",
337334
"transformations": [
338335
{
339336
"id": "filterFieldsByName",
@@ -422,7 +419,7 @@
422419
"textMode": "auto",
423420
"wideLayout": true
424421
},
425-
"pluginVersion": "12.4.0",
422+
"pluginVersion": "13.0.1+security-01",
426423
"targets": [
427424
{
428425
"datasource": {
@@ -433,7 +430,6 @@
433430
"refId": "A"
434431
}
435432
],
436-
"title": "",
437433
"transformations": [
438434
{
439435
"id": "filterFieldsByName",
@@ -1168,7 +1164,7 @@
11681164
"showHeader": true,
11691165
"sortBy": []
11701166
},
1171-
"pluginVersion": "12.4.0",
1167+
"pluginVersion": "13.0.1+security-01",
11721168
"targets": [
11731169
{
11741170
"datasource": {
@@ -1216,10 +1212,6 @@
12161212
"type": "row"
12171213
},
12181214
{
1219-
"fieldConfig": {
1220-
"defaults": {},
1221-
"overrides": []
1222-
},
12231215
"gridPos": {
12241216
"h": 2,
12251217
"w": 24,
@@ -1236,8 +1228,7 @@
12361228
"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>",
12371229
"mode": "markdown"
12381230
},
1239-
"pluginVersion": "12.4.0",
1240-
"title": "",
1231+
"pluginVersion": "13.0.1+security-01",
12411232
"type": "text"
12421233
},
12431234
{
@@ -1286,7 +1277,7 @@
12861277
"enablePagination": true,
12871278
"showHeader": true
12881279
},
1289-
"pluginVersion": "12.4.0",
1280+
"pluginVersion": "13.0.1+security-01",
12901281
"targets": [
12911282
{
12921283
"datasource": {

0 commit comments

Comments
 (0)