Add INSTALLED_AS for docker and swarm (#101)

Author: paweljw

.github/workflows/docker-compose-match.yml

@@ -34,6 +34,7 @@ jobs:
       run: |
         # Extract beyla service from docker-compose.yml, excluding build: and depends_on: sections
         # These sections are not applicable in the swarm beyla file
+        # Also exclude INSTALLED_AS= line as it's intentionally different (docker vs swarm)
         awk '
           BEGIN { in_beyla = 0; skip_block = 0; block_indent = 0 }
           /^  beyla:$/ { in_beyla = 1; next }
@@ -54,16 +55,21 @@ jobs:
               }
             }
 
+            # Skip INSTALLED_AS line (intentionally different between docker and swarm)
+            if (/INSTALLED_AS=/) { next }
+
             if (skip_block == 0) {
               print
             }
           }
         ' docker-compose.yml > /tmp/beyla-main.yml
 
         # Extract beyla service from swarm file (skip header comments and services: line)
+        # Also exclude INSTALLED_AS= line as it's intentionally different (docker vs swarm)
         awk '
           BEGIN { in_beyla = 0 }
           /^  beyla:$/ { in_beyla = 1; next }
+          /INSTALLED_AS=/ { next }
           in_beyla == 1 { print }
         ' swarm/docker-compose.swarm-beyla.yml > /tmp/beyla-swarm.yml
 

docker-compose.seccomp.yml

@@ -24,6 +24,7 @@ services:
       - HOSTNAME
       # Optional proxy port for upstream proxy mode
       - PROXY_PORT
+      - INSTALLED_AS=docker
     volumes:
       # Mount host root filesystem to enable reading system metrics, logs (including logs outside /var/log), and container data
       # Can be customized via MOUNT_HOST_PATHS environment variable in install.sh to restrict access to specific paths
@@ -58,6 +59,7 @@ services:
       - HOSTNAME
       # Enable dockerprobe
       - ENABLE_DOCKERPROBE
+      - INSTALLED_AS=docker
     volumes:
       - /sys/kernel/tracing:/sys/kernel/tracing:rw
       - /sys/kernel/debug:/sys/kernel/debug:rw

docker-compose.yml

@@ -22,6 +22,7 @@ services:
       - HOSTNAME
       # Optional proxy port for upstream proxy mode
       - PROXY_PORT
+      - INSTALLED_AS=docker
     volumes:
       # Mount host root filesystem to enable reading system metrics, logs (including logs outside /var/log), and container data
       # Can be customized via MOUNT_HOST_PATHS environment variable in install.sh to restrict access to specific paths
@@ -56,6 +57,7 @@ services:
       - HOSTNAME
       # Enable dockerprobe
       - ENABLE_DOCKERPROBE
+      - INSTALLED_AS=docker
     volumes:
       - /sys/kernel/tracing:/sys/kernel/tracing:rw
       - /sys/kernel/debug:/sys/kernel/debug:rw

swarm/docker-compose.swarm-beyla.yml

@@ -34,6 +34,7 @@ services:
       - HOSTNAME
       # Enable dockerprobe
       - ENABLE_DOCKERPROBE
+      - INSTALLED_AS=swarm
     volumes:
       - /sys/kernel/tracing:/sys/kernel/tracing:rw
       - /sys/kernel/debug:/sys/kernel/debug:rw

swarm/docker-compose.swarm-collector.yml

@@ -36,6 +36,7 @@ services:
       - VECTOR_LOG_FORMAT=json
       # Optional proxy port for upstream proxy mode
       - PROXY_PORT
+      - INSTALLED_AS=swarm
     volumes:
       # Mount host root filesystem to enable reading system metrics, logs (including logs outside /var/log), and container data
       # Can be customized via MOUNT_HOST_PATHS environment variable in deploy-to-swarm.sh to restrict access to specific paths