From c29ea03921be61d7229910516b019506d3c97de4 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Thu, 23 Apr 2026 13:37:50 +0200
Subject: [PATCH 1/3] fix(stack/observability): Change tempo port: 3100 -> 3200

Changed in chart 1.21.1:

> Breaking Change * In order to be consistent with other projects and documentations, the default port has been changed from 3100 to 3200.
---
 stacks/observability/grafana.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stacks/observability/grafana.yaml b/stacks/observability/grafana.yaml
index 87746297..8f4c9133 100644
--- a/stacks/observability/grafana.yaml
+++ b/stacks/observability/grafana.yaml
@@ -37,7 +37,7 @@ options:
             tlsAuthWithCACert: false
         - name: Tempo
           type: tempo
-          url: http://tempo:3100
+          url: http://tempo:3200
           access: proxy
           isDefault: false
           jsonData:

From 5f5c5ad11d7de6b62711e7e03d18ebc5a238d051 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Thu, 23 Apr 2026 13:42:53 +0200
Subject: [PATCH 2/3] fix(stack/observability): Change jaeger endpoint
 jaeger-collector -> jaeger

It changed somewhere between chart 3.4.1 and 4.5.0 (massive restructure)
---
 stacks/observability/opentelemetry-collector-deployment.yaml | 2 +-
 stacks/observability/opentelemetry-collector-sidecar.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stacks/observability/opentelemetry-collector-deployment.yaml b/stacks/observability/opentelemetry-collector-deployment.yaml
index f7c6ce2c..5c0455f2 100644
--- a/stacks/observability/opentelemetry-collector-deployment.yaml
+++ b/stacks/observability/opentelemetry-collector-deployment.yaml
@@ -38,7 +38,7 @@ spec:
       debug: {}
         # verbosity: detailed
       otlp/jaeger:
-        endpoint: jaeger-collector:4317
+        endpoint: jaeger:4317
         tls:
           insecure: true
       otlp/tempo:
diff --git a/stacks/observability/opentelemetry-collector-sidecar.yaml b/stacks/observability/opentelemetry-collector-sidecar.yaml
index 80be1944..e7a17a35 100644
--- a/stacks/observability/opentelemetry-collector-sidecar.yaml
+++ b/stacks/observability/opentelemetry-collector-sidecar.yaml
@@ -36,7 +36,7 @@ spec:
       debug: {}
         # verbosity: detailed
       otlp/jaeger:
-        endpoint: jaeger-collector:4317
+        endpoint: jaeger:4317
         tls:
           insecure: true
       otlp/tempo:

From f8c81a0d83d3f83f7de244b989c50fc568d259cb Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Thu, 23 Apr 2026 15:03:50 +0200
Subject: [PATCH 3/3] chore(stack/observability): Use FQDNs

This allows otelcollector configs to be used by pods in any namespace and make it easier to use Secret Operator generated TLS certs so grafana can connect to datasources securely.
---
 stacks/observability/grafana.yaml                           | 4 ++--
 .../observability/opentelemetry-collector-deployment.yaml   | 6 +++---
 stacks/observability/opentelemetry-collector-sidecar.yaml   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/stacks/observability/grafana.yaml b/stacks/observability/grafana.yaml
index 8f4c9133..1e8b8333 100644
--- a/stacks/observability/grafana.yaml
+++ b/stacks/observability/grafana.yaml
@@ -30,14 +30,14 @@ options:
       datasources:
         - name: Loki
           type: loki
-          url: http://loki:3100
+          url: http://loki.{{ NAMESPACE }}.svc.cluster.local:3100
           access: proxy
           isDefault: false
           jsonData:
             tlsAuthWithCACert: false
         - name: Tempo
           type: tempo
-          url: http://tempo:3200
+          url: http://tempo.{{ NAMESPACE }}.svc.cluster.local:3200
           access: proxy
           isDefault: false
           jsonData:
diff --git a/stacks/observability/opentelemetry-collector-deployment.yaml b/stacks/observability/opentelemetry-collector-deployment.yaml
index 5c0455f2..a016ebdb 100644
--- a/stacks/observability/opentelemetry-collector-deployment.yaml
+++ b/stacks/observability/opentelemetry-collector-deployment.yaml
@@ -38,15 +38,15 @@ spec:
       debug: {}
         # verbosity: detailed
       otlp/jaeger:
-        endpoint: jaeger:4317
+        endpoint: jaeger.{{ NAMESPACE }}.svc.cluster.local:4317
         tls:
           insecure: true
       otlp/tempo:
-        endpoint: tempo:4317
+        endpoint: tempo.{{ NAMESPACE }}.svc.cluster.local:4317
         tls:
           insecure: true
       otlphttp/loki:
-        endpoint: http://loki:3100/otlp
+        endpoint: http://loki.{{ NAMESPACE }}.svc.cluster.local:3100/otlp
         tls:
           insecure: true
       #     auth:
diff --git a/stacks/observability/opentelemetry-collector-sidecar.yaml b/stacks/observability/opentelemetry-collector-sidecar.yaml
index e7a17a35..a28672e0 100644
--- a/stacks/observability/opentelemetry-collector-sidecar.yaml
+++ b/stacks/observability/opentelemetry-collector-sidecar.yaml
@@ -36,15 +36,15 @@ spec:
       debug: {}
         # verbosity: detailed
       otlp/jaeger:
-        endpoint: jaeger:4317
+        endpoint: jaeger.{{ NAMESPACE }}.svc.cluster.local:4317
         tls:
           insecure: true
       otlp/tempo:
-        endpoint: tempo:4317
+        endpoint: tempo.{{ NAMESPACE }}.svc.cluster.local:4317
         tls:
           insecure: true
       otlphttp/loki:
-        endpoint: http://loki:3100/otlp
+        endpoint: http://loki.{{ NAMESPACE }}.svc.cluster.local:3100/otlp
         tls:
           insecure: true
       #     auth: