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

chore: Updating Prometheus to v0.40.7 and Thanos to 3327c510076a #5048

Merged
merged 9 commits into from
Jan 11, 2023

Conversation

alanprot
Copy link
Member

@alanprot alanprot commented Dec 16, 2022

Signed-off-by: Alan Protasio [email protected]

What this PR does:
Updating Prometheus to v0.40.7.

This prometheus version contains the native histograms but we are not supporting it for now.

Which issue(s) this PR fixes:
Fixes #

Checklist

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

@alanprot alanprot force-pushed the update-prometheus branch 3 times, most recently from 2d84e46 to b5c8346 Compare December 16, 2022 23:07
@alanprot
Copy link
Member Author

Ok..

Seems we will need to update AM on Thanos:

# github.com/thanos-io/thanos/pkg/httpconfig
vendor/github.com/thanos-io/thanos/pkg/httpconfig/http.go:176:73: not enough arguments in call to config_util.NewTLSRoundTripper
	have (*tls.Config, string, func(tlsConfig *tls.Config) ("net/http".RoundTripper, error))
	want (*tls.Config, string, string, string, func(*tls.Config) ("net/http".RoundTripper, error))
make: *** [cmd/cortex/cortex] Error 2

@yeya24
Copy link
Contributor

yeya24 commented Dec 17, 2022

Seems we will need to update AM on Thanos:

How is that related to AM? Isn't it prometheus/common?

@alanprot
Copy link
Member Author

Yeah.. but the new AM that brought the new Common.

And the old AM is failing cause:

~/w/c/cortex (update-prometheus ⚡→↩) make BUILD_IN_CONTAINER=false
Building cmd/cortex/cortex for amd64
# github.com/prometheus/alertmanager/cluster
vendor/github.com/prometheus/alertmanager/cluster/tls_config.go:26:23: undefined: web.TLSStruct

So i needed to update AM that brought the new Common that broke thanos :)

alanprot and others added 5 commits January 5, 2023 17:35
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
@alanprot alanprot changed the title chore: Updating Prometheus to v0.40.7 and Thanos to 789046ad13fa chore: Updating Prometheus to v0.40.7 and Thanos to 3327c510076a Jan 6, 2023
@alanprot alanprot marked this pull request as ready for review January 6, 2023 02:50
@alanprot alanprot requested a review from yeya24 January 9, 2023 18:02
@songjiayang
Copy link
Contributor

nice job.

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! I think we can update Prometheus to v2.41.0 directly but we can do that in next pr.

@yeya24 yeya24 merged commit 9d44fdf into cortexproject:master Jan 11, 2023
@alanprot alanprot deleted the update-prometheus branch March 27, 2023 16:58
alexqyle pushed a commit to alexqyle/cortex that referenced this pull request May 2, 2023
…texproject#5048)

* Updating Prometheus

Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>

* Breaking changes

Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>

* fix gogo proto

Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>

* Updating AM

Signed-off-by: Alan Protasio <[email protected]>

* rebase

Signed-off-by: Alan Protasio <[email protected]>

* Fix AM breaking change

Signed-off-by: Alan Protasio <[email protected]>

* Make lint happy

Signed-off-by: Alan Protasio <[email protected]>

* Update Doc

Signed-off-by: Alan Protasio <[email protected]>

* Fix AM VictorOps test

Signed-off-by: Alan Protasio <[email protected]>

Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alex Le <[email protected]>
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