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 Cortex, Prometheus and Thanos #4830

Merged
merged 5 commits into from
Nov 26, 2021

Conversation

pracucci
Copy link
Contributor

What this PR does / why we need it:
I'm in the process of upgrading Cortex and Prometheus in a downstream project (Grafana Enterprise Metrics). Unfortunately we can't upgrade it until we upgrade it in Loki too due to some breaking changes done both in Cortex and Prometheus.

Breaking changes:

How I addressed the changes:

  • Cortex: request headers to foward
    • Do not forward any request header (previous logic is preserved, we didn't forward any request header)
  • Prometheus: moved some packages
    • I just renamed the imports
  • Prometheus: defined data types for series ref
    • I kept the same pattern used in Prometheus: in-memory series ref have been converted to chunks.HeadSeriesRef while when working with TSDB interfaces I used storage.SeriesRef (Prometheus TSDB does the same). Again, both types are uint64 and Loki was using uint64 before so I don't expect any logic change.

Which issue(s) this PR fixes:
N/A

Special notes for your reviewer:

Checklist

  • Documentation added
  • Tests updated
  • Add an entry in the CHANGELOG.md about the changes.

@pracucci pracucci requested a review from a team as a code owner November 26, 2021 08:34
Signed-off-by: Marco Pracucci <[email protected]>
@pracucci
Copy link
Contributor Author

pracucci commented Nov 26, 2021

I'm investigating the failing TestIngesterWALReplaysUnorderedToOrdered.

@pracucci
Copy link
Contributor Author

I'm investigating the failing TestIngesterWALReplaysUnorderedToOrdered.

Fixed in this commit: db2c5ff

@pracucci
Copy link
Contributor Author

github.com/thanos-io/thanos/pkg/httpconfig

vendor/github.com/thanos-io/thanos/pkg/httpconfig/http.go:94:28: constant 90000000000 overflows int
vendor/github.com/thanos-io/thanos/pkg/httpconfig/http.go:95:28: constant 10000000000 overflows int
vendor/github.com/thanos-io/thanos/pkg/httpconfig/http.go:97:28: constant 10000000000 overflows int

I'm on it.

Signed-off-by: Marco Pracucci <[email protected]>
Copy link
Contributor

@dannykopping dannykopping 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 a lot @pracucci
Once you've resolved that overflow issue and CI passes, please ping me and I'll merge

Signed-off-by: Marco Pracucci <[email protected]>
@cyriltovena cyriltovena merged commit c53457f into grafana:main Nov 26, 2021
@pracucci pracucci deleted the upgrade-prometheus branch November 26, 2021 11:30
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.

3 participants