Skip to content

Conversation

krajorama
Copy link
Contributor

What this PR does

Update mimir-prometheus at grafana/mimir-prometheus@fdf902d

The remote read client interface has changed in prometheus/prometheus#11379
I've updated the users and also added native histogram support to backfill.

Keeps client_golang version as it has some bugs.
prometheus/client_golang#1605
prometheus/client_golang#1607

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
@krajorama krajorama requested a review from charleskorn August 31, 2024 14:55
@krajorama krajorama marked this pull request as ready for review September 2, 2024 05:57
@krajorama krajorama requested review from stevesg, grafanabot and a team as code owners September 2, 2024 05:57
Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

Mimir code changes lgtm. I haven't looked closely at Prom code changes.

Copy link
Contributor

@dimitarvdimitrov dimitarvdimitrov left a comment

Choose a reason for hiding this comment

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

had a look at pkg/querier, ruler, and mimirtool. pkg/distributor seems copied from upstream and I hope someone reviewed it there.

return rdResp.Results[0], nil

res := rdResp.Results[0]
return remote.FromQueryResult(sortSeries, res), nil
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't understand why sortSeries is a parameter now. Did the remote-read API also change? Previously they were supposed to be returned sorted by the server. Are we supposed to pass sortSeries to the server?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

strange

Add changelog.

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

@dimitarvdimitrov dimitarvdimitrov left a comment

Choose a reason for hiding this comment

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

LGTM, thanks

@krajorama krajorama merged commit 61634ee into main Sep 2, 2024
29 checks passed
@krajorama krajorama deleted the krajo/update-prometheus-no-client-golang branch September 2, 2024 11:30
grafanabot pushed a commit that referenced this pull request Sep 2, 2024
#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)
krajorama added a commit that referenced this pull request Sep 2, 2024
#9156) (#9176)

* 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)

Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
julienduchesne added a commit that referenced this pull request Dec 19, 2024
Since #9156 probably, all the remote read commands return no data

I added a missing error return using `timeseries.Err()` and got this error: `mimirtool: error: chunkedReader: message size exceeded the limit 0 bytes; got: 361 bytes, try --help`
which lead me to find that we need to pass in `ChunkedReadLimit` on the client

I set it at a default 1 MiB and configurable through a flag
julienduchesne added a commit that referenced this pull request Dec 19, 2024
* fix(mimirtool): Make remote-read actually return data
Since #9156 probably, all the remote read commands return no data

I added a missing error return using `timeseries.Err()` and got this error: `mimirtool: error: chunkedReader: message size exceeded the limit 0 bytes; got: 361 bytes, try --help`
which lead me to find that we need to pass in `ChunkedReadLimit` on the client

I set it at a default 1 MiB and configurable through a flag

* CHANGELOG

* Add other missing error

* Update default read limit

* Update pkg/mimirtool/commands/remote_read.go

Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

---------

Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
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