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

[MAISTRA-2096] Update Prometheus to 2.24 (OpenShift 4.7 version) #9

Merged
merged 19 commits into from
Sep 10, 2021

Conversation

brian-avery
Copy link

@brian-avery brian-avery commented Aug 12, 2021

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:

The go.census issue lists a workaround that I will add to our code.


EndpointsDiscovery lists some failures that I'm looking into

@brian-avery brian-avery changed the title Update Prometheus to 2.24 (OpenShift 4.7 version) [WIP] Update Prometheus to 2.24 (OpenShift 4.7 version) Aug 12, 2021
@brian-avery
Copy link
Author

/test prometheus-test

@maistra maistra deleted a comment from maistra-bot Aug 16, 2021
@brian-avery
Copy link
Author

/test prometheus-test

@brian-avery
Copy link
Author

brian-avery commented Aug 17, 2021

9f78547

goleak.VerifyTestMain enables the Uber's go leak tester. Still investigating this, but when it is run with the Kubernetes tests, the endpoint tests time out. Disabling this causes the endpoint tests to pass.

@brian-avery
Copy link
Author

/test prometheus-test

1 similar comment
@brian-avery
Copy link
Author

/test prometheus-test

@brian-avery brian-avery changed the title [WIP] Update Prometheus to 2.24 (OpenShift 4.7 version) Update Prometheus to 2.24 (OpenShift 4.7 version) Aug 19, 2021
@brian-avery brian-avery changed the title Update Prometheus to 2.24 (OpenShift 4.7 version) [MAISTRA-2096] Update Prometheus to 2.24 (OpenShift 4.7 version) Aug 20, 2021
.github/config.yml Outdated Show resolved Hide resolved
.mergify.yml Outdated Show resolved Hide resolved
cmd/prometheus/logWrapper.go Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
util/testutil/testing.go Outdated Show resolved Hide resolved
@brian-avery
Copy link
Author

/test prometheus-test

@brian-avery
Copy link
Author

/retest

@maistra-bot maistra-bot merged commit a58b3e4 into maistra:maistra-2.1 Sep 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants