Add the integration label to the labels to keep list.

It'll be dropped later, and it's required for the integration matcher later Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Jan 16, 2025 · a4bbf59 · a4bbf59
1 parent ffe7606
commit a4bbf59
Show file tree

Hide file tree

Showing 50 changed files with 53 additions and 53 deletions.
diff --git a/charts/k8s-monitoring/charts/feature-pod-logs/templates/_common_log_processing.alloy.tpl b/charts/k8s-monitoring/charts/feature-pod-logs/templates/_common_log_processing.alloy.tpl
@@ -54,7 +54,7 @@ loki.process "pod_logs" {
 
   // Only keep the labels that are defined in the `keepLabels` list.
   stage.label_keep {
-    values = {{ . | toJson }}
+    values = {{ append . "integration" | toJson }}
   }
 {{- end }}
 

diff --git a/charts/k8s-monitoring/charts/feature-pod-logs/tests/default_test.yaml b/charts/k8s-monitoring/charts/feature-pod-logs/tests/default_test.yaml
@@ -142,7 +142,7 @@ tests:
 
                 // Only keep the labels that are defined in the `keepLabels` list.
                 stage.label_keep {
-                  values = ["app_kubernetes_io_name","container","instance","job","level","namespace","pod","service_name"]
+                  values = ["app_kubernetes_io_name","container","instance","job","level","namespace","pod","service_name","integration"]
                 }
 
                 forward_to = argument.logs_destinations.value
@@ -293,7 +293,7 @@ tests:
 
                 // Only keep the labels that are defined in the `keepLabels` list.
                 stage.label_keep {
-                  values = ["k8s_container_name","k8s_namespace","k8s_pod_name","k8s_pod_label_app_kubernetes_io_name"]
+                  values = ["k8s_container_name","k8s_namespace","k8s_pod_name","k8s_pod_label_app_kubernetes_io_name","integration"]
                 }
 
                 forward_to = argument.logs_destinations.value
@@ -449,7 +449,7 @@ tests:
 
                 // Only keep the labels that are defined in the `keepLabels` list.
                 stage.label_keep {
-                  values = ["app_kubernetes_io_name","container","instance","job","level","namespace","pod","service_name"]
+                  values = ["app_kubernetes_io_name","container","instance","job","level","namespace","pod","service_name","integration"]
                 }
 
                 forward_to = argument.logs_destinations.value
@@ -599,7 +599,7 @@ tests:
             
                 // Only keep the labels that are defined in the `keepLabels` list.
                 stage.label_keep {
-                  values = ["app_kubernetes_io_name","container","instance","job","level","namespace","pod","service_name"]
+                  values = ["app_kubernetes_io_name","container","instance","job","level","namespace","pod","service_name","integration"]
                 }
             
                 stage.static_labels {

diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml b/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/auth/oauth2/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/auth/oauth2/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/auth/oauth2/output.yaml b/charts/k8s-monitoring/docs/examples/auth/oauth2/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/collector-storage/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/collector-storage/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml b/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/destinations/otlp-endpoint/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/destinations/otlp-endpoint/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/destinations/otlp-endpoint/output.yaml b/charts/k8s-monitoring/docs/examples/destinations/otlp-endpoint/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/extra-rules/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/extra-rules/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml b/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml
diff --git a/...nitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/alloy-logs.alloy b/...nitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/alloy-logs.alloy
diff --git a/...8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml b/...8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/grafana/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/integrations/grafana/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/grafana/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/grafana/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/pod-logs/default/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/pod-logs/default/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/features/pod-logs/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/pod-logs/default/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy b/charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy
diff --git a/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml b/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/platforms/azure-aks/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/platforms/azure-aks/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/platforms/eks-fargate/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/platforms/eks-fargate/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/platforms/eks-fargate/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/eks-fargate/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/platforms/openshift/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/platforms/openshift/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/private-image-registries/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/private-image-registries/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml b/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/proxies/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/proxies/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/proxies/output.yaml b/charts/k8s-monitoring/docs/examples/proxies/output.yaml
diff --git a/charts/k8s-monitoring/tests/integration/auth/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/auth/.rendered/output.yaml
@@ -787,7 +787,7 @@ data:
 
         // Only keep the labels that are defined in the `keepLabels` list.
         stage.label_keep {
-          values = ["app_kubernetes_io_name","container","instance","job","level","namespace","pod","service_name"]
+          values = ["app_kubernetes_io_name","container","instance","job","level","namespace","pod","service_name","integration"]
         }
 
         forward_to = argument.logs_destinations.value