Remotely-controlled collector

.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

@@ -20,9 +20,6 @@ RUN apt-get update && apt-get install -y \
 COPY --from=vector --chmod=755 /usr/bin/vector /usr/local/bin/vector
 COPY --from=vector /etc/vector /etc/vector
 
-# Copy mdprobe
-COPY mdprobe /mdprobe
-
 # Create necessary directories
 RUN mkdir -p /versions/0-default \
   && mkdir -p /etc/supervisor/conf.d \
@@ -36,7 +33,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.0.40
+ENV COLLECTOR_VERSION=1.1.0
 ENV VECTOR_VERSION=0.47.0
 ENV BEYLA_VERSION=2.7.5
 ENV CLUSTER_AGENT_VERSION=1.2.4
@@ -54,28 +51,14 @@ ENV CLUSTER_AGENT_VERSION=1.2.4
 # This is considered a best practice when running multi-process containers with Tini as the init system.
 ENV TINI_SUBREAPER=true
 
-# Copy supervisor configuration
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+# Copy bootstrap supervisor configuration and necessary initialization scripts
+COPY bootstrap_supervisord.conf /bootstrap/supervisord.conf
+COPY --chmod=755 bootstrap.sh /bootstrap.sh
+COPY --chmod=755 run_supervisord.sh /run_supervisord.sh
 
-# Copy Ruby scripts
-COPY --chmod=755 updater.rb /updater.rb
-COPY --chmod=755 proxy.rb /proxy.rb
-COPY --chmod=755 vector.sh /vector.sh
-COPY --chmod=755 healthcheck.sh /healthcheck.sh
-COPY --chmod=755 certbot-runner.sh /certbot-runner.sh
-COPY --chmod=755 certbot-deploy-hook.sh /certbot-deploy-hook.sh
 COPY versions/0-default/vector.yaml /versions/0-default/vector.yaml
 COPY versions/0-default/databases.json /versions/0-default/databases.json
 COPY kubernetes-discovery/0-default/discovered_pods.yaml /kubernetes-discovery/0-default/discovered_pods.yaml
-COPY engine /engine
-COPY --chmod=755 ebpf.sh /ebpf.sh
-# Copy default enrichment files to both locations
-# /enrichment-defaults is the source for copying at runtime
-# /enrichment is for Kubernetes compatibility, since it's volume mounts work differently from compose/swarm
-COPY dockerprobe/docker-mappings.default.csv /enrichment-defaults/docker-mappings.csv
-COPY dockerprobe/databases.default.csv /enrichment-defaults/databases.csv
-COPY dockerprobe/docker-mappings.default.csv /enrichment/docker-mappings.csv
-COPY dockerprobe/databases.default.csv /enrichment/databases.csv
 
 # Create initial vector-config with symlinks to defaults
 RUN mkdir -p /vector-config/0-default \
@@ -90,4 +73,4 @@ RUN mkdir -p /vector-config/0-default \
 ENTRYPOINT ["/usr/bin/tini", "-s", "--"]
 
 # Start supervisor
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+CMD ["/run_supervisord.sh"]

Dockerfile.beyla

@@ -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=/beyla_supervisor_socket/supervisor.sock
+
+[supervisorctl]
+serverurl=unix:///beyla_supervisor_socket/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"