Prep for future telegraf-less container

sdr-enthusiasts · Oct 31, 2023 · 9a879a6 · 9a879a6
1 parent c9a2a94
commit 9a879a6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/rootfs/etc/s6-overlay/scripts/telegraf b/rootfs/etc/s6-overlay/scripts/telegraf
@@ -3,13 +3,19 @@
 
 set -eo pipefail
 
+# Check if the telegraf binary exists:
+if [[ ! -f /usr/bin/telegraf ]]; then
+  s6wrap --quiet --timestamps --prepend="$(basename "$0")" --args echo "Telegraf not available in this container, use \"image: ghcr.io/sdr-enthusiasts/docker-dump978:telegraf\" instead"
+  sleep infinity
+fi  
+
 if [[ -n "$INFLUXDBURL" ]] || [ -n "$ENABLE_PROMETHEUS" ]; then
 
   #shellcheck disable=SC2016
   exec s6wrap --quiet --timestamps --prepend="$(basename "$0")" --args telegraf \
     --config /etc/telegraf/telegraf.conf \
     --config-directory /etc/telegraf/telegraf.d \
-
+    | grep -v "Error in plugin"
 else
   sleep infinity
 fi
diff --git a/rootfs/etc/s6-overlay/scripts/telegraf_socat b/rootfs/etc/s6-overlay/scripts/telegraf_socat
@@ -6,6 +6,11 @@
 
 set -eo pipefail
 
+# Check if the telegraf binary exists:
+if [[ ! -f /usr/bin/telegraf ]]; then
+  sleep infinity
+fi 
+
 if [ -z "$INFLUXDB_SKIP_AIRCRAFT" ] && { [ -n "$INFLUXDBURL" ] || [ -n "$ENABLE_PROMETHEUS" ]; } then
 
   SOCAT_BIN="$(which socat)"