[MAISTRA-2096] Update Prometheus to 2.24 (OpenShift 4.7 version) #10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…etheus into maistra-2.1-4.7
brian-avery
changed the title
jwendell
approved these changes
Sep 10, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've updated maistra/prometheus/maistra-2.1 to match the OpenShift release-4.7 branch. This cherrypicks all of our Prometheus commits on top of that. In the process:
XNS Informers has replaced the multilistwatcher code
lots of dependencies have been updated in go.mod
The SimonPasquier logging library that Prometheus uses is not compatible with the Kubernetes logger that Istio uses (they implement different interfaces). It's hacky, but the best solution I could find was to create an adapter to satisfy the interfaces. See logwrapper.go for more detail
To test this, I've deployed a 2.1 control plane with bookinfo, pushed traffic through and confirmed that I'm able to fetch metrics using the Prometheus UI. I then updated this to my image containing these changes and pushed more traffic through, again confirming that it shows up on the Prometheus UI
The multitenancy commit didn't apply cleanly (refactoring of discovery.go and manager.go), but switching to XNS informers helped. Other issues where go.mod had to be massaged. This picks up 2 years worth of Prometheus commits as well.
Make test detects leaks in:
klog-v2 -- known issue here gorutine leak during tests kubernetes/client-go#900 and here go routine created on flush logs has a leak. kubernetes/klog#188
go.opencensus.io -- known issue here goroutine leak detected census-instrumentation/opencensus-go#1191
The go.census issue lists a workaround that I will add to our code.