Telegraf v1.21.1

[reimda]

This release has the fix to use setcap only when running as root (influxdata/influxdata-docker#558). Thanks @yosifkit for all your great reviews!

[github-actions]

Diff for ac9fbb4:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 02fe9d4..800e85a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,13 +1,6 @@
 Maintainers: David Reimschussel <dreimschussel@influxdata.com> (@reimda), Josh Powers <jpowers@influxdata.com> (@powersj), Mya Longmire <mlongmire@influxdata.com> (@MyaLongmire)
 GitRepo: https://github.com/influxdata/influxdata-docker.git
-GitCommit: 725fae95efff8850004099d569d0e2360d95e854
-
-Tags: 1.18, 1.18.3
-Architectures: amd64, arm32v7, arm64v8
-Directory: telegraf/1.18
-
-Tags: 1.18-alpine, 1.18.3-alpine
-Directory: telegraf/1.18/alpine
+GitCommit: a640cf9bb1fd9fc8d301bc1a441cdc0330bb31e1
 
 Tags: 1.19, 1.19.3
 Architectures: amd64, arm32v7, arm64v8
@@ -16,9 +9,16 @@ Directory: telegraf/1.19
 Tags: 1.19-alpine, 1.19.3-alpine
 Directory: telegraf/1.19/alpine
 
-Tags: 1.20, 1.20.4, latest
+Tags: 1.20, 1.20.4
 Architectures: amd64, arm32v7, arm64v8
 Directory: telegraf/1.20
 
-Tags: 1.20-alpine, 1.20.4-alpine, alpine
+Tags: 1.20-alpine, 1.20.4-alpine
 Directory: telegraf/1.20/alpine
+
+Tags: 1.21, 1.21.1, latest
+Architectures: amd64, arm32v7, arm64v8
+Directory: telegraf/1.21
+
+Tags: 1.21-alpine, 1.21.1-alpine, alpine
+Directory: telegraf/1.21/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 030e57f..433ccc2 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,3 @@
-telegraf:1.18
-telegraf:1.18-alpine
-telegraf:1.18.3
-telegraf:1.18.3-alpine
 telegraf:1.19
 telegraf:1.19-alpine
 telegraf:1.19.3
@@ -10,5 +6,9 @@ telegraf:1.20
 telegraf:1.20-alpine
 telegraf:1.20.4
 telegraf:1.20.4-alpine
+telegraf:1.21
+telegraf:1.21-alpine
+telegraf:1.21.1
+telegraf:1.21.1-alpine
 telegraf:alpine
 telegraf:latest
diff --git a/telegraf_1.19.3-alpine/Dockerfile b/telegraf_1.19.3-alpine/Dockerfile
index 51522e0..b903297 100644
--- a/telegraf_1.19.3-alpine/Dockerfile
+++ b/telegraf_1.19.3-alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.14
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
-RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec && \
+RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap && \
     update-ca-certificates
 
 ENV TELEGRAF_VERSION 1.19.3
diff --git a/telegraf_1.19.3-alpine/entrypoint.sh b/telegraf_1.19.3-alpine/entrypoint.sh
index 1569cd2..ab76d7f 100755
--- a/telegraf_1.19.3-alpine/entrypoint.sh
+++ b/telegraf_1.19.3-alpine/entrypoint.sh
@@ -8,5 +8,8 @@ fi
 if [ "$(id -u)" -ne 0 ]; then
     exec "$@"
 else
+    # Allow telegraf to send ICMP packets and bind to privliged ports
+    setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf
+
     exec su-exec telegraf "$@"
 fi
diff --git a/telegraf_1.19.3/Dockerfile b/telegraf_1.19.3/Dockerfile
index 13dfb7a..61ef483 100644
--- a/telegraf_1.19.3/Dockerfile
+++ b/telegraf_1.19.3/Dockerfile
@@ -1,7 +1,7 @@
 FROM buildpack-deps:buster-curl
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors libcap2-bin && \
     rm -rf /var/lib/apt/lists/*
 
 RUN set -ex && \
diff --git a/telegraf_1.19.3/entrypoint.sh b/telegraf_1.19.3/entrypoint.sh
index df8439e..fc5de0d 100755
--- a/telegraf_1.19.3/entrypoint.sh
+++ b/telegraf_1.19.3/entrypoint.sh
@@ -8,5 +8,8 @@ fi
 if [ $EUID -ne 0 ]; then
     exec "$@"
 else
+    # Allow telegraf to send ICMP packets and bind to privliged ports
+    setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf
+
     exec setpriv --reuid telegraf --init-groups "$@"
 fi
diff --git a/telegraf_1.18.3-alpine/Dockerfile b/telegraf_1.20.4-alpine/Dockerfile
similarity index 95%
rename from telegraf_1.18.3-alpine/Dockerfile
rename to telegraf_1.20.4-alpine/Dockerfile
index 0a65443..f50d2ae 100644
--- a/telegraf_1.18.3-alpine/Dockerfile
+++ b/telegraf_1.20.4-alpine/Dockerfile
@@ -1,10 +1,10 @@
 FROM alpine:3.14
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
-RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec && \
+RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap && \
     update-ca-certificates
 
-ENV TELEGRAF_VERSION 1.18.3
+ENV TELEGRAF_VERSION 1.20.4
 
 RUN set -ex && \
     mkdir ~/.gnupg; \
diff --git a/telegraf_1.18.3-alpine/entrypoint.sh b/telegraf_1.20.4-alpine/entrypoint.sh
similarity index 54%
rename from telegraf_1.18.3-alpine/entrypoint.sh
rename to telegraf_1.20.4-alpine/entrypoint.sh
index 1569cd2..ab76d7f 100755
--- a/telegraf_1.18.3-alpine/entrypoint.sh
+++ b/telegraf_1.20.4-alpine/entrypoint.sh
@@ -8,5 +8,8 @@ fi
 if [ "$(id -u)" -ne 0 ]; then
     exec "$@"
 else
+    # Allow telegraf to send ICMP packets and bind to privliged ports
+    setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf
+
     exec su-exec telegraf "$@"
 fi
diff --git a/telegraf_1.18.3/Dockerfile b/telegraf_1.20.4/Dockerfile
similarity index 93%
rename from telegraf_1.18.3/Dockerfile
rename to telegraf_1.20.4/Dockerfile
index 7c61685..ade4222 100644
--- a/telegraf_1.18.3/Dockerfile
+++ b/telegraf_1.20.4/Dockerfile
@@ -1,7 +1,7 @@
 FROM buildpack-deps:buster-curl
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors libcap2-bin && \
     rm -rf /var/lib/apt/lists/*
 
 RUN set -ex && \
@@ -13,7 +13,7 @@ RUN set -ex && \
         gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
     done
 
-ENV TELEGRAF_VERSION 1.18.3
+ENV TELEGRAF_VERSION 1.20.4
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
     case "${dpkgArch##*-}" in \
       amd64) ARCH='amd64';; \
diff --git a/telegraf_1.18.3/entrypoint.sh b/telegraf_1.20.4/entrypoint.sh
similarity index 56%
rename from telegraf_1.18.3/entrypoint.sh
rename to telegraf_1.20.4/entrypoint.sh
index df8439e..fc5de0d 100755
--- a/telegraf_1.18.3/entrypoint.sh
+++ b/telegraf_1.20.4/entrypoint.sh
@@ -8,5 +8,8 @@ fi
 if [ $EUID -ne 0 ]; then
     exec "$@"
 else
+    # Allow telegraf to send ICMP packets and bind to privliged ports
+    setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf
+
     exec setpriv --reuid telegraf --init-groups "$@"
 fi
diff --git a/telegraf_alpine/Dockerfile b/telegraf_alpine/Dockerfile
index 0c7846d..131b672 100644
--- a/telegraf_alpine/Dockerfile
+++ b/telegraf_alpine/Dockerfile
@@ -1,10 +1,10 @@
 FROM alpine:3.14
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
-RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec && \
+RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap && \
     update-ca-certificates
 
-ENV TELEGRAF_VERSION 1.20.4
+ENV TELEGRAF_VERSION 1.21.1
 
 RUN set -ex && \
     mkdir ~/.gnupg; \
diff --git a/telegraf_alpine/entrypoint.sh b/telegraf_alpine/entrypoint.sh
index 1569cd2..ab76d7f 100755
--- a/telegraf_alpine/entrypoint.sh
+++ b/telegraf_alpine/entrypoint.sh
@@ -8,5 +8,8 @@ fi
 if [ "$(id -u)" -ne 0 ]; then
     exec "$@"
 else
+    # Allow telegraf to send ICMP packets and bind to privliged ports
+    setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf
+
     exec su-exec telegraf "$@"
 fi
diff --git a/telegraf_latest/Dockerfile b/telegraf_latest/Dockerfile
index 67bb07c..b33efa1 100644
--- a/telegraf_latest/Dockerfile
+++ b/telegraf_latest/Dockerfile
@@ -1,7 +1,7 @@
 FROM buildpack-deps:buster-curl
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors libcap2-bin && \
     rm -rf /var/lib/apt/lists/*
 
 RUN set -ex && \
@@ -13,7 +13,7 @@ RUN set -ex && \
         gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
     done
 
-ENV TELEGRAF_VERSION 1.20.4
+ENV TELEGRAF_VERSION 1.21.1
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
     case "${dpkgArch##*-}" in \
       amd64) ARCH='amd64';; \
diff --git a/telegraf_latest/entrypoint.sh b/telegraf_latest/entrypoint.sh
index df8439e..fc5de0d 100755
--- a/telegraf_latest/entrypoint.sh
+++ b/telegraf_latest/entrypoint.sh
@@ -8,5 +8,8 @@ fi
 if [ $EUID -ne 0 ]; then
     exec "$@"
 else
+    # Allow telegraf to send ICMP packets and bind to privliged ports
+    setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf
+
     exec setpriv --reuid telegraf --init-groups "$@"
 fi

Relevant Maintainers:

• telegraf: @reimda @powersj @MyaLongmire