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

Merged
merged 45 commits into from
Nov 27, 2024

Conversation

aknuds1
Copy link
Contributor

@aknuds1 aknuds1 commented Nov 6, 2024

What this PR does

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

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

TODO:

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
@aknuds1 aknuds1 added the chore label Nov 27, 2024
@aknuds1 aknuds1 force-pushed the arve/upgrade-mimir-prometheus branch from 1d21d67 to a5035ca Compare November 27, 2024 06:00
@aknuds1 aknuds1 force-pushed the arve/upgrade-mimir-prometheus branch from a5035ca to 687c249 Compare November 27, 2024 06:13
Signed-off-by: Arve Knudsen <[email protected]>
Signed-off-by: Arve Knudsen <[email protected]>
Signed-off-by: Arve Knudsen <[email protected]>
Signed-off-by: Arve Knudsen <[email protected]>
@aknuds1 aknuds1 force-pushed the arve/upgrade-mimir-prometheus branch from dd6d215 to 22e1ab7 Compare November 27, 2024 08:15
Signed-off-by: Arve Knudsen <[email protected]>
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
// ExtendPromQL enriches PromQL with Mimir extensions.
func ExtendPromQL() {
// Keep an alias for users using holt_winters, even though dropped in Prometheus v3.
promql.FunctionCalls["holt_winters"] = promql.FunctionCalls["double_exponential_smoothing"]
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we start a deprecation path for this function?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know, I don't think we discussed it. Could you remind me of how to do so?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Discussed offline that we'll discuss eventual deprecation after this PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

We have a list of deprecated features in about-versioning.md. Anyway, not blocking this PR on that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @colega!

aknuds1 and others added 7 commits November 27, 2024 11:11
Signed-off-by: Arve Knudsen <[email protected]>
Signed-off-by: Arve Knudsen <[email protected]>
Signed-off-by: Arve Knudsen <[email protected]>
Co-authored-by: Oleg Zaytsev <[email protected]>
Co-authored-by: Oleg Zaytsev <[email protected]>
Signed-off-by: Arve Knudsen <[email protected]>
Signed-off-by: Arve Knudsen <[email protected]>
@aknuds1 aknuds1 requested a review from colega November 27, 2024 10:36
@aknuds1 aknuds1 enabled auto-merge (squash) November 27, 2024 11:56
@aknuds1 aknuds1 merged commit 39dd512 into main Nov 27, 2024
29 checks passed
@aknuds1 aknuds1 deleted the arve/upgrade-mimir-prometheus branch November 27, 2024 12:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants