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

Upgrade to latest mimir-prometheus with Prometheus 3.0 changes #9844

Open
wants to merge 27 commits into
base: main
Choose a base branch
from

Conversation

aknuds1
Copy link
Contributor

@aknuds1 aknuds1 commented Nov 6, 2024

What this PR does

Upgrade to latest mimir-prometheus@main, which syncs in Prometheus 3.0 changes.

NB: I add a go-kit/log to slog adapter, since Prometheus now uses the latter.

Which issue(s) this PR fixes or relates to

Checklist

  • Tests updated.
  • Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
  • about-versioning.md updated with experimental features.

@aknuds1 aknuds1 force-pushed the arve/upgrade-mimir-prometheus branch 22 times, most recently from cb6d823 to a1b4f48 Compare November 7, 2024 16:53
@aknuds1 aknuds1 changed the title WIP: Upgrade to latest mimir-prometheus@main Upgrade to latest mimir-prometheus@main Nov 8, 2024
@aknuds1 aknuds1 force-pushed the arve/upgrade-mimir-prometheus branch from a1b4f48 to 6a3bfe1 Compare November 8, 2024 10:19
@bboreham
Copy link
Contributor

bboreham commented Nov 8, 2024

To address one small set of test failures: #9854
(The number changes because Prometheus 3.0 changed a window like rate ... [1m] from including both ends to excluding the left-hand end (it is "left-open")).

@aknuds1 aknuds1 force-pushed the arve/upgrade-mimir-prometheus branch 5 times, most recently from 71feed6 to 69c0bd2 Compare November 11, 2024 09:45
charleskorn and others added 16 commits November 22, 2024 14:54
* Fix failing tests due to left-open range change

* Set lookback delta for `TestSplitQueryByInterval` test cases, and fix expectations to match left-open range change

* Update querier tests to match new behaviour
Signed-off-by: Arve Knudsen <[email protected]>
Copy link
Contributor

@jhesketh jhesketh left a comment

Choose a reason for hiding this comment

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

I've reviewed the changes to pkg/streamingpromql and those lgtm. I have not reviewed in detail the rest of the changes, but they also look good at a glance.

Signed-off-by: Arve Knudsen <[email protected]>
@aknuds1 aknuds1 force-pushed the arve/upgrade-mimir-prometheus branch from 05a17d8 to 1d0ea03 Compare November 25, 2024 09:36
@aknuds1 aknuds1 marked this pull request as ready for review November 25, 2024 09:43
@aknuds1 aknuds1 requested review from stevesg, grafanabot and a team as code owners November 25, 2024 09:43
Signed-off-by: Arve Knudsen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants