Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 55ca3f7

Browse files
authored
[Backport 5.1] wolfi: cadvisor entrypoint (#54809) (#54870)
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
1 parent cd1cc2d commit 55ca3f7

File tree

5 files changed

+32
-90
lines changed

5 files changed

+32
-90
lines changed

dev/oci_deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def oci_deps():
2424

2525
oci_pull(
2626
name = "wolfi_cadvisor_base",
27-
digest = "sha256:2e5aec9ba5a4835b4c35103bd27ad2ad3e65a064ec5001a35168044dd8c06a4a",
27+
digest = "sha256:39f800ff006bbe579c71eaecc0157d5a57c7e2c0b11ba7a262eb8aec9fd848e0",
2828
image = "us.gcr.io/sourcegraph-dev/wolfi-cadvisor-base",
2929
)
3030

docker-images/cadvisor/BUILD.bazel

Lines changed: 18 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/sh
2+
/usr/bin/cadvisor \
3+
-enable_metrics=cpu,memory,disk,network \
4+
-logtostderr \
5+
-port=48080 \
6+
-docker_only \
7+
-housekeeping_interval=10s \
8+
-max_housekeeping_interval=15s \
9+
-event_storage_event_limit=default=0 \
10+
-v=3 \
11+
-event_storage_age_limit=default=0 \
12+
-containerd=/var/run/containerd/containerd.sock

wolfi-images/cadvisor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ contents:
99
## cadvisor dependencies
1010
- cadvisor
1111

12-
# MANUAL REBUILD: Wed Jun 14 15:27:52 BST 2023
12+
# MANUAL REBUILD: Wed Jul 12 08:42:56 -05 2023

wolfi-packages/cadvisor.yaml

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)