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

Bump to latest mimir-prometheus #10383

Merged
merged 6 commits into from
Jan 9, 2025

Conversation

julienduchesne
Copy link
Member

@julienduchesne julienduchesne commented Jan 8, 2025

Version synced here: grafana/mimir-prometheus#818

The only problem I had was with this PR from prometheus: prometheus/prometheus#15686. I had to fix some tests and implement the same fix in our MQE deriv function: cd4912e

What this PR does

Which issue(s) this PR fixes or relates to

Fixes #

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.

Fix everything related to prometheus/prometheus#15686

We don't support `double_exponential_smoothing` and `predict_linear`, but `deriv` needs to emit a new annotation
@julienduchesne julienduchesne marked this pull request as ready for review January 9, 2025 02:13
@julienduchesne julienduchesne requested review from stevesg, grafanabot and a team as code owners January 9, 2025 02:13
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 MQE related changes, and they look good to me sans, the removal in engine_test

pkg/streamingpromql/engine_test.go Outdated Show resolved Hide resolved
@julienduchesne julienduchesne requested a review from a team January 9, 2025 13:12
Copy link
Member

@ArthurSens ArthurSens left a comment

Choose a reason for hiding this comment

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

Just a typo, otherwise LGTM

pkg/distributor/otel.go Outdated Show resolved Hide resolved
@julienduchesne julienduchesne merged commit a0fb2f5 into main Jan 9, 2025
29 checks passed
@julienduchesne julienduchesne deleted the julienduchesne/latest-mimir-prometheus branch January 9, 2025 15:17
julienduchesne added a commit that referenced this pull request Jan 10, 2025
Same fix as prometheus/prometheus#15711 and similar to what was done during the last sync: #10383
julienduchesne added a commit that referenced this pull request Jan 10, 2025
* Update to latest mimir-prometheus
Also implement new rule concurrency interface from prometheus/prometheus#15681

* MQE: Pull new functions test and fix _over_time functions
Same fix as prometheus/prometheus#15711 and similar to what was done during the last sync: #10383

* Linting

* MQE: Use `.Any()` as suggested in PR

* Add CHANGELOG

* Remove sequentialRules, not needed
A nil slice will run rules sequentially

* Address PR comments

* Add test to check that group isn't mutated
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.

4 participants