Skip to content

NETOBSERV-1890: expand TCP flags as string in FLP #833

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
merged 1 commit into from
Nov 26, 2024
Merged

NETOBSERV-1890: expand TCP flags as string in FLP #833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 3 additions & 15 deletions controllers/consoleplugin/config/static-frontend-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,21 +814,9 @@ filters:
- id: tcp_flags
name: TCP flags
component: autocomplete
hint: Specify a TCP flags value as integer number.
hint: Specify a TCP flags value.
examples: |-
Logical OR combination of unique TCP flags comprised in the flow, as per RFC-9293, with additional custom flags
users can specify either numeric value or string representation of the flags as follows :
- FIN or 1,
- SYN or 2,
- RST or 4,
- PSH or 8,
- ACK or 16,
- URG or 32,
- ECE or 64,
- CWR or 128,
- SYN_ACK or 256,
- FIN_ACK or 512,
- RST_ACK or 1024,
Logical OR combination of unique TCP flags comprised in the flow, as per RFC-9293, with additional custom flags (SYN_ACK, FIN_ACK and RST_ACK).
- id: node_direction
name: Node Direction
component: autocomplete
Expand Down Expand Up @@ -1142,7 +1130,7 @@ fields:
type: string
description: Network interfaces
- name: Flags
type: number
type: string
description: |
Logical OR combination of unique TCP flags comprised in the flow, as per RFC-9293, with additional custom flags to represent the following per-packet combinations: +
- SYN+ACK (0x100) +
Expand Down
7 changes: 7 additions & 0 deletions controllers/flp/flp_pipeline_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,13 @@ func (b *PipelineBuilder) AddProcessorStages() error {
{
Type: api.NetworkReinterpretDirection,
},
{
Type: api.NetworkDecodeTCPFlags,
DecodeTCPFlags: &api.NetworkGenericRule{
Input: "Flags",
Output: "Flags",
},
},
{
Type: api.NetworkAddKubernetesInfra,
KubernetesInfra: &api.K8sInfraRule{
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/coreos/go-semver v0.3.1
github.com/go-logr/logr v1.4.2
github.com/google/go-cmp v0.6.0
github.com/netobserv/flowlogs-pipeline v1.7.0-community.0.20241126083919-0fa789ce0e58
github.com/netobserv/flowlogs-pipeline v1.7.0-community.0.20241126155124-18e017f67001
github.com/onsi/ginkgo/v2 v2.20.2
github.com/onsi/gomega v1.35.1
github.com/openshift/api v0.0.0-20240722135205-ae4f370f361f
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/netobserv/flowlogs-pipeline v1.7.0-community.0.20241126083919-0fa789ce0e58 h1:wfk7Sl0rMoDqfUgvfwlStCGXtIgrtwo4h2LDEGGjgrs=
github.com/netobserv/flowlogs-pipeline v1.7.0-community.0.20241126083919-0fa789ce0e58/go.mod h1:wnCpWttAFkLSSxOcfCkd9zA5pwV/1OcxS5tAfAxNWEc=
github.com/netobserv/flowlogs-pipeline v1.7.0-community.0.20241126155124-18e017f67001 h1:Hb5RxMfFafng2+QbnkiEWTS4TUUz7zcpUS8RiauzWXw=
github.com/netobserv/flowlogs-pipeline v1.7.0-community.0.20241126155124-18e017f67001/go.mod h1:wnCpWttAFkLSSxOcfCkd9zA5pwV/1OcxS5tAfAxNWEc=
github.com/netobserv/prometheus-common v0.55.0-netobserv h1:Fapr74g0S3gRh/kTTyv9Ytm4DJJfFuUTEToiU/np9eg=
github.com/netobserv/prometheus-common v0.55.0-netobserv/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
Expand Down
2 changes: 1 addition & 1 deletion pkg/helper/cardinality/cardinality.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"FlowDirection": "fine",
"IfDirections": "fine",
"Interfaces": "careful",
"Flags": "fine",
"Flags": "careful",
"Bytes": "avoid",
"Packets": "avoid",
"PktDropBytes": "avoid",
Expand Down
2 changes: 2 additions & 0 deletions vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/transform_network.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions vendor/github.com/netobserv/flowlogs-pipeline/pkg/utils/tcp_flags.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ github.com/munnerz/goautoneg
# github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
## explicit
github.com/mwitkow/go-conntrack
# github.com/netobserv/flowlogs-pipeline v1.7.0-community.0.20241126083919-0fa789ce0e58
# github.com/netobserv/flowlogs-pipeline v1.7.0-community.0.20241126155124-18e017f67001
## explicit; go 1.22.3
github.com/netobserv/flowlogs-pipeline/pkg/api
github.com/netobserv/flowlogs-pipeline/pkg/config
Expand Down