Merge pull request #1387 from porter-dev/ym/exclude_agent_logs_fix

fix: correct regex for excluding agent logs/metrics/traces
porter-dev · Aug 21, 2024 · 03465ad · 03465ad
2 parents 1607e01 + 3c3e720
commit 03465ad
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/addons/datadog/values.yaml b/addons/datadog/values.yaml
@@ -796,7 +796,7 @@ datadog:
   # Autodiscovery, as a space-sepatered list
 
   ## ref: https://docs.datadoghq.com/agent/guide/autodiscovery-management/?tab=containerizedagent#exclude-containers
-  containerExclude: 'kube_namespace:cert-manager kube_namespace:ingress-nginx kube_namespace:kube-system kube_namespace:monitoring kube_namespace:porter-agent-system kube_namespace:telemetry image:^gcr.io/datadoghq/agent$'
+  containerExclude: 'kube_namespace:cert-manager kube_namespace:ingress-nginx kube_namespace:kube-system kube_namespace:monitoring kube_namespace:porter-agent-system kube_namespace:telemetry image:^gcr.io/datadoghq/agent:.*'
 
   # datadog.containerInclude -- Include containers in the Agent Autodiscovery,
   # as a space-separated list.  If a container matches an include rule, it’s
@@ -807,15 +807,15 @@ datadog:
 
   # datadog.containerExcludeLogs -- Exclude logs from the Agent Autodiscovery,
   # as a space-separated list
-  containerExcludeLogs: 'kube_namespace:cert-manager kube_namespace:ingress-nginx kube_namespace:kube-system kube_namespace:monitoring kube_namespace:porter-agent-system kube_namespace:telemetry image:^gcr.io/datadoghq/agent$'
+  containerExcludeLogs: 'kube_namespace:cert-manager kube_namespace:ingress-nginx kube_namespace:kube-system kube_namespace:monitoring kube_namespace:porter-agent-system kube_namespace:telemetry image:^gcr.io/datadoghq/agent:.*'
 
   # datadog.containerIncludeLogs -- Include logs in the Agent Autodiscovery, as
   # a space-separated list
   containerIncludeLogs: null
 
   # datadog.containerExcludeMetrics -- Exclude metrics from the Agent
   # Autodiscovery, as a space-separated list
-  containerExcludeMetrics: 'kube_namespace:cert-manager kube_namespace:ingress-nginx kube_namespace:kube-system kube_namespace:monitoring kube_namespace:porter-agent-system kube_namespace:telemetry image:^gcr.io/datadoghq/agent$'
+  containerExcludeMetrics: 'kube_namespace:cert-manager kube_namespace:ingress-nginx kube_namespace:kube-system kube_namespace:monitoring kube_namespace:porter-agent-system kube_namespace:telemetry image:^gcr.io/datadoghq/agent:.*'
 
   # datadog.containerIncludeMetrics -- Include metrics in the Agent
   # Autodiscovery, as a space-separated list