From 1053000b85a087f9d07de0e06457d27995357662 Mon Sep 17 00:00:00 2001 From: Pete Wall Date: Fri, 26 Jul 2024 10:00:10 -0500 Subject: [PATCH] Re-filter after discovery.process to remove any non-kubernetes java processes (#652) * Re-filter after discovery.process to remove any non-kubernetes java processes Signed-off-by: Pete Wall * No need to re-filter namespaces Signed-off-by: Pete Wall * Move pod drop higher up to filter earlier. Rearrange some of the rule arguments Signed-off-by: Pete Wall --------- Signed-off-by: Pete Wall --- .../alloy_config/_profiles_java.alloy.txt | 17 ++++++---- .../application-observability/output.yaml | 34 ++++++++++++------- .../application-observability/profiles.alloy | 17 ++++++---- examples/profiles-enabled/output.yaml | 34 ++++++++++++------- examples/profiles-enabled/profiles.alloy | 17 ++++++---- 5 files changed, 77 insertions(+), 42 deletions(-) diff --git a/charts/k8s-monitoring/templates/alloy_config/_profiles_java.alloy.txt b/charts/k8s-monitoring/templates/alloy_config/_profiles_java.alloy.txt index 7a0597813..9adcff96f 100644 --- a/charts/k8s-monitoring/templates/alloy_config/_profiles_java.alloy.txt +++ b/charts/k8s-monitoring/templates/alloy_config/_profiles_java.alloy.txt @@ -21,9 +21,14 @@ discovery.process "java_pods" { discovery.relabel "java_pods" { targets = discovery.process.java_pods.targets rule { - action = "drop" - regex = "Succeeded|Failed|Completed" source_labels = ["__meta_kubernetes_pod_phase"] + regex = "Succeeded|Failed|Completed" + action = "drop" + } + rule { + source_labels = ["__meta_kubernetes_pod_name"] + regex = "^$" + action = "drop" } rule { source_labels = ["__meta_process_exe"] @@ -31,23 +36,23 @@ discovery.relabel "java_pods" { regex = ".*/java$" } rule { - action = "replace" source_labels = ["__meta_kubernetes_namespace"] + action = "replace" target_label = "namespace" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_name"] + action = "replace" target_label = "pod" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_node_name"] + action = "replace" target_label = "node" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_container_name"] + action = "replace" target_label = "container" } {{- if .Values.profiles.java.extraRelabelingRules }} diff --git a/examples/application-observability/output.yaml b/examples/application-observability/output.yaml index a2be7deb0..0f3d5ccf4 100644 --- a/examples/application-observability/output.yaml +++ b/examples/application-observability/output.yaml @@ -1367,9 +1367,14 @@ data: discovery.relabel "java_pods" { targets = discovery.process.java_pods.targets rule { - action = "drop" - regex = "Succeeded|Failed|Completed" source_labels = ["__meta_kubernetes_pod_phase"] + regex = "Succeeded|Failed|Completed" + action = "drop" + } + rule { + source_labels = ["__meta_kubernetes_pod_name"] + regex = "^$" + action = "drop" } rule { source_labels = ["__meta_process_exe"] @@ -1377,23 +1382,23 @@ data: regex = ".*/java$" } rule { - action = "replace" source_labels = ["__meta_kubernetes_namespace"] + action = "replace" target_label = "namespace" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_name"] + action = "replace" target_label = "pod" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_node_name"] + action = "replace" target_label = "node" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_container_name"] + action = "replace" target_label = "container" } } @@ -61438,9 +61443,14 @@ data: discovery.relabel "java_pods" { targets = discovery.process.java_pods.targets rule { - action = "drop" - regex = "Succeeded|Failed|Completed" source_labels = ["__meta_kubernetes_pod_phase"] + regex = "Succeeded|Failed|Completed" + action = "drop" + } + rule { + source_labels = ["__meta_kubernetes_pod_name"] + regex = "^$" + action = "drop" } rule { source_labels = ["__meta_process_exe"] @@ -61448,23 +61458,23 @@ data: regex = ".*/java$" } rule { - action = "replace" source_labels = ["__meta_kubernetes_namespace"] + action = "replace" target_label = "namespace" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_name"] + action = "replace" target_label = "pod" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_node_name"] + action = "replace" target_label = "node" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_container_name"] + action = "replace" target_label = "container" } } diff --git a/examples/application-observability/profiles.alloy b/examples/application-observability/profiles.alloy index 89f5d2e97..78949e318 100644 --- a/examples/application-observability/profiles.alloy +++ b/examples/application-observability/profiles.alloy @@ -68,9 +68,14 @@ discovery.process "java_pods" { discovery.relabel "java_pods" { targets = discovery.process.java_pods.targets rule { - action = "drop" - regex = "Succeeded|Failed|Completed" source_labels = ["__meta_kubernetes_pod_phase"] + regex = "Succeeded|Failed|Completed" + action = "drop" + } + rule { + source_labels = ["__meta_kubernetes_pod_name"] + regex = "^$" + action = "drop" } rule { source_labels = ["__meta_process_exe"] @@ -78,23 +83,23 @@ discovery.relabel "java_pods" { regex = ".*/java$" } rule { - action = "replace" source_labels = ["__meta_kubernetes_namespace"] + action = "replace" target_label = "namespace" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_name"] + action = "replace" target_label = "pod" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_node_name"] + action = "replace" target_label = "node" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_container_name"] + action = "replace" target_label = "container" } } diff --git a/examples/profiles-enabled/output.yaml b/examples/profiles-enabled/output.yaml index 40a2bcc3d..b1434f357 100644 --- a/examples/profiles-enabled/output.yaml +++ b/examples/profiles-enabled/output.yaml @@ -1302,9 +1302,14 @@ data: discovery.relabel "java_pods" { targets = discovery.process.java_pods.targets rule { - action = "drop" - regex = "Succeeded|Failed|Completed" source_labels = ["__meta_kubernetes_pod_phase"] + regex = "Succeeded|Failed|Completed" + action = "drop" + } + rule { + source_labels = ["__meta_kubernetes_pod_name"] + regex = "^$" + action = "drop" } rule { source_labels = ["__meta_process_exe"] @@ -1312,23 +1317,23 @@ data: regex = ".*/java$" } rule { - action = "replace" source_labels = ["__meta_kubernetes_namespace"] + action = "replace" target_label = "namespace" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_name"] + action = "replace" target_label = "pod" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_node_name"] + action = "replace" target_label = "node" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_container_name"] + action = "replace" target_label = "container" } } @@ -61321,9 +61326,14 @@ data: discovery.relabel "java_pods" { targets = discovery.process.java_pods.targets rule { - action = "drop" - regex = "Succeeded|Failed|Completed" source_labels = ["__meta_kubernetes_pod_phase"] + regex = "Succeeded|Failed|Completed" + action = "drop" + } + rule { + source_labels = ["__meta_kubernetes_pod_name"] + regex = "^$" + action = "drop" } rule { source_labels = ["__meta_process_exe"] @@ -61331,23 +61341,23 @@ data: regex = ".*/java$" } rule { - action = "replace" source_labels = ["__meta_kubernetes_namespace"] + action = "replace" target_label = "namespace" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_name"] + action = "replace" target_label = "pod" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_node_name"] + action = "replace" target_label = "node" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_container_name"] + action = "replace" target_label = "container" } } diff --git a/examples/profiles-enabled/profiles.alloy b/examples/profiles-enabled/profiles.alloy index 607484f88..27b34d22d 100644 --- a/examples/profiles-enabled/profiles.alloy +++ b/examples/profiles-enabled/profiles.alloy @@ -68,9 +68,14 @@ discovery.process "java_pods" { discovery.relabel "java_pods" { targets = discovery.process.java_pods.targets rule { - action = "drop" - regex = "Succeeded|Failed|Completed" source_labels = ["__meta_kubernetes_pod_phase"] + regex = "Succeeded|Failed|Completed" + action = "drop" + } + rule { + source_labels = ["__meta_kubernetes_pod_name"] + regex = "^$" + action = "drop" } rule { source_labels = ["__meta_process_exe"] @@ -78,23 +83,23 @@ discovery.relabel "java_pods" { regex = ".*/java$" } rule { - action = "replace" source_labels = ["__meta_kubernetes_namespace"] + action = "replace" target_label = "namespace" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_name"] + action = "replace" target_label = "pod" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_node_name"] + action = "replace" target_label = "node" } rule { - action = "replace" source_labels = ["__meta_kubernetes_pod_container_name"] + action = "replace" target_label = "container" } }