Remotely-controlled collector

.github/workflows/docker-build.yml

@@ -44,17 +44,17 @@ jobs:
           fi
 
           # Modify the Dockerfile to append suffix to COLLECTOR_VERSION
-          sed -i "s/^ENV COLLECTOR_VERSION=\(.*\)/ENV COLLECTOR_VERSION=\1${SUFFIX}/" Dockerfile
+          sed -i "s/^ENV COLLECTOR_VERSION=\(.*\)/ENV COLLECTOR_VERSION=\1${SUFFIX}/" collector/Dockerfile
 
           # Show what was changed for debugging
           echo "Modified COLLECTOR_VERSION:"
-          grep "^ENV COLLECTOR_VERSION=" Dockerfile
+          grep "^ENV COLLECTOR_VERSION=" collector/Dockerfile
 
       - name: Ensure tag version matches collector version
         id: ensure-tag-version
         run: |
           if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
-            sed -i "s/^ENV COLLECTOR_VERSION=.*/ENV COLLECTOR_VERSION=${GITHUB_REF#refs\/tags\/v}/" Dockerfile
+            sed -i "s/^ENV COLLECTOR_VERSION=.*/ENV COLLECTOR_VERSION=${GITHUB_REF#refs\/tags\/v}/" collector/Dockerfile
             git diff --exit-code
           fi
 
@@ -94,14 +94,14 @@ jobs:
           project: ${{ secrets.DEPOT_PROJECT_ID }}
           token: ${{ secrets.DEPOT_API_TOKEN }}
           context: .
-          file: Dockerfile
+          file: collector/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: ${{ steps.repo.outputs.push }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             COLLECTOR_VERSION=${{ github.ref_name }}
-  
+
   build-beyla:
     runs-on: ubuntu-latest
     permissions:
@@ -150,8 +150,8 @@ jobs:
           project: ${{ secrets.DEPOT_PROJECT_ID }}
           token: ${{ secrets.DEPOT_API_TOKEN }}
           context: .
-          file: Dockerfile.beyla
+          file: beyla/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: ${{ steps.repo.outputs.push }}
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}

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

@@ -8,27 +8,6 @@ on:
   workflow_dispatch:
 
 jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.2'
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-    - name: Install dependencies
-      run: bundle install
-
-    - name: Run tests
-      run: bundle exec rake test
-
-    - name: Validate Docker compose build
-      run: docker compose build --no-cache
-
   # The diff is expected to be:
   # 8a9,10
   # >     security_opt:

Dockerfile.beyla → beyla/Dockerfile

@@ -1,5 +1,5 @@
 # Add Node Agent to the image
-FROM ghcr.io/coroot/coroot-node-agent:1.25.0 AS node-agent
+FROM ghcr.io/coroot/coroot-node-agent:1.27.0 AS node-agent
 
 # Add Cluster Agent to the image
 FROM ghcr.io/coroot/coroot-cluster-agent:1.2.4 AS cluster-agent
@@ -23,7 +23,7 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Create necessary directories
-RUN mkdir -p /etc/supervisor/conf.d /var/log/supervisor /enrichment
+RUN mkdir -p /etc/supervisor/conf.d /var/log/supervisor /enrichment /bootstrap
 
 # Copy Beyla files from official image and set permissions
 COPY --from=beyla-source --chmod=755 /beyla /usr/local/bin/beyla
@@ -37,16 +37,8 @@ COPY --from=node-agent --chmod=755 /usr/bin/coroot-node-agent /usr/local/bin/nod
 # Copy Cluster Agent
 COPY --from=cluster-agent --chmod=755 /usr/bin/coroot-cluster-agent /usr/local/bin/cluster-agent
 
-# Copy Ruby dockerprobe implementation to working directory
-COPY dockerprobe /dockerprobe
-
-# Copy configuration files
-COPY beyla/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY --chmod=755 beyla/entrypoint.sh /entrypoint.sh
-COPY --chmod=755 beyla/cluster-collector.sh /cluster-collector.sh
-
-# Copy Beyla configuration
-COPY beyla.yaml /etc/beyla/beyla.yaml
+COPY beyla/bootstrap_supervisord.conf /bootstrap/supervisord.conf
+COPY --chmod=755 beyla/run_supervisord.sh /run_supervisord.sh
 
 # Default command
-CMD ["/entrypoint.sh"]
+CMD ["/run_supervisord.sh"]

beyla/bootstrap_supervisord.conf

@@ -0,0 +1,13 @@
+[supervisord]
+nodaemon=true
+logfile=/var/log/supervisor/supervisord.log
+loglevel=info
+
+[unix_http_server]
+file=/var/lib/better-stack/beyla-supervisor.sock
+
+[supervisorctl]
+serverurl=unix:///var/lib/better-stack/beyla-supervisor.sock
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface

beyla/run_supervisord.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Ensure the supervisord.conf exists in the expected location
+SUPERVISORD_CONF="/var/lib/better-stack/beyla/supervisord.conf"
+BOOTSTRAP_CONF="/bootstrap/supervisord.conf"
+
+if [ ! -f "$SUPERVISORD_CONF" ]; then
+  echo "Supervisord config not found at $SUPERVISORD_CONF, copying from bootstrap..."
+  mkdir -p "$(dirname "$SUPERVISORD_CONF")"
+  cp "$BOOTSTRAP_CONF" "$SUPERVISORD_CONF"
+  echo "Copied bootstrap supervisord config to $SUPERVISORD_CONF"
+fi
+
+# Start supervisord
+exec /usr/bin/supervisord -c "$SUPERVISORD_CONF"