From 3f561d2b613ba763a410332ed4d5b43a88356531 Mon Sep 17 00:00:00 2001
From: Jeet Desai <jeet.desai@ibm.com>
Date: Sat, 13 Dec 2025 15:09:39 +0530
Subject: [PATCH] SUSTSRE-693-Adding filters to drop warn|warning message, drop
 logs from instana-agent, openshift-console namespaces

---
 .../templates/05-ClusterLogForwarder.yaml     | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/cluster-applications/054-cluster-logging-operator/templates/05-ClusterLogForwarder.yaml b/cluster-applications/054-cluster-logging-operator/templates/05-ClusterLogForwarder.yaml
index 995b8b472..9a8eddb83 100644
--- a/cluster-applications/054-cluster-logging-operator/templates/05-ClusterLogForwarder.yaml
+++ b/cluster-applications/054-cluster-logging-operator/templates/05-ClusterLogForwarder.yaml
@@ -18,9 +18,24 @@ spec:
     - drop:
         - test:
             - field: .level
-              matches: info|Info|INFO|DEBUG|Debug|debug
+              matches: info|Info|INFO|DEBUG|Debug|debug|warn|warning
+        - test:
+            - field: .message
+              matches: 'BMX[A-Z0-9]+I'
       name: noise
       type: drop
+    - name: msg-noise
+      type: drop
+      drop:
+        - test:
+            - field: .message
+              matches: info|Info|INFO|DEBUG|Debug|debug|warn|warning
+    - name: drop-ns
+      type: drop
+      drop:
+        - test:
+            - field: .kubernetes.namespace_name
+              matches: "^(instana-agent|openshift-console.*)$"
     - kubeAPIAudit:
         omitStages: []
         rules:
@@ -55,12 +70,18 @@ spec:
       detectMultilineErrors: true
       filterRefs:
         - noise
+        - msg-noise
+        - drop-ns
       inputRefs:
         - application
       outputRefs:
         - cloudwatch-1
     - name: infra-logs
       detectMultilineErrors: true
+      filterRefs:
+        - noise
+        - msg-noise
+        - drop-ns
       inputRefs:
         - infrastructure
       outputRefs:
@@ -100,9 +121,24 @@ spec:
     - drop:
         - test:
             - field: .level
-              matches: info|Info|INFO|DEBUG|Debug|debug
+              matches: info|Info|INFO|DEBUG|Debug|debug|warn|warning
+        - test:
+            - field: .message
+              matches: 'BMX[A-Z0-9]+I'
       name: noise
       type: drop
+    - name: msg-noise
+      type: drop
+      drop:
+        - test:
+            - field: .message
+              matches: info|Info|INFO|DEBUG|Debug|debug|warn|warning
+    - name: drop-ns
+      type: drop
+      drop:
+        - test:
+            - field: .kubernetes.namespace_name
+              matches: "^(instana-agent|openshift-console.*)$"
     - kubeAPIAudit:
         omitStages: []
         rules:
@@ -142,11 +178,17 @@ spec:
     - name: app-logs
       filterRefs:
         - noise
+        - msg-noise
+        - drop-ns
       inputRefs:
         - application
       outputRefs:
         - cloudwatch-1
     - name: infra-logs
+      filterRefs:
+        - noise
+        - msg-noise
+        - drop-ns
       inputRefs:
         - infrastructure
       outputRefs: