Browse Source

Bring eBPF to static binaries (#11709)

thiagoftsm 3 years ago
parent
commit
28881271aa

+ 3 - 3
packaging/ebpf.checksums

@@ -1,3 +1,3 @@
-e5a4e49fcfcb1602aec5c770de773e91918836b24ac7de2d817bc8a6d106dbcf  netdata-kernel-collector-glibc-v0.8.4.tar.xz
-beb57f51c6c8178e9a16f7e8370c55d0f29f20f1d4e9546a5e097e647192514c  netdata-kernel-collector-musl-v0.8.4.tar.xz
-9ee4ca483b7575f9e9c74dc61ec0ab7af3abf1a6404f191e0ac092500842b8a7  netdata-kernel-collector-static-v0.8.4.tar.xz
+7ffd13d0f32df93bc7868a7cf040e75c40a9e041f6bb7f4a591cc6ce71b1cf72  netdata-kernel-collector-glibc-v0.8.6.tar.xz
+05c10d57252941b7f6dbb8a726a243416942c58738015014dd764b4bcb0c2f9c  netdata-kernel-collector-musl-v0.8.6.tar.xz
+2a607729a9093538624a94dfdbf2a3660eb4eb199f86962d38806d8e1e420a71  netdata-kernel-collector-static-v0.8.6.tar.xz

+ 1 - 1
packaging/ebpf.version

@@ -1 +1 @@
-v0.8.4
+v0.8.6

+ 1 - 1
packaging/makeself/build-static.sh

@@ -39,7 +39,7 @@ if ! docker inspect "${DOCKER_CONTAINER_NAME}" > /dev/null 2>&1; then
   # inside the container and runs the script install-alpine-packages.sh
   # (also inside the container)
   #
-  if docker inspect alpine:3.14 > dev/null 2>&1; then
+  if docker inspect alpine:3.14 > /dev/null 2>&1; then
     run docker image remove alpine:3.14
     run docker pull --platform=${platform}  alpine:3.14
   fi

+ 2 - 0
packaging/makeself/install-alpine-packages.sh

@@ -16,10 +16,12 @@ apk add --no-cache -U \
   binutils \
   cmake \
   curl \
+  elfutils-dev \
   gcc \
   git \
   gnutls-dev \
   gzip \
+  libelf-static \
   libmnl-dev \
   libnetfilter_acct-dev \
   libtool \

+ 1 - 1
packaging/makeself/install-or-update.sh

@@ -214,7 +214,7 @@ run chown -R ${NETDATA_USER}:${NETDATA_GROUP} /opt/netdata
 
 progress "fix plugin permissions"
 
-for x in apps.plugin freeipmi.plugin ioping cgroup-network; do
+for x in apps.plugin freeipmi.plugin ioping cgroup-network ebpf.plugin; do
   f="usr/libexec/netdata/plugins.d/${x}"
 
   if [ -f "${f}" ]; then