Adjust helm chart for remotely managed collector (#20)

Author: paweljw

Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: collector
 description: A Helm chart for Better Stack Collector - monitoring solution that collects metrics, logs, and traces
 type: application
-version: 0.1.20
+version: 0.1.21
 appVersion: "latest"
 keywords:
   - monitoring

templates/daemonset.yaml

@@ -66,13 +66,15 @@ spec:
           value: {{ .Chart.Version | quote }}
         ports:
         - name: otlp
-          containerPort: {{ .Values.collector.otlpPort }}
-          hostPort: {{ .Values.collector.otlpPort }}
+          containerPort: 34320
+          hostPort: 34320
           protocol: TCP
         livenessProbe:
           exec:
             command:
-            - /healthcheck.sh
+            - /bin/sh
+            - -c
+            - if [ -x /var/lib/better-stack/collector/healthcheck.sh ]; then /var/lib/better-stack/collector/healthcheck.sh; else exit 0; fi
           initialDelaySeconds: 60
           periodSeconds: 30
           timeoutSeconds: 10
@@ -82,6 +84,8 @@ spec:
         - name: docker-metadata
           mountPath: {{ .Values.volumes.dockerMetadata.mountPath }}
         {{- end }}
+        - name: betterstack-data
+          mountPath: /var/lib/better-stack
         - name: cgroup
           mountPath: /sys/fs/cgroup
           readOnly: true
@@ -138,8 +142,6 @@ spec:
         - name: HELM_CHART_VERSION
           value: {{ .Chart.Version | quote }}
         # Special configuration (these need dynamic template values)
-        - name: OTEL_EXPORTER_OTLP_ENDPOINT
-          value: "http://localhost:{{ .Values.collector.otlpPort }}"
         - name: ENABLE_DOCKERPROBE
           value: {{ .Values.beyla.dockerprobe.enabled | quote }}
         {{- if .Values.beyla.memoryRestartThreshold }}
@@ -171,6 +173,8 @@ spec:
         - name: docker-metadata
           mountPath: {{ .Values.volumes.dockerMetadata.mountPath }}
         {{- end }}
+        - name: betterstack-data
+          mountPath: /var/lib/better-stack
         - name: sys-kernel-tracing
           mountPath: /sys/kernel/tracing
         - name: sys-kernel-debug
@@ -187,6 +191,9 @@ spec:
       - name: docker-metadata
         emptyDir: {}
       {{- end }}
+      # Shared Better Stack data volume
+      - name: betterstack-data
+        emptyDir: {}
       # Collector volumes
       - name: cgroup
         hostPath:

templates/service.yaml

@@ -6,11 +6,11 @@ metadata:
     {{- include "better-stack-collector.labels" . | nindent 4 }}
     app.kubernetes.io/component: better-stack-collector
 spec:
-  type: {{ .Values.collector.service.type }}
+  type: ClusterIP
   ports:
-    - port: {{ .Values.collector.service.port }}
+    - port: 34320
       targetPort: otlp
       protocol: TCP
       name: otlp
   selector:
-    {{- include "better-stack-collector.selectorLabels" . | nindent 4 }}
+    {{- include "better-stack-collector.selectorLabels" . | nindent 4 }}

values.yaml

@@ -34,14 +34,6 @@ collector:
   # Affinity
   affinity: {}
 
-  # Service configuration
-  service:
-    type: ClusterIP
-    port: 34320
-
-  # Port for internal OTLP communication
-  otlpPort: 34320
-
   # Host filesystem mount configuration
   # By default, mounts the entire host root filesystem at /host (read-only)
   # You can specify specific paths to mount instead. Each path will be mounted
@@ -62,25 +54,6 @@ beyla:
 
   # Environment variables
   env:
-    # OTEL_EXPORTER_OTLP_ENDPOINT is set dynamically in the template
-    OTEL_EXPORTER_OTLP_PROTOCOL: "http/protobuf"
-    BEYLA_DISCOVERY_POLL_INTERVAL: "30s"
-    BEYLA_MIN_PROCESS_AGE: "20s"
-    BEYLA_CONFIG_PATH: "/etc/beyla/beyla.yaml"
-    BEYLA_OPEN_PORT: ""         # Set to "1-32767" to skip ephemeral ports, set to "1-65535" to enable all ports
-    BEYLA_PROFILE_PORT: ""      # Set to 6060 for profiling
-    BEYLA_LOG_LEVEL: ""         # Options: debug, info, warn, error
-    OTEL_TRACES_SAMPLER: ""     # Set to "traceidratio" for sampling
-    OTEL_TRACES_SAMPLER_ARG: "" # Set to "0.1" for 10% sampling
-    OTEL_EBPF_NETWORK_CACHE_MAX_FLOWS: ""
-    BEYLA_EXCLUDE_OTEL_INSTRUMENTED_SERVICES: ""
-    BEYLA_BPF_CONTEXT_PROPAGATION: ""
-    BEYLA_BPF_TRACK_REQUEST_HEADERS: ""
-
-    # Kubernetes metadata for just current node
-    BEYLA_KUBE_METADATA_ENABLE: "true"
-    BEYLA_KUBE_META_RESTRICT_LOCAL_NODE: "true"
-
     # Makes garbage collection more aggressive once memory is over this threshold
     # Too low might cause GC to run too often and increase CPU usage
     GOMEMLIMIT: 1400MiB