Skip to content

Conversation

grafanabot
Copy link
Contributor

Backport 61634ee from #9156

#9156)

* Update mimir-prometheus

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* DefaultChunkedReadLimit was moved from storage to config

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* Adopt to new remote read client interface

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* Update otlp generate code

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* OTLP: ignore annotations for now

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* Remote read Content-Type unset in tests

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* Use client_golang 1.19.1

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* Update engine test cases from upstream

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* Mark unsupported engine expressions

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* Disable test that assumes the newly added `promql-delayed-name-removal` flag is enabled

* Re-enable running MQE test cases against Prometheus' engine now that prometheus/prometheus#14611 has been merged

* Updates due to review

Add changelog.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

---------

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Co-authored-by: Charles Korn <charles.korn@grafana.com>
(cherry picked from commit 61634ee)
@grafanabot grafanabot requested review from stevesg and a team as code owners September 2, 2024 13:22
@grafanabot grafanabot requested a review from krajorama September 2, 2024 13:22
Copy link
Contributor

@krajorama krajorama left a comment

Choose a reason for hiding this comment

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

no conflict backport

@krajorama krajorama enabled auto-merge (squash) September 2, 2024 13:25
@krajorama krajorama merged commit 5dc4593 into r306 Sep 2, 2024
31 checks passed
@krajorama krajorama deleted the backport-9156-to-r306 branch September 2, 2024 13:42
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.

2 participants