From 14f2fbb4c41a3320c56a2c27a15656cb6829441f Mon Sep 17 00:00:00 2001 From: Pete Wall Date: Thu, 9 Jan 2025 10:25:45 -0600 Subject: [PATCH] Do not exclude the go or process metrics from alloy (#1086) Signed-off-by: Pete Wall --- .../feature-integrations/templates/_integration_alloy.tpl | 2 +- .../charts/feature-integrations/tests/alloy_test.yaml | 2 +- .../examples/features/integrations/alloy/alloy-metrics.alloy | 2 +- .../docs/examples/features/integrations/alloy/output.yaml | 2 +- .../docs/examples/meta-monitoring/alloy-singleton.alloy | 2 +- charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml | 2 +- .../tests/platform/eks-with-windows/.rendered/output.yaml | 2 +- .../tests/platform/gke-autopilot/.rendered/output.yaml | 2 +- .../grafana-cloud-features/k8s-monitoring/.rendered/output.yaml | 2 +- .../tests/platform/otlp-gateway/.rendered/output.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_alloy.tpl b/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_alloy.tpl index e7952eb8f..fb820b3a1 100644 --- a/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_alloy.tpl +++ b/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_alloy.tpl @@ -141,7 +141,7 @@ declare "alloy_integration" { // drop metrics that match the drop_metrics regex rule { source_labels = ["__name__"] - regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)") + regex = coalesce(argument.drop_metrics.value, "") action = "drop" } diff --git a/charts/k8s-monitoring/charts/feature-integrations/tests/alloy_test.yaml b/charts/k8s-monitoring/charts/feature-integrations/tests/alloy_test.yaml index a8fea3f5d..0ca55de4a 100644 --- a/charts/k8s-monitoring/charts/feature-integrations/tests/alloy_test.yaml +++ b/charts/k8s-monitoring/charts/feature-integrations/tests/alloy_test.yaml @@ -213,7 +213,7 @@ tests: // drop metrics that match the drop_metrics regex rule { source_labels = ["__name__"] - regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)") + regex = coalesce(argument.drop_metrics.value, "") action = "drop" } diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/alloy/alloy-metrics.alloy b/charts/k8s-monitoring/docs/examples/features/integrations/alloy/alloy-metrics.alloy index 37839d543..2400020bc 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/alloy/alloy-metrics.alloy +++ b/charts/k8s-monitoring/docs/examples/features/integrations/alloy/alloy-metrics.alloy @@ -243,7 +243,7 @@ declare "alloy_integration" { // drop metrics that match the drop_metrics regex rule { source_labels = ["__name__"] - regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)") + regex = coalesce(argument.drop_metrics.value, "") action = "drop" } diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/alloy/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/alloy/output.yaml index 586823817..1c9d1b4d7 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/alloy/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/integrations/alloy/output.yaml @@ -268,7 +268,7 @@ data: // drop metrics that match the drop_metrics regex rule { source_labels = ["__name__"] - regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)") + regex = coalesce(argument.drop_metrics.value, "") action = "drop" } diff --git a/charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy b/charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy index c28ff164c..e648a3539 100644 --- a/charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy +++ b/charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy @@ -699,7 +699,7 @@ declare "alloy_integration" { // drop metrics that match the drop_metrics regex rule { source_labels = ["__name__"] - regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)") + regex = coalesce(argument.drop_metrics.value, "") action = "drop" } diff --git a/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml b/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml index b52d984c9..3dbfcd782 100644 --- a/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml +++ b/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml @@ -741,7 +741,7 @@ data: // drop metrics that match the drop_metrics regex rule { source_labels = ["__name__"] - regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)") + regex = coalesce(argument.drop_metrics.value, "") action = "drop" } diff --git a/charts/k8s-monitoring/tests/platform/eks-with-windows/.rendered/output.yaml b/charts/k8s-monitoring/tests/platform/eks-with-windows/.rendered/output.yaml index a616457f9..56ff5e91c 100644 --- a/charts/k8s-monitoring/tests/platform/eks-with-windows/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/platform/eks-with-windows/.rendered/output.yaml @@ -607,7 +607,7 @@ data: // drop metrics that match the drop_metrics regex rule { source_labels = ["__name__"] - regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)") + regex = coalesce(argument.drop_metrics.value, "") action = "drop" } diff --git a/charts/k8s-monitoring/tests/platform/gke-autopilot/.rendered/output.yaml b/charts/k8s-monitoring/tests/platform/gke-autopilot/.rendered/output.yaml index 621f1d8cb..6209ea249 100644 --- a/charts/k8s-monitoring/tests/platform/gke-autopilot/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/platform/gke-autopilot/.rendered/output.yaml @@ -367,7 +367,7 @@ data: // drop metrics that match the drop_metrics regex rule { source_labels = ["__name__"] - regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)") + regex = coalesce(argument.drop_metrics.value, "") action = "drop" } diff --git a/charts/k8s-monitoring/tests/platform/grafana-cloud-features/k8s-monitoring/.rendered/output.yaml b/charts/k8s-monitoring/tests/platform/grafana-cloud-features/k8s-monitoring/.rendered/output.yaml index 8edcea196..ee3497dc0 100644 --- a/charts/k8s-monitoring/tests/platform/grafana-cloud-features/k8s-monitoring/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/platform/grafana-cloud-features/k8s-monitoring/.rendered/output.yaml @@ -717,7 +717,7 @@ data: // drop metrics that match the drop_metrics regex rule { source_labels = ["__name__"] - regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)") + regex = coalesce(argument.drop_metrics.value, "") action = "drop" } diff --git a/charts/k8s-monitoring/tests/platform/otlp-gateway/.rendered/output.yaml b/charts/k8s-monitoring/tests/platform/otlp-gateway/.rendered/output.yaml index 88d085a42..7126b5d49 100644 --- a/charts/k8s-monitoring/tests/platform/otlp-gateway/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/platform/otlp-gateway/.rendered/output.yaml @@ -296,7 +296,7 @@ data: // drop metrics that match the drop_metrics regex rule { source_labels = ["__name__"] - regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)") + regex = coalesce(argument.drop_metrics.value, "") action = "drop" }