Skip to content

Upgrade Prometheus #4176

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

Merged
merged 2 commits into from
May 13, 2021
Merged

Conversation

pracucci
Copy link
Contributor

What this PR does:
In this PR I'm upgrading Prometheus and some related deps.

Changes to Prometheus LGTM. Basically it was introduced the exemplars support to remote write. I double checked the Exemplar message definition in our cortex.proto and matches with the definitive one in Prometheus. This Prometheus upgrade also includes the panic fix we've done in prometheus/prometheus#8723.

Other upgraded dependencies:

-       github.com/aws/aws-sdk-go v1.38.3
+       github.com/aws/aws-sdk-go v1.38.35

Checked the CHANGELOG and there's no significant update impacting Cortex.

-       github.com/golang/protobuf v1.4.3
+       github.com/golang/protobuf v1.5.2

The minor version bump from 1.4 to 1.5 has been done because ptypes have been deprecated and it depends on protobuf 1.26.0.

-       github.com/json-iterator/go v1.1.10
+       github.com/json-iterator/go v1.1.11

Bug fix release.

-       github.com/uber/jaeger-client-go v2.25.0+incompatible
+       github.com/uber/jaeger-client-go v2.28.0+incompatible

Checked the CHANGELOG and nothing particular pops up to my eyes, except for the HTTPSamplingStrategyFetcher fix done by Joe. Because of this, I've rolled back #4134.

-       google.golang.org/api v0.42.0
+       google.golang.org/api v0.46.0

Checked the release notes and LGTM.

-       google.golang.org/grpc v1.36.0
+       google.golang.org/grpc v1.37.0

Checked the release notes and changes shouldn't affect Cortex.

Which issue(s) this PR fixes:
Fixes #3907

Checklist

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

Signed-off-by: Marco Pracucci <[email protected]>
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.

👍

Signed-off-by: Marco Pracucci <[email protected]>
@@ -226,7 +226,7 @@ func TestIngester_v2Push(t *testing.T) {

# HELP cortex_ingester_tsdb_exemplar_last_exemplars_timestamp_seconds The timestamp of the oldest exemplar stored in circular storage. Useful to check for what time range the current exemplar buffer limit allows. This usually means the last timestamp for all exemplars for a typical setup. This is not true though if one of the series timestamp is in future compared to rest series.
# TYPE cortex_ingester_tsdb_exemplar_last_exemplars_timestamp_seconds gauge
cortex_ingester_tsdb_exemplar_last_exemplars_timestamp_seconds{user="test"} 1000
cortex_ingester_tsdb_exemplar_last_exemplars_timestamp_seconds{user="test"} 1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This has been fixed in TSDB. Previously was incorrectly in the milliseconds unit instead of seconds.

@pracucci pracucci enabled auto-merge (squash) May 13, 2021 08:00
@pracucci pracucci merged commit 0c091e6 into cortexproject:master May 13, 2021
@pracucci pracucci deleted the upgrade-prometheus branch May 13, 2021 08:28
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.

Ingester segfault when querying chunks while head chunks a truncated
2 participants