🔇 Exclude PGAdmin health logs from Datadog (#1330)

* Fix trailing squote in Public Web log exclusion * Fix Istio Sidecar exclusions
didx-xyz · Feb 12, 2025 · 08ce966 · 08ce966
1 parent 4682a25
commit 08ce966
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/helm/acapy-cloud.yaml.gotmpl b/helm/acapy-cloud.yaml.gotmpl
@@ -150,9 +150,9 @@ releases:
           podLabels:
             admission.datadoghq.com/enabled: "false"
             tags.datadoghq.com/env: {{ .Environment.Name }}
+            sidecar.istio.io/inject: "false"
           podAnnotations:
             ad.datadoghq.com/logs_exclude: "true" # Disable datadog log shipping
-            sidecar.istio.io/inject: "false"
 
   # https://github.com/bitnami/charts/tree/main/bitnami/nats
   - name: nats

diff --git a/helm/acapy-cloud/conf/dev/public-web.yaml b/helm/acapy-cloud/conf/dev/public-web.yaml
@@ -13,7 +13,7 @@ podAnnotations:
         "name": "exclude_health_probes",
         "pattern": "GET /docs HTTP/\\d\\.\\d\"\\s+200\\s+OK"
       }]
-    }]]'
+    }]
 
 image:
   name: acapy-cloud/app

diff --git a/tilt/acapy-cloud/pgadmin.yaml b/tilt/acapy-cloud/pgadmin.yaml
@@ -30,8 +30,18 @@ ingress:
 persistentVolume:
   enabled: false
 
-podAnnotations: {}
-podlabels:
+podAnnotations:
+  ad.datadoghq.com/pgadmin4.logs: >-
+    [{
+      "source": "pgadmin4",
+      "service": "pgadmin4",
+      "log_processing_rules": [{
+        "type": "exclude_at_match",
+        "name": "exclude_health_probes",
+        "pattern": "GET /misc/ping HTTP/1\\.1\" 200"
+      }]
+    }]
+podLabels:
   sidecar.istio.io/inject: "false"
 
 readinessProbe:

diff --git a/tilt/ingress_nginx/values.yaml b/tilt/ingress_nginx/values.yaml
@@ -34,7 +34,7 @@ controller:
       https: 443
   admissionWebhooks:
     patch:
-      podAnnotations:
+      podLabels:
         sidecar.istio.io/inject: "false"
 defaultBackend:
   enabled: false
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ podAnnotations: @@
             "name": "exclude_health_probes",
             "pattern": "GET /docs HTTP/\\d\\.\\d\"\\s+200\\s+OK"
           }]
-        }]]'
+        }]
     image:
       name: acapy-cloud/app
@@ Expand Down @@