enable multiple filters

netobserv · Jan 10, 2025 · 63a698a · 63a698a
1 parent 17e4f2e
commit 63a698a
Show file tree

Hide file tree

Showing 8 changed files with 599 additions and 626 deletions.
diff --git a/res/collector-pipeline-config.json b/res/collector-pipeline-config.json
@@ -0,0 +1,63 @@
+{
+  "log-level": "trace",
+  "metricsSettings": {
+    "disableGlobalServer": true
+  },
+  "parameters": [
+    {
+      "name": "enrich",
+      "transform": {
+        "type": "network",
+        "network": {
+          "rules": [
+            {
+              "type": "add_kubernetes",
+              "kubernetes": {
+                "add_zone": true,
+                "ipField": "SrcAddr",
+                "output": "SrcK8S"
+              }
+            },
+            {
+              "type": "add_kubernetes",
+              "kubernetes": {
+                "add_zone": true,
+                "ipField": "DstAddr",
+                "output": "DstK8S"
+              }
+            },
+            {
+              "type": "reinterpret_direction"
+            }
+          ],
+          "directionInfo": {
+            "reporterIPField": "AgentIP",
+            "srcHostField": "SrcK8S_HostIP",
+            "dstHostField": "DstK8S_HostIP",
+            "flowDirectionField": "FlowDirection"
+          }
+        }
+      }
+    },
+    {
+      "name": "send",
+      "write": {
+        "type": "grpc",
+        "grpc": {
+          "targetHost": "{{TARGET_HOST}}",
+          "targetPort": 9999
+        }
+      }
+    }
+  ],
+  "pipeline": [
+    {
+      "name": "enrich",
+      "follows": "preset-ingester"
+    },
+    {
+      "name": "send",
+      "follows": "enrich"
+    }
+  ]
+}
diff --git a/res/flow-capture.yml b/res/flow-capture.yml
@@ -46,81 +46,13 @@ spec:
           - name: ENABLE_FLOW_FILTER
             value: "false"
           - name: FLOW_FILTER_RULES
-            value: >
-              [ { "direction": "", "ip_cidr": "0.0.0.0/0", "protocol": "", "source_port": 0,
-                "destination_port": 0, "port": 0, "source_port_range": "",
-                "source_ports": "", "destination_port_range": "",
-                "destination_ports": "", "port_range": "", "ports": "",
-                "icmp_type": 0, "icmp_code": 0, "peer_ip": "", "action": "Accept",
-                "tcp_flags": "", "drops": false } 
-              ]
+            value: >-
+              []
           - name: EXPORT
             value: "direct-flp"
           - name: FLP_CONFIG
-            value: >
-              {
-                "log-level": "trace",
-                "metricsSettings":{
-                    "disableGlobalServer": true
-                },
-                "parameters":[
-                    {
-                      "name":"enrich",
-                      "transform":{
-                          "type":"network",
-                          "network":{
-                            "rules":[
-                                {
-                                  "type":"add_kubernetes",
-                                  "kubernetes":{
-                                      "add_zone": true,
-                                      "ipField":"SrcAddr",
-                                      "output":"SrcK8S"
-                                  }
-                                },
-                                {
-                                  "type":"add_kubernetes",
-                                  "kubernetes":{
-                                      "add_zone": true,
-                                      "ipField":"DstAddr",
-                                      "output":"DstK8S"
-                                  }
-                                },
-                                {
-                                  "type":"reinterpret_direction"
-                                }
-                            ],
-                            "directionInfo":{
-                                "reporterIPField":"AgentIP",
-                                "srcHostField":"SrcK8S_HostIP",
-                                "dstHostField":"DstK8S_HostIP",
-                                "flowDirectionField":"FlowDirection"
-                            }
-                          }
-                      }
-                    },
-                    {
-                      "name":"send",
-                      "write":{
-                          "type":"grpc",
-                          "grpc":{
-                            "targetHost":"{{TARGET_HOST}}",
-                            "targetPort":9999
-                          }
-                      }
-                    }
-                ],
-                "pipeline":[
-                    {
-                      "name":"enrich",
-                      "follows":"preset-ingester"
-                    },
-                    {
-                      "name":"send",
-                      "follows":"enrich"
-                    }
-                ]
-              }
+            value: |
+              {}
         volumeMounts:
             - name: bpf-kernel-debug
               mountPath: /sys/kernel/debug

diff --git a/res/flow-filter.json b/res/flow-filter.json
@@ -0,0 +1,20 @@
+{
+  "direction": "",
+  "ip_cidr": "0.0.0.0/0",
+  "protocol": "",
+  "source_port": 0,
+  "destination_port": 0,
+  "port": 0,
+  "source_port_range": "",
+  "source_ports": "",
+  "destination_port_range": "",
+  "destination_ports": "",
+  "port_range": "",
+  "ports": "",
+  "icmp_type": 0,
+  "icmp_code": 0,
+  "peer_ip": "",
+  "action": "Accept",
+  "tcp_flags": "",
+  "drops": false
+}