From 164d31efa73e8fadab31e59bac1c7393cbf068e4 Mon Sep 17 00:00:00 2001
From: Jose Henrique <jose.henrique.ivan@gmail.com>
Date: Sun, 30 Aug 2026 20:06:23 -0300
Subject: [PATCH] =?UTF-8?q?alloy:=20fix=20helm=20values=20nesting=20?=
 =?UTF-8?q?=E2=80=94=20configMap/clustering/mounts/resources=20belong=20un?=
 =?UTF-8?q?der=20alloy.*;=20chart=20was=20silently=20ignoring=20them=20(lo?=
 =?UTF-8?q?gs=20never=20collected)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/alloy/alloy.yaml | 187 +++++++++++++++++++++---------------------
 1 file changed, 94 insertions(+), 93 deletions(-)

diff --git a/apps/alloy/alloy.yaml b/apps/alloy/alloy.yaml
index cd2240a..1bc0a9c 100644
--- a/apps/alloy/alloy.yaml
+++ b/apps/alloy/alloy.yaml
@@ -19,104 +19,105 @@ spec:
     targetRevision: 1.12.1
     helm:
       valuesObject:
-        clustering: { enabled: false }
-        mounts:
-          varlog: true
         controller:
           type: daemonset
-        resources:
-          requests:
-            cpu: 100m
-            memory: 128Mi
-          limits:
-            cpu: 200m
-            memory: 256Mi
-        configMap:
-          create: true
-          content: |-
-            discovery.kubernetes "all_pods" {
-              role = "pod"
+        alloy:
+          clustering: { enabled: false }
+          mounts:
+            varlog: true
+          resources:
+            requests:
+              cpu: 100m
+              memory: 128Mi
+            limits:
+              cpu: 200m
+              memory: 256Mi
+          configMap:
+            create: true
+            content: |-
+              discovery.kubernetes "all_pods" {
+                role = "pod"
 
-              selectors {
-                role  = "pod"
-                field = "spec.nodeName=" + coalesce(env("HOSTNAME"), constants.hostname)
-              }
-            }
-
-            discovery.relabel "all_pods" {
-              targets = discovery.kubernetes.all_pods.targets
-
-              rule {
-                source_labels = ["__meta_kubernetes_namespace"]
-                target_label  = "namespace"
-              }
-              rule {
-                source_labels = ["__meta_kubernetes_pod_name"]
-                target_label  = "pod"
-              }
-              rule {
-                source_labels = ["__meta_kubernetes_pod_container_name"]
-                target_label  = "container"
-              }
-              rule {
-                source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
-                target_label  = "app"
-              }
-            }
-
-            loki.source.kubernetes "all_logs" {
-              targets    = discovery.relabel.all_pods.output
-              forward_to = [loki.write.main.receiver]
-            }
-
-            discovery.kubernetes "shared_pods" {
-              role = "pod"
-              selectors {
-                role  = "pod"
-                field = "metadata.namespace=chacal"
-              }
-            }
-
-            discovery.relabel "shared_pods" {
-              targets = discovery.kubernetes.shared_pods.targets
-
-              rule {
-                source_labels = ["__meta_kubernetes_namespace"]
-                target_label  = "namespace"
-              }
-              rule {
-                source_labels = ["__meta_kubernetes_pod_name"]
-                target_label  = "pod"
-              }
-              rule {
-                source_labels = ["__meta_kubernetes_pod_container_name"]
-                target_label  = "container"
-              }
-              rule {
-                source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
-                target_label  = "app"
-              }
-            }
-
-            loki.source.kubernetes "shared_logs" {
-              targets    = discovery.relabel.shared_pods.output
-              forward_to = [loki.write.shared.receiver]
-            }
-
-            loki.write "main" {
-              endpoint {
-                url = "http://loki.monitoring.svc.cluster.local:3100/loki/api/v1/push"
-                headers = {
-                  "X-Scope-OrgID" = "main",
+                selectors {
+                  role  = "pod"
+                  field = "spec.nodeName=" + coalesce(env("HOSTNAME"), constants.hostname)
                 }
               }
-            }
 
-            loki.write "shared" {
-              endpoint {
-                url = "http://loki.monitoring.svc.cluster.local:3100/loki/api/v1/push"
-                headers = {
-                  "X-Scope-OrgID" = "chacal",
+              discovery.relabel "all_pods" {
+                targets = discovery.kubernetes.all_pods.targets
+
+                rule {
+                  source_labels = ["__meta_kubernetes_namespace"]
+                  target_label  = "namespace"
+                }
+                rule {
+                  source_labels = ["__meta_kubernetes_pod_name"]
+                  target_label  = "pod"
+                }
+                rule {
+                  source_labels = ["__meta_kubernetes_pod_container_name"]
+                  target_label  = "container"
+                }
+                rule {
+                  source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
+                  target_label  = "app"
+                }
+              }
+
+              loki.source.kubernetes "all_logs" {
+                targets    = discovery.relabel.all_pods.output
+                forward_to = [loki.write.main.receiver]
+              }
+
+              discovery.kubernetes "shared_pods" {
+                role = "pod"
+                selectors {
+                  role  = "pod"
+                  field = "metadata.namespace=chacal"
+                }
+              }
+
+              discovery.relabel "shared_pods" {
+                targets = discovery.kubernetes.shared_pods.targets
+
+                rule {
+                  source_labels = ["__meta_kubernetes_namespace"]
+                  target_label  = "namespace"
+                }
+                rule {
+                  source_labels = ["__meta_kubernetes_pod_name"]
+                  target_label  = "pod"
+                }
+                rule {
+                  source_labels = ["__meta_kubernetes_pod_container_name"]
+                  target_label  = "container"
+                }
+                rule {
+                  source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
+                  target_label  = "app"
+                }
+              }
+
+              loki.source.kubernetes "shared_logs" {
+                targets    = discovery.relabel.shared_pods.output
+                forward_to = [loki.write.shared.receiver]
+              }
+
+              loki.write "main" {
+                endpoint {
+                  url = "http://loki.monitoring.svc.cluster.local:3100/loki/api/v1/push"
+                  headers = {
+                    "X-Scope-OrgID" = "main",
+                  }
+                }
+              }
+
+              loki.write "shared" {
+                endpoint {
+                  url = "http://loki.monitoring.svc.cluster.local:3100/loki/api/v1/push"
+                  headers = {
+                    "X-Scope-OrgID" = "chacal",
+                  }
                 }
               }
-            }