fix(base-cluster/monitoring): grafana-tempo-distributed would need s3

Therefore we switch to the singleBinary chart.
Without this change the compactor doesn't work; meaning the traces are
never cleaned up...

Author: cwrau

charts/base-cluster/templates/monitoring/alloy-gateway.yaml

@@ -98,7 +98,7 @@ spec:
 
           otelcol.exporter.otlp "tempo" {
             client {
-              endpoint = "grafana-tempo-distributor:4317"
+              endpoint = "grafana-tempo:4317"
 
               tls {
                 insecure = true

charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml

@@ -9,51 +9,51 @@ metadata:
     app.kubernetes.io/part-of: monitoring
 spec:
   chart:
-    spec: {{- include "base-cluster.helm.chartSpec" (dict "repo" "grafana" "chart" "tempo-distributed" "context" $) | nindent 6 }}
+    spec: {{- include "base-cluster.helm.chartSpec" (dict "repo" "grafana" "chart" "tempo" "context" $) | nindent 6 }}
   interval: 1h
   driftDetection:
     mode: enabled
   dependsOn:
     - name: kube-prometheus-stack
       namespace: monitoring
   values:
-    {{- if .Values.global.imageRegistry }}
-    global:
-      image:
-        registry: {{ $.Values.global.imageRegistry }}
-    {{- end }}
-    ingester: {{- include "common.resourcesWithPreset" .Values.monitoring.tracing.ingester | nindent 6 }}
-      persistentVolumeClaimRetentionPolicy:
-        enabled: true
-        whenDeleted: Delete
-        whenScaled: Retain
-      replicas: &replicas 1
-      config:
-        replication_factor: *replicas
-      persistence:
-        enabled: true
-        size: {{ .Values.monitoring.tracing.ingester.persistence.size }}
     tempo:
+      {{- with .Values.global.imageRegistry }}
+      registry: {{ . }}
+      {{- end }}
+      resources: {{- include "common.resources" .Values.monitoring.tracing.resources | nindent 8 }}
       securityContext:
         privileged: false
         seLinuxOptions: {}
         seccompProfile:
           type: RuntimeDefault
-      podSecurityContext:
-        fsGroupChangePolicy: OnRootMismatch
-        supplementalGroups: []
-        sysctls: []
+      receivers:
+        otlp:
+          protocols:
+            grpc:
+              endpoint: "0.0.0.0:4317"
+      reportingEnabled: false
+
+    persistentVolumeClaimRetentionPolicy:
+      enabled: true
+      whenDeleted: Delete
+      whenScaled: Retain
+    replicas: 1
+    retention: 48h
+    persistence:
+      enabled: true
+      size: {{ .Values.monitoring.tracing.ingester.persistence.size }}
+    securityContext:
+      fsGroupChangePolicy: OnRootMismatch
+      supplementalGroups: []
+      sysctls: []
     metricsGenerator:
       enabled: true
-    traces:
-      otlp:
-        grpc:
-          enabled: true
-    metaMonitoring:
-      serviceMonitor:
-        enabled: true
-        labels:
-          monitoring/provisioned-by: base-cluster
+      remoteWriteUrl: "http://kube-prometheus-stack-prometheus:9090/api/v1/write"
+    serviceMonitor:
+      enabled: true
+      additionalLabels:
+        monitoring/provisioned-by: base-cluster
 ---
 apiVersion: v1
 kind: ConfigMap

charts/base-cluster/values.yaml

@@ -111,7 +111,7 @@ global:
       charts:
         loki: 6.46.0
         alloy: 1.5.0
-        tempo-distributed: 1.57.0
+        tempo: 1.24.1
       condition: "{{ and .Values.monitoring.prometheus.enabled (or .Values.monitoring.loki.enabled .Values.monitoring.tracing.enabled) }}"
     external-dns:
       url: https://kubernetes-sigs.github.io/external-dns