Skip to content

Commit 06a1e02

Browse files
powersjpowersj
authored
telegraf: add NET_RAW and NET_BIND_SERVICE capabilities (#552)
1 parent ced629c commit 06a1e02

File tree

16 files changed

+32
-16
lines changed

16 files changed

+32
-16
lines changed

‎telegraf/1.18/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM buildpack-deps:buster-curl
22

33
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
4-
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
4+
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors libcap2-bin && \
55
rm -rf /var/lib/apt/lists/*
66

77
RUN set -ex && \
@@ -26,7 +26,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
2626
wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
2727
gpg --batch --verify telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb.asc telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
2828
dpkg -i telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
29-
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf && \
3029
rm -f telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb*
3130

3231
EXPOSE 8125/udp 8092/udp 8094

‎telegraf/1.18/alpine/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM alpine:3.14
22

33
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4-
RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec && \
4+
RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap && \
55
update-ca-certificates
66

77
ENV TELEGRAF_VERSION 1.18.3
@@ -23,7 +23,6 @@ RUN set -ex && \
2323
mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \
2424
mkdir /etc/telegraf/telegraf.d && \
2525
cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \
26-
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf && \
2726
gpgconf --kill all && \
2827
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
2928
apk del .build-deps && \

‎telegraf/1.18/alpine/entrypoint.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/bin/sh
22
set -e
33

4+
# Allow telegraf to send ICMP packets and bind to privliged ports
5+
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf
6+
47
if [ "${1:0:1}" = '-' ]; then
58
set -- telegraf "$@"
69
fi

‎telegraf/1.18/entrypoint.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/bin/bash
22
set -e
33

4+
# Allow telegraf to send ICMP packets and bind to privliged ports
5+
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf
6+
47
if [ "${1:0:1}" = '-' ]; then
58
set -- telegraf "$@"
69
fi

‎telegraf/1.19/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM buildpack-deps:buster-curl
22

33
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
4-
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
4+
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors libcap2-bin && \
55
rm -rf /var/lib/apt/lists/*
66

77
RUN set -ex && \
@@ -26,7 +26,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
2626
wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
2727
gpg --batch --verify telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb.asc telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
2828
dpkg -i telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
29-
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf && \
3029
rm -f telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb*
3130

3231
EXPOSE 8125/udp 8092/udp 8094

‎telegraf/1.19/alpine/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM alpine:3.14
22

33
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4-
RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec && \
4+
RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap && \
55
update-ca-certificates
66

77
ENV TELEGRAF_VERSION 1.19.3
@@ -23,7 +23,6 @@ RUN set -ex && \
2323
mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \
2424
mkdir /etc/telegraf/telegraf.d && \
2525
cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \
26-
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf && \
2726
gpgconf --kill all && \
2827
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
2928
apk del .build-deps && \

‎telegraf/1.19/alpine/entrypoint.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/bin/sh
22
set -e
33

4+
# Allow telegraf to send ICMP packets and bind to privliged ports
5+
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf
6+
47
if [ "${1:0:1}" = '-' ]; then
58
set -- telegraf "$@"
69
fi

‎telegraf/1.19/entrypoint.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/bin/bash
22
set -e
33

4+
# Allow telegraf to send ICMP packets and bind to privliged ports
5+
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf
6+
47
if [ "${1:0:1}" = '-' ]; then
58
set -- telegraf "$@"
69
fi

‎telegraf/1.20/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM buildpack-deps:buster-curl
22

33
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
4-
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
4+
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors libcap2-bin && \
55
rm -rf /var/lib/apt/lists/*
66

77
RUN set -ex && \
@@ -26,7 +26,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
2626
wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
2727
gpg --batch --verify telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb.asc telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
2828
dpkg -i telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
29-
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf && \
3029
rm -f telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb*
3130

3231
EXPOSE 8125/udp 8092/udp 8094

‎telegraf/1.20/alpine/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM alpine:3.14
22

33
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4-
RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec && \
4+
RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap && \
55
update-ca-certificates
66

77
ENV TELEGRAF_VERSION 1.20.4
@@ -23,7 +23,6 @@ RUN set -ex && \
2323
mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \
2424
mkdir /etc/telegraf/telegraf.d && \
2525
cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \
26-
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf && \
2726
gpgconf --kill all && \
2827
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
2928
apk del .build-deps && \

0 commit comments

Comments
 (0)