Allow positively overriding hostname (#88)

Author: paweljw

beyla/run_supervisord.sh

@@ -13,5 +13,11 @@ if [ ! -f "$SUPERVISORD_CONF" ]; then
   echo "Copied bootstrap supervisord config to $SUPERVISORD_CONF"
 fi
 
+# Ensure HOSTNAME is set (use hostname command as fallback)
+if [ -z "$HOSTNAME" ]; then
+  HOSTNAME=$(hostname)
+  export HOSTNAME
+fi
+
 # Start supervisord
 exec /usr/bin/supervisord -c "$SUPERVISORD_CONF"

collector/Dockerfile

@@ -34,7 +34,7 @@ RUN mkdir -p /versions/0-default \
 # Set environment variables
 ENV BASE_URL=https://telemetry.betterstack.com
 ENV CLUSTER_COLLECTOR=false
-ENV COLLECTOR_VERSION=1.1.7
+ENV COLLECTOR_VERSION=1.1.8
 ENV VECTOR_VERSION=0.47.0
 ENV BEYLA_VERSION=2.7.5
 ENV CLUSTER_AGENT_VERSION=1.2.4

collector/run_supervisord.sh

@@ -13,5 +13,11 @@ if [ ! -f "$SUPERVISORD_CONF" ]; then
   echo "Copied bootstrap supervisord config to $SUPERVISORD_CONF"
 fi
 
+# Ensure HOSTNAME is set (use hostname command as fallback)
+if [ -z "$HOSTNAME" ]; then
+  HOSTNAME=$(hostname)
+  export HOSTNAME
+fi
+
 # Start supervisord
 exec /usr/bin/supervisord -c "$SUPERVISORD_CONF"

docker-compose.seccomp.yml

@@ -6,6 +6,7 @@ services:
     image: betterstack/collector:latest
     container_name: better-stack-collector
     restart: always
+    uts: host
     security_opt:
       - seccomp=collector-seccomp.json
     healthcheck:
@@ -41,6 +42,7 @@ services:
     stop_grace_period: 90s
     privileged: true
     pid: host
+    uts: host
     network_mode: host
     mem_limit: 1536m
     healthcheck:

docker-compose.yml

@@ -6,6 +6,7 @@ services:
     image: betterstack/collector:latest
     container_name: better-stack-collector
     restart: always
+    uts: host
     healthcheck:
       test: ["CMD-SHELL", "if [ -x /var/lib/better-stack/collector/healthcheck.sh ]; then /var/lib/better-stack/collector/healthcheck.sh; else exit 0; fi"]
       interval: 60s
@@ -39,6 +40,7 @@ services:
     stop_grace_period: 90s
     privileged: true
     pid: host
+    uts: host
     network_mode: host
     mem_limit: 1536m
     healthcheck:

install.sh

@@ -89,8 +89,10 @@ if [ -n "$PROXY_PORT" ]; then
     fi
 fi
 
-# Set hostname if not provided
-HOSTNAME="${HOSTNAME:-$(hostname)}"
+# Set hostname if not provided (use empty string HOSTNAME="" to trigger runtime detection via uts:host)
+if [ -z "${HOSTNAME+x}" ]; then
+    HOSTNAME=$(hostname)
+fi
 
 # Set default values for environment variables
 BASE_URL="${BASE_URL:-https://telemetry.betterstack.com}"

swarm/docker-compose.swarm-beyla.yml

@@ -18,6 +18,7 @@ services:
     stop_grace_period: 90s
     privileged: true
     pid: host
+    uts: host
     network_mode: host
     mem_limit: 1536m
     healthcheck: