Skip to content

Commit bccf510

Browse files
committed
Grafana 13.0.1
1 parent e9ddcab commit bccf510

4 files changed

Lines changed: 16 additions & 9 deletions

File tree

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 (#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
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/charges.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,13 +1422,13 @@
14221422
"type": "grafana-postgresql-datasource",
14231423
"uid": "TeslaMate"
14241424
},
1425-
"definition": "-- The \"Include All option\" built into Grafana is not initializing correctly if no value is returned by the SQL query anymore\r\n-- Create the option via SQL as a temporary workaround until fixed (https://github.com/grafana/grafana/issues/119793)\r\n\r\nwith geofences_incl_all_option as (\r\n\r\n select 'All' as __text, -1 as __value, '_all' as name\r\n\r\n union all\r\n\r\n SELECT name AS __text, id AS __value, name from geofences\r\n\r\n)\r\n\r\nSELECT __text, __value from geofences_incl_all_option order by name asc",
1426-
"includeAll": false,
1425+
"definition": "SELECT name AS __text, id AS __value FROM geofences ORDER BY name COLLATE \"C\" ASC;",
1426+
"includeAll": true,
14271427
"label": "Geofence",
14281428
"multi": true,
14291429
"name": "geofence",
14301430
"options": [],
1431-
"query": "-- The \"Include All option\" built into Grafana is not initializing correctly if no value is returned by the SQL query anymore\r\n-- Create the option via SQL as a temporary workaround until fixed (https://github.com/grafana/grafana/issues/119793)\r\n\r\nwith geofences_incl_all_option as (\r\n\r\n select 'All' as __text, -1 as __value, '_all' as name\r\n\r\n union all\r\n\r\n SELECT name AS __text, id AS __value, name from geofences\r\n\r\n)\r\n\r\nSELECT __text, __value from geofences_incl_all_option order by name asc",
1431+
"query": "SELECT name AS __text, id AS __value FROM geofences ORDER BY name COLLATE \"C\" ASC;",
14321432
"refresh": 1,
14331433
"regex": "",
14341434
"regexApplyTo": "value",

grafana/dashboards/drives.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,14 +1444,14 @@
14441444
"type": "grafana-postgresql-datasource",
14451445
"uid": "TeslaMate"
14461446
},
1447-
"definition": "-- The \"Include All option\" built into Grafana is not initializing correctly if no value is returned by the SQL query anymore\r\n-- Create the option via SQL as a temporary workaround until fixed (https://github.com/grafana/grafana/issues/119793)\r\n\r\nwith geofences_incl_all_option as (\r\n\r\n select 'All' as __text, -1 as __value, '_all' as name\r\n\r\n union all\r\n\r\n SELECT name AS __text, id AS __value, name from geofences\r\n\r\n)\r\n\r\nSELECT __text, __value from geofences_incl_all_option order by name asc",
1447+
"definition": "SELECT name AS __text, id AS __value FROM geofences ORDER BY name COLLATE \"C\" ASC;",
14481448
"description": "Start or Destination Geofence",
1449-
"includeAll": false,
1449+
"includeAll": true,
14501450
"label": "Geofence",
14511451
"multi": true,
14521452
"name": "geofence",
14531453
"options": [],
1454-
"query": "-- The \"Include All option\" built into Grafana is not initializing correctly if no value is returned by the SQL query anymore\r\n-- Create the option via SQL as a temporary workaround until fixed (https://github.com/grafana/grafana/issues/119793)\r\n\r\nwith geofences_incl_all_option as (\r\n\r\n select 'All' as __text, -1 as __value, '_all' as name\r\n\r\n union all\r\n\r\n SELECT name AS __text, id AS __value, name from geofences\r\n\r\n)\r\n\r\nSELECT __text, __value from geofences_incl_all_option order by name asc",
1454+
"query": "SELECT name AS __text, id AS __value FROM geofences ORDER BY name COLLATE \"C\" ASC;",
14551455
"refresh": 1,
14561456
"regex": "",
14571457
"regexApplyTo": "value",

0 commit comments

Comments
 (0)