NETOBSERV-2131 allow multiple regexes (#207)

* allow multiple regexes

* add example

Author: jpinsonneau

scripts/functions.sh

@@ -439,7 +439,7 @@ function edit_manifest() {
     echo "opt: $1, value: $2"
   fi
 
-  if [[ $1 == "filter_"* ]]; then
+  if [[ $1 == "filter_"* && $1 != "filter_regexes" ]]; then
     "$YQ_BIN" e --inplace ".spec.template.spec.containers[0].env[] |= select(.name==\"ENABLE_FLOW_FILTER\").value|=\"true\"" "$3"
     # add first filter in the array
     currentFilters=$("$YQ_BIN" -r ".spec.template.spec.containers[0].env[] | select(.name == \"FLOW_FILTER_RULES\").value" "$3")
@@ -572,9 +572,6 @@ function edit_manifest() {
   "filter_regexes")
     copyFLPConfig "$3"
 
-    # remove send step
-    "$YQ_BIN" e -oj --inplace "del(.pipeline[] | select(.name==\"send\"))" "$json"
-
     # define rules from arg
     IFS=',' read -ra regexes <<<"$2"
     rules=()
@@ -589,13 +586,23 @@ function edit_manifest() {
       IFS=,
       echo "${rules[*]}"
     )
-
-    # add filter param & pipeline
-    "$YQ_BIN" e -oj --inplace ".parameters += {\"name\":\"filter\",\"transform\":{\"type\":\"filter\",\"filter\":{\"rules\":[{\"type\":\"keep_entry_all_satisfied\",\"keepEntryAllSatisfied\":[$rulesStr]}]}}}" "$json"
-    "$YQ_BIN" e -oj --inplace ".pipeline += {\"name\":\"filter\",\"follows\":\"enrich\"}" "$json"
-
-    # add send step back
-    "$YQ_BIN" e -oj --inplace ".pipeline += {\"name\":\"send\",\"follows\":\"filter\"}" "$json"
+    rule="{\"type\":\"keep_entry_all_satisfied\",\"keepEntryAllSatisfied\":[$rulesStr]}"
+
+    existingFilterStage=$("$YQ_BIN" -r ".pipeline[] | select(.name == \"filter\")" "$json")
+    if [[ "$existingFilterStage" == "" ]]; then
+      # remove send step
+      "$YQ_BIN" e -oj --inplace "del(.pipeline[] | select(.name==\"send\"))" "$json"
+
+      # add filter param & pipeline
+      "$YQ_BIN" e -oj --inplace ".parameters += {\"name\":\"filter\",\"transform\":{\"type\":\"filter\",\"filter\":{\"rules\":[$rule]}}}" "$json"
+      "$YQ_BIN" e -oj --inplace ".pipeline += {\"name\":\"filter\",\"follows\":\"enrich\"}" "$json"
+
+      # add send step back
+      "$YQ_BIN" e -oj --inplace ".pipeline += {\"name\":\"send\",\"follows\":\"filter\"}" "$json"
+    else 
+      # add rules to existing filter param
+      "$YQ_BIN" e --inplace " .parameters[] |= select(.name == \"filter\").transform.filter.rules += $rule" "$json"
+    fi
 
     updateFLPConfig "$json" "$3"
     ;;
@@ -613,6 +620,7 @@ function edit_manifest() {
 
 # define key and value at script level to make them available all the time
 # these will be updated by check_args_and_apply first and overriden by defaultValue when needed
+prevKey=""
 key=""
 value=""
 
@@ -629,11 +637,14 @@ function defaultValue() {
 function check_args_and_apply() {
   # Iterate through the command-line arguments
   for option in $1; do
+    prevKey="$key"
     key="${option%%=*}"
     value="${option#*=}"
     case "$key" in
     or) # Increment flow filter array
-      edit_manifest "add_filter" "" "$2"
+      if [[ "$prevKey" != *regexes ]]; then
+        edit_manifest "add_filter" "" "$2"
+      fi
       ;;
     *background) # Run command in background
       defaultValue "true"

scripts/help.sh

@@ -40,7 +40,8 @@ function help {
   echo "  Capture flows from a specific pod"
   echo "    netobserv flows                                           # Capture flows"
   echo "    --node-selector=kubernetes.io/hostname:my-node            # on node matching label 'kubernetes.io/hostname=my-node'"
-  echo "    --regexes=SrcK8S_Name~.*my-pod.*,DstK8S_Name~.*my-pod.*   # from or to any pod name containing 'my-pod'"
+  echo "    --regexes=SrcK8S_Name~.*my-pod.*                          # from any pod name containing 'my-pod'"
+  echo "    or --regexes=DstK8S_Name~.*my-pod.*                       # or to any pod name containing 'my-pod'"
   echo
   echo "  Capture packets on specific nodes and port"
   echo "    netobserv packets                                         # Capture packets"