Fixes to the Supervisor preset after testing

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Author: douglascamata

charts/opentelemetry-collector/examples/daemonset-supervisor/rendered/configmap-agent.yaml

@@ -66,25 +66,35 @@ data:
     exporters:
       coralogix:
         application_name: otel
-        domain: coralogix.com
+        application_name_attributes:
+        - k8s.namespace.name
+        - service.namespace
+        domain: eu2.coralogix.com
+        logs:
+          headers:
+            X-Coralogix-Distribution: helm-otel-integration/1.0
+        metrics:
+          headers:
+            X-Coralogix-Distribution: helm-otel-integration/1.0
+        private_key: ${env:CORALOGIX_PRIVATE_KEY}
+        subsystem_name: integration
+        subsystem_name_attributes:
+        - k8s.deployment.name
+        - k8s.statefulset.name
+        - k8s.daemonset.name
+        - k8s.cronjob.name
+        - service.name
+        timeout: 30s
+        traces:
+          headers:
+            X-Coralogix-Distribution: helm-otel-integration/1.0
       debug: {}
     extensions:
       health_check:
         endpoint: ${env:MY_POD_IP}:13133
       k8s_observer:
         auth_type: serviceAccount
-        node: ${env:K8S_NODE_NAME}
         observe_pods: true
-      opamp:
-        agent_description:
-          non_identifying_attributes:
-            k8s.node.name: ${env:KUBE_NODE_NAME}
-        server:
-          http:
-            endpoint: https://ingress.eu2.coralogix.com/opamp/v1
-            headers:
-              Authorization: Bearer ${env:CORALOGIX_PRIVATE_KEY}
-            polling_interval: 2m
     processors:
       batch:
         send_batch_max_size: 2048
@@ -209,6 +219,24 @@ data:
           - replace_pattern(attributes["k8s.deployment.name"], "^(.*)-[0-9a-zA-Z]+$",
             "$$1") where attributes["k8s.replicaset.name"] != nil
           - delete_key(attributes, "k8s.replicaset.name")
+      transform/prometheus:
+        error_mode: ignore
+        metric_statements:
+        - context: metric
+          statements:
+          - replace_pattern(name, "_total$", "")
+        - context: resource
+          statements:
+          - set(attributes["k8s.pod.ip"], attributes["net.host.name"]) where attributes["service.name"]
+            == "opentelemetry-collector"
+          - delete_key(attributes, "service_name") where attributes["service.name"] ==
+            "opentelemetry-collector"
+        - context: datapoint
+          statements:
+          - delete_key(attributes, "service_name") where resource.attributes["service.name"]
+            == "opentelemetry-collector"
+          - delete_key(attributes, "otel_scope_name") where attributes["service.name"]
+            == "opentelemetry-collector"
       transform/reduce:
         error_mode: ignore
         metric_statements:
@@ -392,23 +420,21 @@ data:
         retry_on_failure:
           enabled: true
         start_at: beginning
-      jaeger:
-        protocols:
-          grpc:
-            endpoint: ${env:MY_POD_IP}:14250
-          thrift_binary:
-            endpoint: ${env:MY_POD_IP}:6832
-          thrift_compact:
-            endpoint: ${env:MY_POD_IP}:6831
-          thrift_http:
-            endpoint: ${env:MY_POD_IP}:14268
       otlp:
         protocols:
           grpc:
             endpoint: ${env:MY_POD_IP}:4317
             max_recv_msg_size_mib: 20
           http:
             endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 30s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
       prometheus/k8s_extra_metrics:
         config:
           scrape_configs:
@@ -423,49 +449,15 @@ data:
             tls_config:
               ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
               insecure_skip_verify: true
-      receiver_creator/mysql:
-        receivers:
-          mysql:
-            config:
-              collection_interval: 30s
-              metrics:
-                mysql.client.network.io:
-                  enabled: true
-                mysql.commands:
-                  enabled: true
-                mysql.connection.errors:
-                  enabled: true
-                mysql.joins:
-                  enabled: true
-                mysql.query.count:
-                  enabled: true
-                mysql.query.slow.count:
-                  enabled: true
-                mysql.sorts:
-                  enabled: true
-                mysql.table_open_cache:
-                  enabled: true
-              password: ${env:MYSQL_PASSWORD}
-              statement_events:
-                digest_text_limit: 120
-                limit: 250
-                time_limit: 24h
-              username: root
-            rule: type == "port" && port == 3306 && pod.labels["env"] == "test" && pod.labels["team"]
-              == "teamA"
-        watch_observers:
-        - k8s_observer
-      zipkin:
-        endpoint: ${env:MY_POD_IP}:9411
     service:
       extensions:
       - health_check
       - k8s_observer
-      - opamp
       pipelines:
         logs:
           exporters:
           - debug
+          - coralogix
           processors:
           - memory_limiter
           - resourcedetection/region
@@ -479,6 +471,7 @@ data:
         metrics:
           exporters:
           - debug
+          - coralogix
           processors:
           - memory_limiter
           - resourcedetection/region
@@ -487,12 +480,13 @@ data:
           - transform/k8s_attributes
           - filter/k8s_extra_metrics
           - transform/reduce
+          - transform/prometheus
           - batch
           receivers:
-          - receiver_creator/mysql
           - prometheus/k8s_extra_metrics
           - spanmetrics
           - spanmetrics/db
+          - prometheus
           - otlp
         traces:
           exporters:
@@ -511,8 +505,6 @@ data:
           - transform/test
           - batch
           receivers:
-          - jaeger
-          - zipkin
           - otlp
         traces/db:
           exporters:
@@ -534,6 +526,13 @@ data:
       telemetry:
         logs:
           encoding: json
+        metrics:
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: ${env:MY_POD_IP}
+                  port: 8888
         resource:
           k8s.daemonset.name: example-opentelemetry-collector
           k8s.namespace.name: default

charts/opentelemetry-collector/examples/daemonset-supervisor/rendered/configmap-supervisor.yaml

@@ -31,10 +31,9 @@ data:
     agent:
       executable: /otelcol-contrib
       passthrough_logs: true
-
       # This passes config files to the Collector.
       config_files:
-        - /etc/otelcol-contrib/config.yaml
+      - /conf/relay.yaml
 
       # This adds CLI arguments to the Collector.
       args: []

charts/opentelemetry-collector/examples/daemonset-supervisor/rendered/daemonset.yaml

@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 744c8c031e7be464032e81297c4f97b11c13416bee90e2b87c5d97e563bcac65
+        checksum/config: 0600fc17cdb1b03e3efadffd7296b4b94e07982c4ad67c633c8adee7b9035fa0
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -39,32 +39,14 @@ spec:
         - name: opentelemetry-collector
           command:
             - /opampsupervisor
-            - --config=/etc/otelcol-supervisor/config.yaml
+            - --config=/etc/otelcol-contrib/supervisor.yaml
           securityContext:
             {}
-          image: "coralogixrepo/otel-supervised-collector:0.127.0"
+          image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.128.0"
           imagePullPolicy: IfNotPresent
           ports:
 
 
-              
-              
-            - name: jaeger-binary
-              containerPort: 6832
-              protocol: TCP
-              hostPort: 6832
-            - name: jaeger-compact
-              containerPort: 6831
-              protocol: UDP
-              hostPort: 6831
-            - name: jaeger-grpc
-              containerPort: 14250
-              protocol: TCP
-              hostPort: 14250
-            - name: jaeger-thrift
-              containerPort: 14268
-              protocol: TCP
-              hostPort: 14268
             - name: otlp
               containerPort: 4317
               protocol: TCP
@@ -73,10 +55,6 @@ spec:
               containerPort: 4318
               protocol: TCP
               hostPort: 4318
-            - name: zipkin
-              containerPort: 9411
-              protocol: TCP
-              hostPort: 9411
           env:
             - name: MY_POD_IP
               valueFrom:
@@ -104,14 +82,21 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
+            - name: CORALOGIX_PRIVATE_KEY
+              valueFrom:
+                secretKeyRef:
+                  key: PRIVATE_KEY
+                  name: coralogix-keys
           readinessProbe:
             httpGet:
               path: /
               port: 13133
           volumeMounts:
             - mountPath: /conf
               name: opentelemetry-collector-configmap
-            - mountPath: /etc/otelcol-supervisor
+            - mountPath: /etc/otelcol-contrib/supervisor.yaml
+              subPath: supervisor.yaml
+              readOnly: true
               name: example-opentelemetry-collector-supervisor
             - name: varlogpods
               mountPath: /var/log/pods
@@ -139,7 +124,7 @@ spec:
             name: example-opentelemetry-collector-supervisor
             items:
               - key: supervisor.yaml
-                path: config.yaml
+                path: supervisor.yaml
         - name: varlogpods
           hostPath:
             path: /var/log/pods

charts/opentelemetry-collector/examples/daemonset-supervisor/values.yaml

@@ -1,9 +1,12 @@
 global:
   domain: "eu2.coralogix.com"
   clusterName: "douglas-kind-test"
+  defaultApplicationName: otel
+  defaultSubsystemName: integration
+  version: "1.0"
 
 image:
-  tag: 0.127.0
+  tag: 0.128.0
 
 command:
   name: opampsupervisor
@@ -20,28 +23,19 @@ extraVolumeMounts:
     name: etcmachineid
     readOnly: true
 
-config:
-  exporters:
-    coralogix:
-      application_name: "otel"
-      domain: "coralogix.com"
-
 presets:
+  coralogixExporter:
+    enabled: true
+    privateKey: ${env:CORALOGIX_PRIVATE_KEY}
+  batch:
+    enabled: true
   fleetManagement:
     enabled: true
     supervisor:
       enabled: true
   k8sResourceAttributes:
     enabled: true
-  batch:
-    enabled: true
   collectorMetrics:
-    enabled: false
-  jaegerReceiver:
-    enabled: true
-  zipkinReceiver:
-    enabled: true
-  otlpReceiver:
     enabled: true
   resourceDetection:
     enabled: true
@@ -74,20 +68,8 @@ presets:
           value: test
         firstEntryRegex: ^[^\s].*
         combineWith: ""
-  mysql:
-    metrics:
-      enabled: true
-      instances:
-        - username: "root"
-          password: ${env:MYSQL_PASSWORD}
-          collectionInterval: 30s
-          port: 3306
-          labelSelectors:
-            env: "test"
-            team: "teamA"
   headSampling:
     enabled: true
-
   spanMetrics:
     enabled: true
     transformStatements:

charts/opentelemetry-collector/templates/_config.tpl

@@ -97,7 +97,7 @@ Build config file for daemonset OpenTelemetry Collector
 {{- if .Values.presets.reduceResourceAttributes.enabled }}
 {{- $config = (include "opentelemetry-collector.applyReduceResourceAttributesConfig" (dict "Values" $data "config" $config) | fromYaml) }}
 {{- end }}
-{{- if .Values.presets.fleetManagement.enabled }}
+{{- if and (.Values.presets.fleetManagement.enabled) (not .Values.presets.fleetManagement.supervisor.enabled) }}
 {{- $config = (include "opentelemetry-collector.applyFleetManagementConfig" (dict "Values" $data "config" $config) | fromYaml) }}
 {{- end }}
 {{- if .Values.presets.k8sResourceAttributes.enabled }}
@@ -202,7 +202,7 @@ Build config file for deployment OpenTelemetry Collector
 {{- if .Values.presets.reduceResourceAttributes.enabled }}
 {{- $config = (include "opentelemetry-collector.applyReduceResourceAttributesConfig" (dict "Values" $data "config" $config) | fromYaml) }}
 {{- end }}
-{{- if .Values.presets.fleetManagement.enabled }}
+{{- if and (.Values.presets.fleetManagement.enabled) (not .Values.presets.fleetManagement.supervisor.enabled) }}
 {{- $config = (include "opentelemetry-collector.applyFleetManagementConfig" (dict "Values" $data "config" $config) | fromYaml) }}
 {{- end }}
 {{- if .Values.presets.k8sResourceAttributes.enabled }}