-
Notifications
You must be signed in to change notification settings - Fork 1.3k
wolfi: cadvisor entrypoint #54809
wolfi: cadvisor entrypoint #54809
Conversation
|
Codenotify: Notifying subscribers in CODENOTIFY files for diff 76630f0...9a7d438.
|
|
The current wolfi-images/cadvisor.yaml actually uses the chainguard cadvisor package rather than our built-from-source version. I switched it during development as Chainguard added cadvisor to their repo but didn't remove our custom config. If you want to switch back to our custom package, you can change this line to |
willdollman
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See note about Sourcegraph vs Wolfi cadvisor package, but if it's working as-is then I guess it doesn't need to be changed. Thanks for investigating @davejrt 🎉
Both with the same result...so it's better we continue using the chainguard version. They released 0.47.3 yesterday so I've rebuilt and upgraded us, retested and everything looks good. I'm removing the reference to the package to avoid any confusion going forward. |
|
thank you! can we backport this to 5.1 as well? |
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.1 5.1
# Navigate to the new working tree
cd .worktrees/backport-5.1
# Create a new branch
git switch --create backport-54809-to-5.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 054439411834940cf45f1e5afa4e5c72722d439d
# Push it to GitHub
git push --set-upstream origin backport-54809-to-5.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.1Then, create a pull request where the |
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)
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
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):
Closes https://github.com/sourcegraph/devx-support/issues/68
Test plan
Tested on scaletesting.sgdev.org
vs sourcegraph.com