Skip to content

NETOBSERV-2131 allow multiple regexes #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpinsonneau merged 2 commits into from
Apr 1, 2025
Merged

NETOBSERV-2131 allow multiple regexes #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
434cd5e
allow multiple regexes
jpinsonneau Mar 3, 2025
3c52909
add example
jpinsonneau Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions scripts/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,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")
Expand Down Expand Up @@ -553,9 +553,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=()
Expand All @@ -570,13 +567,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"
;;
Expand All @@ -594,6 +601,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=""

Expand All @@ -610,11 +618,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"
Expand Down
3 changes: 2 additions & 1 deletion scripts/help.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down