The presence of __tmp_port was breaking deduplication rules. (#740)

Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Sep 18, 2024 · bacf05d · bacf05d · nightfall-for-github · Sep 20, 2024
1 parent 432f38f
commit bacf05d
Show file tree

Hide file tree

Showing 61 changed files with 728 additions and 0 deletions.
diff --git a/charts/k8s-monitoring/templates/alloy_config/_annotation_autodiscovery.alloy.txt b/charts/k8s-monitoring/templates/alloy_config/_annotation_autodiscovery.alloy.txt
@@ -40,6 +40,10 @@ discovery.relabel "annotation_autodiscovery_pods" {
     action = "keepequal"
     target_label = "__tmp_port"
   }
+  rule {
+    action = "labeldrop"
+    regex = "__tmp_port"
+  }
 
   // If the metrics port number annotation has a value, override the target address to use it, regardless whether it is
   // one of the declared ports on that Pod.
@@ -128,6 +132,10 @@ discovery.relabel "annotation_autodiscovery_services" {
     action = "keepequal"
     target_label = "__tmp_port"
   }
+  rule {
+    action = "labeldrop"
+    regex = "__tmp_port"
+  }
 
   rule {
     source_labels = ["__meta_kubernetes_service_annotation_{{ include "escape_label" .Values.metrics.autoDiscover.annotations.metricsScheme }}"]

diff --git a/examples/alloy-autoscaling-and-storage/metrics.alloy b/examples/alloy-autoscaling-and-storage/metrics.alloy
diff --git a/examples/alloy-autoscaling-and-storage/output.yaml b/examples/alloy-autoscaling-and-storage/output.yaml
diff --git a/examples/application-observability/metrics.alloy b/examples/application-observability/metrics.alloy
diff --git a/examples/application-observability/output.yaml b/examples/application-observability/output.yaml
diff --git a/examples/azure-aks/metrics.alloy b/examples/azure-aks/metrics.alloy
diff --git a/examples/azure-aks/output.yaml b/examples/azure-aks/output.yaml
diff --git a/examples/bearer-token-auth/metrics.alloy b/examples/bearer-token-auth/metrics.alloy
diff --git a/examples/bearer-token-auth/output.yaml b/examples/bearer-token-auth/output.yaml
diff --git a/examples/beyla/metrics.alloy b/examples/beyla/metrics.alloy
diff --git a/examples/beyla/output.yaml b/examples/beyla/output.yaml
diff --git a/examples/control-plane-metrics/metrics.alloy b/examples/control-plane-metrics/metrics.alloy