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

Vendor latest mimir-prometheus #2176

Merged
merged 4 commits into from
Jun 23, 2022
Merged

Vendor latest mimir-prometheus #2176

merged 4 commits into from
Jun 23, 2022

Conversation

codesome
Copy link
Member

What this PR does

Vendors the latest main branch of mimir-prometheus which brings in the support for out of order samples (was merged into main here). This PR only vendors the Prometheus. We will open separate PRs to add out of order support in the main branch here.

Checklist

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

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
@codesome
Copy link
Member Author

cc @jesusvazquez

Copy link
Member

@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.

Updating mimir-prometheus lgtm, but I'm not familiar with OOO code :-(

@pstibrany
Copy link
Member

Note that ChunkReader.Chunk method has changed to

	Chunk(ref chunks.Meta) (chunkenc.Chunk, error)

which is incompatible with vendored Thanos code. Unless you can get mimir-prometheus into Thanos, this isn't going to work.

@jesusvazquez
Copy link
Member

@pstibrany We just remembered this, it was something we did early in the development and we forgot, we had to fork thanos to change that interface update https://github.com/jesusvazquez/thanos/

We did so based on the version that was vendored from mimir and just changed the interface and the ocurrences. We could keep it updated.

Is there a way we can make the fork work until we can upstream the out of order changes to prometheus and then update thanos?

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
@codesome
Copy link
Member Author

@pstibrany I have updated the Thanos dependency with https://github.com/jesusvazquez/thanos/commits/out-of-order, which has a 4 line change on top of Thanos commit that we use in Mimir. Once out of order support is upstreamed, and Thanos has vendored it, we will be able to remove this override. Does that sound fine?

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
@codesome
Copy link
Member Author

I see that we have https://github.com/grafana/thanos, I will make it part of that so that anyone can update it.

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
@codesome codesome mentioned this pull request Jun 23, 2022
3 tasks
Copy link
Member

@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.

Thank you.

@pstibrany pstibrany merged commit 354882d into main Jun 23, 2022
@pstibrany pstibrany deleted the codesome/ven-new-prom branch June 23, 2022 08:53
jesusvazquez pushed a commit that referenced this pull request Jun 28, 2022
* Vendor latest mimir-prometheus

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Update Thanos with a fork

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix CI/build

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Use thanos from grafana/thanos

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
masonmei pushed a commit to udmire/mimir that referenced this pull request Jul 11, 2022
* Vendor latest mimir-prometheus

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Update Thanos with a fork

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix CI/build

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Use thanos from grafana/thanos

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.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.

None yet

3 participants