Skip to content

Commit f4cdc6c

Browse files
feat: use Grafana 11.6.1 to fix issues when using browser locale for date formats (#4662)
* Grafana 11.6.1 * fix #4690 * increase dateTimeAsLocal column width to 210 for en-us locale, remove obsolete config entries * docs: update changelog --------- Co-authored-by: Jakob Lichterfeld <jakob-lichterfeld@gmx.de>
1 parent 76c6898 commit f4cdc6c

29 files changed

+1134
-3537
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
### Improvements and bug fixes
1414

1515
- fix(nix): non-recursive provider for ../grafana/dashboards (#4680 - @swiffer)
16+
- feat: use Grafana 11.6.1 (#4662 - @swiffer)
1617

1718
#### Build, CI, internal
1819

@@ -46,6 +47,8 @@
4647
- fix: use same rated range calculation in updates dashboard as in battery health dashboard (#4682 - @swiffer)
4748
- fix: explicitly set height of home dashboard background image based on current layout & grafana css (#4681 -@swiffer)
4849
- fix: set $\_\_timezone explicitly in dashboards to ensure truncation is done with respect to the Grafana timezone (#4684 - @swiffer)
50+
- fix: issues when using browser locale for date formats (#4662 - @swiffer)
51+
- fix: widens Date Columns to fully show date strings formatted in US locale (#4662 - @swiffer)
4952

5053
#### Translations
5154

grafana/Dockerfile

+2-6
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:11.6.0
3+
FROM grafana/grafana:11.6.1
44

55
ENV GF_ANALYTICS_REPORTING_ENABLED=false \
66
GF_AUTH_ANONYMOUS_ENABLED=false \
@@ -13,14 +13,10 @@ ENV GF_ANALYTICS_REPORTING_ENABLED=false \
1313
GF_USERS_ALLOW_SIGN_UP=false \
1414
GF_USERS_DEFAULT_LANGUAGE=detect \
1515
GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/dashboards_internal/home.json \
16+
GF_DATE_FORMATS_USE_BROWSER_LOCALE=true \
1617
DATABASE_PORT=5432 \
1718
DATABASE_SSL_MODE=disable
1819

19-
# This experimental config option is temporarily disabled
20-
# https://github.com/grafana/grafana/pull/102396 is merged and released in 11.6.0
21-
# https://github.com/grafana/grafana/pull/102750 is open and yet to be merged & released
22-
# ENV GF_DATE_FORMATS_USE_BROWSER_LOCALE=true
23-
2420
USER grafana
2521

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

0 commit comments

Comments
 (0)