From dbc230de9c8b3eb02379aaafe765b7b017765f98 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@itpartner.no>
Date: Fri, 27 Sep 2024 20:00:11 +0200
Subject: [PATCH] fix: update opentelemetry and tempo manifests for service
 graphs

---
 applications/opentelemetry-collector.yaml | 22 +++++++++++-----------
 applications/tempo.yaml                   |  3 +++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/applications/opentelemetry-collector.yaml b/applications/opentelemetry-collector.yaml
index 1cc7de47..9d0620d7 100644
--- a/applications/opentelemetry-collector.yaml
+++ b/applications/opentelemetry-collector.yaml
@@ -43,12 +43,12 @@ spec:
             zipkin:
               endpoint: ${env:MY_POD_IP}:9411
           exporters:
-            otlphttp/metrics:
-              endpoint: http://prometheus-operated.prometheus:9090/api/v1/otlp
+            otlp:
+              endpoint: "tempo.tempo.svc:4317"
               tls:
                 insecure: true
-            otlphttp/traces:
-              endpoint: "tempo.tempo.svc:4317"
+            otlphttp/metrics:
+              endpoint: http://prom-prometheus.prometheus:9090/api/v1/otlp
               tls:
                 insecure: true
             otlphttp/logs:
@@ -69,24 +69,24 @@ spec:
               traces:
                 receivers: [otlp,zipkin]
                 processors: [batch]
-                exporters: [otlphttp/traces]
-                #exporters: [otlphttp/traces,debug/traces]
+                exporters: [otlp]
+                # exporters: [otlphttp/traces,debug/traces]
               metrics:
                 receivers: [otlp,prometheus/collector]
                 processors: [batch]
                 exporters: [otlphttp/metrics]
-                #exporters: [otlphttp/metrics,debug/metrics]
+                # exporters: [otlphttp/metrics,debug/metrics]
               logs:
                 receivers: [otlp]
                 processors: [batch]
                 exporters: [otlphttp/logs]
-                #exporters: [otlphttp/logs,debug/logs]
+                # exporters: [otlphttp/logs,debug/logs]
         ports:
           metrics:
             enabled: true
-        presets:
-          logsCollection:
-            enabled: true
+        # presets:
+        #   logsCollection:
+        #     enabled: true
         ingress:
           enabled: true
           annotations:
diff --git a/applications/tempo.yaml b/applications/tempo.yaml
index 9f35c85e..413ec320 100644
--- a/applications/tempo.yaml
+++ b/applications/tempo.yaml
@@ -43,6 +43,9 @@ spec:
                 path: /var/tempo/traces
               wal:
                 path: /var/tempo/wal
+          metricsGenerator:
+            enabled: true
+            remoteWriteUrl: "http://prom-prometheus.prometheus:9090/api/v1/write"
           extraEnv:
           - name: S3KEY
             valueFrom: