From 506f18bf9d041443eef027d9ea489e2fef565169 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Sun, 23 Feb 2025 15:07:05 +0100
Subject: [PATCH] feat(opentelemetry): cleanup

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 .../opentelemetry-collector/Chart.lock        |  15 ---
 .../opentelemetry-collector/values.yaml       | 101 +++++++++++++++++-
 2 files changed, 98 insertions(+), 18 deletions(-)
 delete mode 100644 gitops/argocd/charts/opentelemetry/opentelemetry-collector/Chart.lock

diff --git a/gitops/argocd/charts/opentelemetry/opentelemetry-collector/Chart.lock b/gitops/argocd/charts/opentelemetry/opentelemetry-collector/Chart.lock
deleted file mode 100644
index 462e95b2b9..0000000000
--- a/gitops/argocd/charts/opentelemetry/opentelemetry-collector/Chart.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-dependencies:
-- name: opentelemetry-collector
-  repository: https://open-telemetry.github.io/opentelemetry-helm-charts
-  version: 0.116.0
-- name: opentelemetry-collector
-  repository: https://open-telemetry.github.io/opentelemetry-helm-charts
-  version: 0.116.0
-- name: opentelemetry-collector
-  repository: https://open-telemetry.github.io/opentelemetry-helm-charts
-  version: 0.116.0
-- name: opentelemetry-collector
-  repository: https://open-telemetry.github.io/opentelemetry-helm-charts
-  version: 0.116.0
-digest: sha256:566293677c12848f2e711864fc641d25465605c33696b66f549c16e9b95b4faf
-generated: "2025-02-20T17:59:01.212628+01:00"
diff --git a/gitops/argocd/charts/opentelemetry/opentelemetry-collector/values.yaml b/gitops/argocd/charts/opentelemetry/opentelemetry-collector/values.yaml
index cc2c072b87..443ddc81c6 100644
--- a/gitops/argocd/charts/opentelemetry/opentelemetry-collector/values.yaml
+++ b/gitops/argocd/charts/opentelemetry/opentelemetry-collector/values.yaml
@@ -31,7 +31,7 @@ opentelemetry-logs:
     kubeletMetrics:
       enabled: false
     kubernetesEvents:
-      enabled: false
+      enabled: true
     clusterMetrics:
       enabled: false
 
@@ -123,7 +123,7 @@ opentelemetry-metrics:
   additionalLabels:
     portefaix.xyz/version: v0.54.0
 
-  mode: deployment
+  mode: daemonset
   image:
     repository: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib
 
@@ -140,6 +140,101 @@ opentelemetry-metrics:
       enabled: true
     kubernetesEvents:
       enabled: true
+    clusterMetrics:
+      enabled: false
+
+  extraEnvs:
+  - name: POD_IP
+    valueFrom:
+      fieldRef:
+        fieldPath: status.podIP
+  - name: OTEL_RESOURCE_ATTRIBUTES
+    value: "k8s.pod.ip=$(POD_IP)"
+  - name: OTEL_K8S_NAMESPACE
+    valueFrom:
+      fieldRef:
+        apiVersion: v1
+        fieldPath: metadata.namespace
+
+  config:
+    receivers:
+      prometheus:
+        config:
+          scrape_configs:
+            - job_name: opentelemetry-collector
+              scrape_interval: 10s
+              static_configs:
+                - targets:
+                    - ${env:MY_POD_IP}:8888
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+      resourcedetection:
+        detectors: [env]
+        timeout: 2s
+        override: false
+    exporters:
+      debug: {}
+    service:
+      telemetry:
+        logs:
+          encoding: "json"
+          initial_fields:
+          - service: "otel-collector"
+        metrics:
+          address: ${env:MY_POD_IP}:8888
+      extensions:
+      - health_check
+      pipelines:
+        metrics:
+          receivers:
+          - otlp
+          - prometheus
+          processors:
+          - resourcedetection
+          - memory_limiter
+          - batch
+          exporters:
+          - debug
+          - otlp
+
+  serviceMonitor:
+    enabled: true
+    extraLabels:
+      prometheus.io/operator: portefaix
+
+  prometheusRule:
+    enabled: true
+    groups: []
+    defaultRules:
+      enabled: true
+    extraLabels:
+      prometheus.io/operator: portefaix
+
+opentelemetry-metrics-cluster:
+  additionalLabels:
+    portefaix.xyz/version: v0.54.0
+
+  mode: deployment
+  image:
+    repository: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib
+
+  useGOMEMLIMIT: true
+
+  presets:
+    logsCollection:
+      enabled: false
+    hostMetrics:
+      enabled: true
+    kubernetesAttributes:
+      enabled: true
+    kubeletMetrics:
+      enabled: true
+    kubernetesEvents:
+      enabled: false
     clusterMetrics:
       enabled: true
 
@@ -330,7 +425,7 @@ opentelemetry-gateway:
   additionalLabels:
     portefaix.xyz/version: v0.54.0
 
-  mode: deployment
+  mode: daemonset
   image:
     repository: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib