🐛 More log fixes

didx-xyz · Feb 12, 2025 · 5b45c36 · 5b45c36
1 parent d4bbace
commit 5b45c36
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 12 deletions.
diff --git a/helm/acapy-cloud/conf/dev/endorser.yaml b/helm/acapy-cloud/conf/dev/endorser.yaml
@@ -4,7 +4,16 @@ replicaCount: 1
 
 podAnnotations:
   sidecar.istio.io/proxyCPU: 10m
-  ad.datadoghq.com/endorser.logs: '[{"source": "python.uvicorn", "service": "endorser"}]'
+  ad.datadoghq.com/endorser.logs: >-
+    [{
+      "source": "python.uvicorn",
+      "service": "endorser",
+      "log_processing_rules": [{
+        "type": "exclude_at_match",
+        "name": "exclude_health_probes",
+        "pattern": "GET /health/(ready|live) HTTP/\\d\\.\\d\"\\s+200\\s+OK"
+      }]
+    }]
   proxy.istio.io/config: |-
     proxyMetadata:
       ISTIO_META_IDLE_TIMEOUT: 0s

diff --git a/helm/acapy-cloud/conf/dev/governance-web.yaml b/helm/acapy-cloud/conf/dev/governance-web.yaml
@@ -4,7 +4,16 @@ replicaCount: 1
 
 podAnnotations:
   sidecar.istio.io/proxyCPU: 10m
-  ad.datadoghq.com/governance-web.logs: '[{"source": "python.uvicorn", "service": "governance-web"}]'
+  ad.datadoghq.com/governance-web.logs: >-
+    [{
+      "source": "python.uvicorn",
+      "service": "governance-web",
+      "log_processing_rules": [{
+        "type": "exclude_at_match",
+        "name": "exclude_health_probes",
+        "pattern": "GET /docs HTTP/\\d\\.\\d\"\\s+200\\s+OK"
+      }]
+    }]
 
 image:
   name: acapy-cloud/app

diff --git a/helm/acapy-cloud/conf/dev/mediator.yaml b/helm/acapy-cloud/conf/dev/mediator.yaml
@@ -4,7 +4,16 @@ replicaCount: 1
 
 podAnnotations:
   sidecar.istio.io/proxyCPU: 10m
-  ad.datadoghq.com/mediator.logs: '[{"source": "python", "service": "mediator", "auto_multi_line_detection": true}]'
+  ad.datadoghq.com/mediator.logs: >-
+    [{
+      "source": "python",
+      "service": "mediator",
+      "log_processing_rules": [{
+        "type": "exclude_at_match",
+        "name": "exclude_health_probes",
+        "pattern": "GET /status/(live|ready) HTTP/1\\.1.*\"response_status\": 200\\b"
+      }]
+    }]
 
 image:
   registry: ghcr.io/openwallet-foundation
@@ -165,7 +174,6 @@ secretData:
   WALLET_DB_USER: mediator
 
 env:
-  ACAPY_LOG_LEVEL: info
   ACAPY_LABEL: Aca-Py Mediator
   ACAPY_WALLET_NAME: mediator
   # Mediator does not use a ledger
@@ -192,7 +200,8 @@ env:
   ACAPY_EMIT_NEW_DIDCOMM_PREFIX: true
   ACAPY_EMIT_NEW_DIDCOMM_MIME_TYPE: true
 
-  # ACAPY_LOG_CONFIG: /home/aries/logging_config.yaml
+  ACAPY_LOG_LEVEL: info
+  ACAPY_LOG_CONFIG: /home/aries/logging_config.yaml
 
 podAntiAffinityPreset: soft
 nodeAffinityPreset:

diff --git a/helm/acapy-cloud/conf/dev/multitenant-agent.yaml b/helm/acapy-cloud/conf/dev/multitenant-agent.yaml
@@ -165,7 +165,6 @@ secretData:
   ACAPY_ADMIN_API_KEY: adminApiKey
   ACAPY_MULTITENANT_JWT_SECRET: verySecretMultitenantJwtSecret
   ACAPY_GOVERNANCE_AGENT_API_KEY: adminApiKey
-  ACAPY_LABEL: Multitenant
   ACAPY_WALLET_NAME: multitenant
   ACAPY_MULTITENANCY_CONFIGURATION: '{ "wallet_type":"single-wallet-askar", "wallet_name":"multitenant" }'
 

diff --git a/helm/acapy-cloud/conf/dev/multitenant-web.yaml b/helm/acapy-cloud/conf/dev/multitenant-web.yaml
@@ -4,7 +4,16 @@ replicaCount: 1
 
 podAnnotations:
   sidecar.istio.io/proxyCPU: 10m
