Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Update Grafana to 11.4.0 #4299

Merged
merged 3 commits into from
Dec 8, 2024

Conversation

swiffer
Copy link
Contributor

@swiffer swiffer commented Oct 22, 2024

Upgrades Grafana to 11.4.0. Grafana switched to scenes powered dashboards for which the experimental setting date_formats.use_browser_locale is breaking timerange selector & urls containing absolute time ranges.

Therefore date_formats.use_browser_locale has been temporarily disabled (see comment in Dockerfile).

Tracking issue: grafana/grafana#95209

Copy link

netlify bot commented Oct 22, 2024

Deploy Preview for teslamate ready!

Name Link
🔨 Latest commit e56b745
🔍 Latest deploy log https://app.netlify.com/sites/teslamate/deploys/6755326085a3940008b3c087
😎 Deploy Preview https://deploy-preview-4299--teslamate.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@swiffer swiffer mentioned this pull request Oct 22, 2024
@cwanja
Copy link
Collaborator

cwanja commented Oct 22, 2024

The Dutch Tax dashboard is broken - has that been the case before, looks really outdated?

Works currently in 1.30.1. Imagine that is a side effect from Grafana 11.3.

@swiffer
Copy link
Contributor Author

swiffer commented Oct 22, 2024

The Dutch Tax dashboard is broken - has that been the case before, looks really outdated?

Works currently in 1.30.1. Imagine that is a side effect from Grafana 11.3.

yes but for me it shows two rows with two tables each (two cars). i think that was not the intention.
anyway, opened it in the current grafana image, fixed the markup, exported and imported again, working now!

@JakobLichterfeld JakobLichterfeld added area:grafana Related to Grafana docker Pull requests that update Docker code labels Oct 23, 2024
@swiffer swiffer force-pushed the grafana-11-3-0 branch 5 times, most recently from 8452b82 to 33bc9f2 Compare October 28, 2024 12:17
@swiffer swiffer force-pushed the grafana-11-3-0 branch 3 times, most recently from 76dfa49 to 69c8b97 Compare October 31, 2024 10:57
@swiffer swiffer changed the title Grafana 11.3.0 exploration feat: Update Grafana to 11.3.0 Oct 31, 2024
@swiffer swiffer marked this pull request as ready for review October 31, 2024 10:58
grafana/Dockerfile Outdated Show resolved Hide resolved
@swiffer
Copy link
Contributor Author

swiffer commented Oct 31, 2024

@JakobLichterfeld - i would prefer getting this merged with the temp fixes to stay up 2 date (and for me getting this branch integrated to stop keeping it up 2 date). there shouldn't be any regressions now. see comments for specific changes done.

@JakobLichterfeld JakobLichterfeld added area:dashboard Related to a Grafana dashboard enhancement New feature or request labels Oct 31, 2024
@swiffer
Copy link
Contributor Author

swiffer commented Oct 31, 2024

😞 back to draft, featue toggles currently cannot be disabled by env vars:

https://github.com/grafana/grafana/pull/90178/files

@swiffer swiffer marked this pull request as draft October 31, 2024 12:30
@JakobLichterfeld
Copy link
Collaborator

back to draft, featue toggles currently cannot be disabled by env vars:

Damm, was about to start testing right now

@swiffer swiffer force-pushed the grafana-11-3-0 branch 4 times, most recently from 283de20 to ed464e9 Compare November 23, 2024 21:09
@swiffer swiffer changed the title feat: Update Grafana to 11.3.0 feat: Update Grafana to 11.3.1 Nov 23, 2024
@swiffer swiffer force-pushed the grafana-11-3-0 branch 2 times, most recently from e5e02df to 4df3df6 Compare November 24, 2024 06:29
@swiffer
Copy link
Contributor Author

swiffer commented Nov 24, 2024

@JakobLichterfeld - figured out what was causing the links between dashboards no longer working correctly.

it's caused by an experimental config setting. updated the PR description as well as the grafana tracking issue and disabled the setting in the dockerfile (adding a comment there as well).

with most of the dashboard work beeing done in #4338 this one is a simple version bump to grafana 11.3.1 (latest). as recommended this is the first patch release of 11.3.0.

the next bump will most likely happen 28th of january (11.4.1) if everything goes as planned: https://grafana.com/docs/grafana/latest/upgrade-guide/when-to-upgrade/#when-to-expect-releases

@swiffer swiffer marked this pull request as ready for review November 24, 2024 06:41
@swiffer
Copy link
Contributor Author

swiffer commented Nov 27, 2024

(not stressing!) - ready to be merged, don't know if that was clear from my last comment.

@JakobLichterfeld
Copy link
Collaborator

(not stressing!) - ready to be merged,

Thanks for reminder.

don't know if that was clear from my last comment.

In fact, it was not clear to me if we could merge this without the other PR related to Grafana 11.3, which I either confused or no longer exists.

@swiffer
Copy link
Contributor Author

swiffer commented Nov 27, 2024

You remember correctly - most of the work of the previous 11.3 PR was included in #4338 - i reused this one for the simple bump to 11.3.1. the only remaining regression i noticed has been mitigated (dashboard links not working with the experimental config setting i described above).

@swiffer swiffer changed the title feat: Update Grafana to 11.3.1 feat: Update Grafana to 11.4.0 Dec 5, 2024
@JakobLichterfeld
Copy link
Collaborator

Once again: Thanks for your great efforts!

I currently test all dashboards. And will post my findings here.

@JakobLichterfeld
Copy link
Collaborator

JakobLichterfeld commented Dec 7, 2024

In Charges, when clicking on the first charge it does not show full data of that charge (no data for charge details, err in charging curve).

It seems like the the url is misformed,

v1.32.0
.../charge-details?from=1733157227000&to=1733161798000&var-car_id=1&var-charging_process_id=619&orgId=1

this PR:
.../charge-details?from=now-12h&to=now&var-car_id=1&var-charging_process_id=619&orgId=1&timezone=browser&var-temp_unit=C&var-length_unit=km&var-preferred_range=rated&var-base_url=...

Edit: same for drives and drives details
Edit 2: Same for statistics and then Trip
Edit 3: same for Timeline and then Trip and for Trip (select last three drives not working)

@JakobLichterfeld
Copy link
Collaborator

Rest is perfect!

Copy link
Collaborator

@JakobLichterfeld JakobLichterfeld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@swiffer
Copy link
Contributor Author

swiffer commented Dec 8, 2024

@JakobLichterfeld - sorry not quickly fixing that yesterday, it was light show / event day ;)

I temporarily reenabled the browser dateformat setting in env to see if it's solved in 11.4.0 and forgot to disable the env setting again after checking it's not.

So, force pushed now and your finding you should be mitigated again. lgtm 🚀

Copy link
Collaborator

@JakobLichterfeld JakobLichterfeld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect, ty. Successfully tested with charges, drives, timeline, trips and statistics

@JakobLichterfeld JakobLichterfeld merged commit 38cca3c into teslamate-org:master Dec 8, 2024
15 checks passed
@swiffer swiffer deleted the grafana-11-3-0 branch December 8, 2024 06:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:dashboard Related to a Grafana dashboard area:grafana Related to Grafana docker Pull requests that update Docker code enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants