This repository was archived by the owner on Sep 30, 2024. It is now read-only.
[Backport 5.1] wolfi: cadvisor entrypoint (#54809) #54870
Merged
Conversation
This file contains hidden or 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
Fixes the cadvisor entry point, which was being split onto new lines, meaning we were dropping some metrics like memory as reported by @michaellzc. As part of the testing I tried just downloading the binary from github, rather than building it from scratch. That didn't turn out to the final solution so that's an OPTIONAL leave in, but to me seems like an easier approach than compiling ourselves. With a rebuild of the base image we're also now running cadvisor 0.47.3 Old (working): ``` "Entrypoint": [ .... "-enable_metrics=cpu,diskIO,memory,network", .... ], ``` New (broken): ``` "Entrypoint": [ "/usr/bin/cadvisor", .... "-enable_metrics=cpu", "diskIO", "memory", "network", .... ``` Tested on scaletesting.sgdev.org <img width="1121" alt="image" src="https://github.com/sourcegraph/sourcegraph/assets/2067825/bedfbe7e-b83c-4a09-8527-5143412cb533"> vs sourcegraph.com <img width="692" alt="image" src="https://github.com/sourcegraph/sourcegraph/assets/2067825/0b221909-8c80-4665-9e28-59ba6e6a4722"> (cherry picked from commit 0544394)
Contributor
|
Codenotify: Notifying subscribers in CODENOTIFY files for diff cd1cc2d...85e1d85.
|
davejrt
approved these changes
Jul 12, 2023
Contributor
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes the cadvisor entry point, which was being split onto new lines, meaning we were dropping some metrics like memory as reported by @michaellzc.
As part of the testing I tried just downloading the binary from github, rather than building it from scratch. That didn't turn out to the final solution so that's an OPTIONAL leave in, but to me seems like an easier approach than compiling ourselves.
With a rebuild of the base image we're also now running cadvisor 0.47.3
Old (working):
New (broken):
Tested on scaletesting.sgdev.org
vs sourcegraph.com
(cherry picked from commit 0544394)
Test plan