-  ad.datadoghq.com/multitenant-web.logs: '[{"source": "python.uvicorn", "service": "multitenant-web"}]'
+  ad.datadoghq.com/multitenant-web.logs: >-
+    [{
+      "source": "python.uvicorn",
+      "service": "multitenant-web",
+      "log_processing_rules": [{
+        "type": "exclude_at_match",
+        "name": "exclude_health_probes",
+        "pattern": "GET /docs HTTP/\\d\\.\\d\"\\s+200\\s+OK"
+      }]
+    }]
 
 image:
   name: acapy-cloud/app

diff --git a/helm/acapy-cloud/conf/dev/public-web.yaml b/helm/acapy-cloud/conf/dev/public-web.yaml
@@ -4,7 +4,16 @@ replicaCount: 1
 
 podAnnotations:
   sidecar.istio.io/proxyCPU: 10m
-  ad.datadoghq.com/public-web.logs: '[{"source": "python.uvicorn", "service": "public-web"}]'
+  ad.datadoghq.com/public-web.logs: >-
+    [{
+      "source": "python.uvicorn",
+      "service": "public-web",
+      "log_processing_rules": [{
+        "type": "exclude_at_match",
+        "name": "exclude_health_probes",
+        "pattern": "GET /docs HTTP/\\d\\.\\d\"\\s+200\\s+OK"
+      }]
+    }]]'
 
 image:
   name: acapy-cloud/app

diff --git a/helm/acapy-cloud/conf/dev/tenant-web.yaml b/helm/acapy-cloud/conf/dev/tenant-web.yaml
@@ -4,7 +4,20 @@ replicaCount: 1
 
 podAnnotations:
   sidecar.istio.io/proxyCPU: 10m
-  ad.datadoghq.com/tenant-web.logs: '[{"source": "python.uvicorn", "service": "tenant-web"}]'
+  ad.datadoghq.com/tenant-web.logs: >-
+    [{
+      "source": "python.uvicorn",
+      "service": "tenant-web",
+      "log_processing_rules": [{
+        "type": "exclude_at_match",
+        "name": "exclude_health_probes",
+        "pattern": "GET /docs HTTP/\\d\\.\\d\"\\s+200\\s+OK"
+      }]
+    }]
+  proxy.istio.io/config: >-
+    {
+      "terminationDrainDuration": "35s"
+    }
 
 image:
   name: acapy-cloud/app

diff --git a/helm/acapy-cloud/conf/dev/trust-registry.yaml b/helm/acapy-cloud/conf/dev/trust-registry.yaml
@@ -4,7 +4,16 @@ replicaCount: 1
 
 podAnnotations:
   sidecar.istio.io/proxyCPU: 10m
-  ad.datadoghq.com/trust-registry.logs: '[{"source": "python.uvicorn", "service": "trust-registry"}]'
+  ad.datadoghq.com/trust-registry.logs: >-
+    [{
+      "source": "python.uvicorn",
+      "service": "trust-registry",
+      "log_processing_rules": [{
+        "type": "exclude_at_match",
+        "name": "exclude_health_probes",
+        "pattern": "GET /docs HTTP/\\d\\.\\d\"\\s+200\\s+OK"
+      }]
+    }]
 podLabels:
   admission.datadoghq.com/enabled: "true"
 

diff --git a/helm/acapy-cloud/conf/dev/waypoint.yaml b/helm/acapy-cloud/conf/dev/waypoint.yaml
@@ -4,10 +4,20 @@ replicaCount: 1
 
 podAnnotations:
   sidecar.istio.io/proxyCPU: 10m
-  ad.datadoghq.com/waypoint.logs: '[{"source": "python.uvicorn", "service": "waypoint"}]'
-  proxy.istio.io/config: |-
+  ad.datadoghq.com/waypoint.logs: >-
+    [{
+      "source": "python.uvicorn",
+      "service": "waypoint",
+      "log_processing_rules": [{
+        "type": "exclude_at_match",
+        "name": "exclude_health_probes",
+        "pattern": "GET /health/(ready|live) HTTP/\\d\\.\\d\"\\s+200\\s+OK"
+      }]
+    }]
+  proxy.istio.io/config: >-
     proxyMetadata:
       ISTIO_META_IDLE_TIMEOUT: 0s
+    terminationDrainDuration: 35s
 podLabels:
   admission.datadoghq.com/enabled: "true"