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 Prometheus to v0.41.0 #6010

Merged
merged 5 commits into from Jan 14, 2023

Conversation

rabenhorst
Copy link
Contributor

@rabenhorst rabenhorst commented Jan 2, 2023

Signed-off-by: Sebastian Rabenhorst sebastian.rabenhorst@shopify.com

Upgrade Prometheus to version v0.41.0 and fixed binary reader so it works with optimized posting offset table reading (prometheus/prometheus#11535).

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

  • Upgrade Prometheus to v0.41.0

Verification

@rabenhorst rabenhorst changed the title Updat Prometheus to v0.41.0 Upgrade Prometheus to v0.41.0 Jan 2, 2023
@rabenhorst rabenhorst marked this pull request as ready for review January 2, 2023 12:14
if err := index.ReadOffsetTable(r.b, r.toc.PostingsOffsetTable, func(key []string, off uint64, _ int) error {
if len(key) != 2 {
return errors.Errorf("unexpected key length for posting table %d", len(key))
if err := index.ReadPostingsOffsetTable(r.b, r.toc.PostingsOffsetTable, func(name, value []byte, postingsOffset uint64, _ int) error {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this taken from Prometheus?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fpetkovski
fpetkovski previously approved these changes Jan 9, 2023
yeya24
yeya24 previously approved these changes Jan 11, 2023
Copy link
Contributor

@yeya24 yeya24 left a comment

Choose a reason for hiding this comment

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

Thanks. Let's fix the conflicts and we can merge the pr.

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>
Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>
Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>
Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>
@rabenhorst
Copy link
Contributor Author

Thanks. Let's fix the conflicts and we can merge the pr.

Done.

@saswatamcode saswatamcode merged commit 99dc31d into thanos-io:main Jan 14, 2023
Kartik-Garg pushed a commit to infracloudio/thanos that referenced this pull request Jan 16, 2023
* Updated Prometheus to v0.41.0

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

* Added changelog entry

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

* Fixed tsOverrideAppender GetRef

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

* ran go mot tidy

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>
Signed-off-by: Kartik-Garg <kartik.garg@infracloud.io>
ngraham20 pushed a commit to ngraham20/thanos that referenced this pull request Apr 17, 2023
* Updated Prometheus to v0.41.0

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

* Added changelog entry

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

* Fixed tsOverrideAppender GetRef

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

* ran go mot tidy

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>
ngraham20 pushed a commit to ngraham20/thanos that referenced this pull request Apr 17, 2023
* Updated Prometheus to v0.41.0

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

* Added changelog entry

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

* Fixed tsOverrideAppender GetRef

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

* ran go mot tidy

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>
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.

None yet

4 participants