Fix the alloy config

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>

charts/meta-monitoring/Chart.lock

@@ -1,7 +1,7 @@
 dependencies:
 - name: loki
   repository: https://grafana.github.io/helm-charts
-  version: 6.4.2
+  version: 6.5.0
 - name: alloy
   repository: https://grafana.github.io/helm-charts
   version: 0.1.1
@@ -10,9 +10,9 @@ dependencies:
   version: 5.3.0
 - name: tempo-distributed
   repository: https://grafana.github.io/helm-charts
-  version: 1.9.5
+  version: 1.9.7
 - name: minio
   repository: https://charts.min.io
   version: 5.2.0
-digest: sha256:1b5cc2c89ce11b6f0f1c02d7459ac9202577ac4e56bae9cc7e54e253a27df265
-generated: "2024-05-03T07:02:27.762464734Z"
+digest: sha256:297f462812b6436834d8b82a028840bd55bd9e935b3d0a3e8206ac54a113be01
+generated: "2024-05-07T09:22:16.438693788Z"

charts/meta-monitoring/Chart.yaml

@@ -22,7 +22,7 @@ appVersion: "0.0.1"
 dependencies:
 - name: loki
   repository: https://grafana.github.io/helm-charts
-  version: 6.4.2
+  version: 6.5.0
   condition: local.logs.enabled
 - name: alloy
   repository: https://grafana.github.io/helm-charts
@@ -33,7 +33,7 @@ dependencies:
   condition: local.metrics.enabled
 - name: tempo-distributed
   repository: https://grafana.github.io/helm-charts
-  version: 1.9.5
+  version: 1.9.7
   condition: local.traces.enabled
 - name: minio
   repository: https://charts.min.io

charts/meta-monitoring/templates/agent/_helpers-agent.tpl

@@ -48,7 +48,7 @@
 {{- define "agent.tempo_write_targets" -}}
 {{- $list := list }}
 {{- if .Values.local.traces.enabled }}
-{{- $list = append $list ("otelcol.exporter.otlp.local.input") }}
+{{- $list = append $list ("otelcol.exporter.otlphttp.local.input") }}
 {{- end }}
 {{- if .Values.cloud.traces.enabled }}
 {{- $list = append $list ("otelcol.exporter.otlphttp.cloud.input") }}

charts/meta-monitoring/templates/agent/config.yaml

@@ -294,9 +294,7 @@ data:
       // We don't technically need this, but it shows how to change listen address and incoming port.
       // In this case, the Agent is listening on all available bindable addresses on port 4317 (which is the
       // default OTLP gRPC port) for the OTLP protocol.
-      grpc {
-        endpoint = "0.0.0.0:4317"
-      }
+      grpc {}
 
       // We define where to send the output of all ingested traces. In this case, to the OpenTelemetry batch processor
       // named 'default'.
@@ -345,6 +343,14 @@ data:
     }
     {{- end }}
 
+    {{- if .Values.local.traces.enabled }}
+    otelcol.exporter.otlphttp "local" {
+        client {
+            endpoint = "http://{{- .Release.Name -}}-tempo-distributor.svc:4318"
+        }
+    }
+    {{- end }}
+
     {{- if .Values.cloud.logs.enabled }}
     loki.write "cloud" {
       endpoint {

charts/meta-monitoring/templates/ruler/ruler.yaml

@@ -51,7 +51,7 @@ spec:
               protocol: TCP
           envFrom:
           - secretRef:
-             name: mmc-minio
+             name: minio
           readinessProbe:
             failureThreshold: 3
             httpGet:

charts/meta-monitoring/values.yaml

@@ -180,7 +180,7 @@ metrics:
   # Additional metrics to retain
   extraMetrics: []
 
-# Set enabled = true to add the default logs/metrics/traces dashboards to the local Grafana
+# Set enabled = true to add the default logs dashboards to the local Grafana
 dashboards:
   logs:
     enabled: true
@@ -189,11 +189,6 @@ dashboards:
   traces:
     enabled: true
 
-global:
-  minio:
-    rootUser: "rootuser"
-    rootPassword: "rootpassword"
-
 kubeStateMetrics:
   # Scrape https://github.com/kubernetes/kube-state-metrics by default
   enabled: true
@@ -259,19 +254,19 @@ loki:
     - "-config.expand-env=true"
     extraEnvFrom:
     - secretRef:
-        name: "mmc-minio"
+        name: "minio"
   read:
     extraArgs:
     - "-config.expand-env=true"
     extraEnvFrom:
     - secretRef:
-        name: "mmc-minio"
+        name: "minio"
   backend:
     extraArgs:
     - "-config.expand-env=true"
     extraEnvFrom:
     - secretRef:
-        name: "mmc-minio"
+        name: "minio"
 
 alloy:
   alloy:
@@ -311,7 +306,7 @@ mimir-distributed:
   global:
     extraEnvFrom:
     - secretRef:
-        name: "mmc-minio"
+        name: "minio"
   mimir:
     structuredConfig:
       alertmanager_storage:
@@ -353,31 +348,31 @@ tempo-distributed:
     - "-config.expand-env=true"
     extraEnvFrom:
     - secretRef:
-        name: "mmc-minio"
+        name: "minio"
   ingester:
     extraArgs:
     - "-config.expand-env=true"
     extraEnvFrom:
     - secretRef:
-        name: "mmc-minio"
+        name: "minio"
   compactor:
     extraArgs:
     - "-config.expand-env=true"
     extraEnvFrom:
     - secretRef:
-        name: "mmc-minio"
+        name: "minio"
   querier:
     extraArgs:
     - "-config.expand-env=true"
     extraEnvFrom:
     - secretRef:
-        name: "mmc-minio"
+        name: "minio"
   queryFrontend:
     extraArgs:
     - "-config.expand-env=true"
     extraEnvFrom:
     - secretRef:
-        name: "mmc-minio"
+        name: "minio"
   traces:
     otlp:
       http:

docs/installation.md

@@ -67,7 +67,7 @@
    kubectl create namespace meta
    ```
 
-1. Create a secret with the user and password for the local Minio:
+1. Create a secret named `minio` with the user and password for the local Minio:
 
    ```
    kubectl create secret generic minio -n meta \