Skip to content

Commit e5cb62b

Browse files
committed
Telegraf v1.37.0
1 parent 222eeaf commit e5cb62b

File tree

6 files changed

+35
-21
lines changed

6 files changed

+35
-21
lines changed

telegraf/1.34/alpine/entrypoint.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN set -ex && \
1313
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
1414
done
1515

16-
ENV TELEGRAF_VERSION 1.34.4
16+
ENV TELEGRAF_VERSION 1.37.0
1717
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
1818
case "${dpkgArch##*-}" in \
1919
amd64) ARCH='amd64';; \
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM alpine:3.20
1+
FROM alpine:3.22
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 libcap && \
4+
RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata setpriv libcap && \
55
update-ca-certificates
66

7-
ENV TELEGRAF_VERSION 1.34.4
7+
ENV TELEGRAF_VERSION 1.37.0
88

99
RUN ARCH= && \
1010
case "$(apk --print-arch)" in \

telegraf/1.37/alpine/entrypoint.sh

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/sh
2+
set -e
3+
4+
if [ "${1:0:1}" = '-' ]; then
5+
set -- telegraf "$@"
6+
fi
7+
8+
if [ "$(id -u)" -ne 0 ]; then
9+
exec "$@"
10+
else
11+
# Allow telegraf to send ICMP packets and bind to privliged ports
12+
setcap cap_net_raw,cap_net_bind_service+ep /usr/bin/telegraf || echo "Failed to set additional capabilities on /usr/bin/telegraf"
13+
14+
# ensure HOME is set to the telegraf user's home dir
15+
export HOME=$(getent passwd telegraf | cut -d : -f 6)
16+
17+
# honor groups supplied via 'docker run --group-add ...' but drop 'root'
18+
# (also removes 'telegraf' since we unconditionally add it and don't want it listed twice)
19+
# see https://github.com/influxdata/influxdata-docker/issues/724
20+
groups="telegraf"
21+
extra_groups="$(id -Gn || true)"
22+
for group in $extra_groups; do
23+
case "$group" in
24+
root | telegraf) ;;
25+
*) groups="$groups,$group" ;;
26+
esac
27+
done
28+
exec setpriv --reuid telegraf --regid telegraf --groups "$groups" "$@"
29+
fi

telegraf/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"Sunil Kartikey <skartikey@influxdata.com> (@skartikey)"
77
],
88
"versions": [
9-
"1.34",
109
"1.35",
11-
"1.36"
10+
"1.36",
11+
"1.37"
1212
],
1313
"architectures": [
1414
"amd64",

0 commit comments

Comments
 (0)