Skip to content

Commit

Permalink
bump flp, mention dev preview
Browse files Browse the repository at this point in the history
  • Loading branch information
jotak committed Nov 26, 2024
1 parent ee782e4 commit cf1e3b5
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 77 deletions.
8 changes: 5 additions & 3 deletions apis/flowcollector/v1beta2/flowcollector_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -644,10 +644,12 @@ type FlowCollectorFLP struct {

//+optional
// `deduper` allows to sample or drop flows identified as duplicates, in order to save on resource usage.
// IMPORTANT: This feature is available as a Developer Preview.
Deduper *FLPDeduper `json:"deduper,omitempty"`

// `filters` let you define custom filters to limit the amount of generated flows.
// +optional
// `filters` let you define custom filters to limit the amount of generated flows.
// IMPORTANT: This feature is available as a Developer Preview.
Filters []FLPFilterSet `json:"filters"`

// `advanced` allows setting some aspects of the internal configuration of the flow processor.
Expand All @@ -667,8 +669,8 @@ const (

// `FLPDeduper` defines the desired configuration for FLP-based deduper
type FLPDeduper struct {
// Set the Processor deduper mode (de-duplication). It comes in addition to the Agent deduper because the Agent cannot de-duplicate same flows reported from different nodes.<br>
// - Use `Drop` to drop every flow considered as duplicates, allowing saving more on resource usage but potentially loosing some information such as the network interfaces used from peer.<br>
// Set the Processor de-duplication mode. It comes in addition to the Agent-based deduplication because the Agent cannot de-duplicate same flows reported from different nodes.<br>
// - Use `Drop` to drop every flow considered as duplicates, allowing saving more on resource usage but potentially loosing some information such as the network interfaces used from peer, or network events.<br>
// - Use `Sample` to randomly keep only 1 flow on 50 (by default) among the ones considered as duplicates. This is a compromise between dropping every duplicates or keeping every duplicates. This sampling action comes in addition to the Agent-based sampling. If both Agent and Processor sampling are 50, the combined sampling is 1:2500.<br>
// - Use `Disabled` to turn off Processor-based de-duplication.<br>
// +kubebuilder:validation:Enum:="Disabled";"Drop";"Sample"
Expand Down
14 changes: 8 additions & 6 deletions bundle/manifests/flows.netobserv.io_flowcollectors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7907,14 +7907,15 @@ spec:
When using OpenShift, leave empty to make it automatically determined.'
type: string
deduper:
description: '`deduper` allows to sample or drop flows identified
as duplicates, in order to save on resource usage.'
description: |-
`deduper` allows to sample or drop flows identified as duplicates, in order to save on resource usage.
IMPORTANT: This feature is available as a Developer Preview.
properties:
mode:
default: Disabled
description: |-
Set the Processor deduper mode (de-duplication). It comes in addition to the Agent deduper because the Agent cannot de-duplicate same flows reported from different nodes.<br>
- Use `Drop` to drop every flow considered as duplicates, allowing saving more on resource usage but potentially loosing some information such as the network interfaces used from peer.<br>
Set the Processor de-duplication mode. It comes in addition to the Agent-based deduplication because the Agent cannot de-duplicate same flows reported from different nodes.<br>
- Use `Drop` to drop every flow considered as duplicates, allowing saving more on resource usage but potentially loosing some information such as the network interfaces used from peer, or network events.<br>
- Use `Sample` to randomly keep only 1 flow on 50 (by default) among the ones considered as duplicates. This is a compromise between dropping every duplicates or keeping every duplicates. This sampling action comes in addition to the Agent-based sampling. If both Agent and Processor sampling are 50, the combined sampling is 1:2500.<br>
- Use `Disabled` to turn off Processor-based de-duplication.<br>
enum:
Expand All @@ -7931,8 +7932,9 @@ spec:
type: integer
type: object
filters:
description: '`filters` let you define custom filters to limit
the amount of generated flows.'
description: |-
`filters` let you define custom filters to limit the amount of generated flows.
IMPORTANT: This feature is available as a Developer Preview.
items:
description: '`FLPFilterSet` defines the desired configuration
for FLP-based filtering satisfying all conditions'
Expand Down
12 changes: 8 additions & 4 deletions config/crd/bases/flows.netobserv.io_flowcollectors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7281,13 +7281,15 @@ spec:
description: '`clusterName` is the name of the cluster to appear in the flows data. This is useful in a multi-cluster context. When using OpenShift, leave empty to make it automatically determined.'
type: string
deduper:
description: '`deduper` allows to sample or drop flows identified as duplicates, in order to save on resource usage.'
description: |-
`deduper` allows to sample or drop flows identified as duplicates, in order to save on resource usage.
IMPORTANT: This feature is available as a Developer Preview.
properties:
mode:
default: Disabled
description: |-
Set the Processor deduper mode (de-duplication). It comes in addition to the Agent deduper because the Agent cannot de-duplicate same flows reported from different nodes.<br>
- Use `Drop` to drop every flow considered as duplicates, allowing saving more on resource usage but potentially loosing some information such as the network interfaces used from peer.<br>
Set the Processor de-duplication mode. It comes in addition to the Agent-based deduplication because the Agent cannot de-duplicate same flows reported from different nodes.<br>
- Use `Drop` to drop every flow considered as duplicates, allowing saving more on resource usage but potentially loosing some information such as the network interfaces used from peer, or network events.<br>
- Use `Sample` to randomly keep only 1 flow on 50 (by default) among the ones considered as duplicates. This is a compromise between dropping every duplicates or keeping every duplicates. This sampling action comes in addition to the Agent-based sampling. If both Agent and Processor sampling are 50, the combined sampling is 1:2500.<br>
- Use `Disabled` to turn off Processor-based de-duplication.<br>
enum:
Expand All @@ -7303,7 +7305,9 @@ spec:
type: integer
type: object
filters:
description: '`filters` let you define custom filters to limit the amount of generated flows.'
description: |-
`filters` let you define custom filters to limit the amount of generated flows.
IMPORTANT: This feature is available as a Developer Preview.
items:
description: '`FLPFilterSet` defines the desired configuration for FLP-based filtering satisfying all conditions'
properties:
Expand Down
11 changes: 7 additions & 4 deletions docs/FlowCollector.md
Original file line number Diff line number Diff line change
Expand Up @@ -14042,14 +14042,16 @@ such as `GOGC` and `GOMAXPROCS` env vars. Set these values at your own risk.<br/
<td><b><a href="#flowcollectorspecprocessordeduper-1">deduper</a></b></td>
<td>object</td>
<td>
`deduper` allows to sample or drop flows identified as duplicates, in order to save on resource usage.<br/>
`deduper` allows to sample or drop flows identified as duplicates, in order to save on resource usage.
IMPORTANT: This feature is available as a Developer Preview.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#flowcollectorspecprocessorfiltersindex-1">filters</a></b></td>
<td>[]object</td>
<td>
`filters` let you define custom filters to limit the amount of generated flows.<br/>
`filters` let you define custom filters to limit the amount of generated flows.
IMPORTANT: This feature is available as a Developer Preview.<br/>
</td>
<td>false</td>
</tr><tr>
Expand Down Expand Up @@ -16083,6 +16085,7 @@ Fields absent from the 'k8s.v1.cni.cncf.io/network-status' annotation must not b


`deduper` allows to sample or drop flows identified as duplicates, in order to save on resource usage.
IMPORTANT: This feature is available as a Developer Preview.

<table>
<thead>
Expand All @@ -16097,8 +16100,8 @@ Fields absent from the 'k8s.v1.cni.cncf.io/network-status' annotation must not b
<td><b>mode</b></td>
<td>enum</td>
<td>
Set the Processor deduper mode (de-duplication). It comes in addition to the Agent deduper because the Agent cannot de-duplicate same flows reported from different nodes.<br>
- Use `Drop` to drop every flow considered as duplicates, allowing saving more on resource usage but potentially loosing some information such as the network interfaces used from peer.<br>
Set the Processor de-duplication mode. It comes in addition to the Agent-based deduplication because the Agent cannot de-duplicate same flows reported from different nodes.<br>
- Use `Drop` to drop every flow considered as duplicates, allowing saving more on resource usage but potentially loosing some information such as the network interfaces used from peer, or network events.<br>
- Use `Sample` to randomly keep only 1 flow on 50 (by default) among the ones considered as duplicates. This is a compromise between dropping every duplicates or keeping every duplicates. This sampling action comes in addition to the Agent-based sampling. If both Agent and Processor sampling are 50, the combined sampling is 1:2500.<br>
- Use `Disabled` to turn off Processor-based de-duplication.<br><br/>
<br/>
Expand Down
4 changes: 1 addition & 3 deletions go.mod
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.6.1-crc0.0.20240920063618-2ea1a7ce77b8
github.com/netobserv/flowlogs-pipeline v1.7.0-community.0.20241126083919-0fa789ce0e58
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 Expand Up @@ -88,5 +88,3 @@ require (
)

replace github.com/prometheus/common v0.55.0 => github.com/netobserv/prometheus-common v0.55.0-netobserv

replace github.com/netobserv/flowlogs-pipeline => ../flowlogs-pipeline
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +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/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

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

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

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

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

3 changes: 1 addition & 2 deletions vendor/modules.txt
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.6.1-crc0.0.20240920063618-2ea1a7ce77b8 => ../flowlogs-pipeline
# github.com/netobserv/flowlogs-pipeline v1.7.0-community.0.20241126083919-0fa789ce0e58
## explicit; go 1.22.3
github.com/netobserv/flowlogs-pipeline/pkg/api
github.com/netobserv/flowlogs-pipeline/pkg/config
Expand Down Expand Up @@ -905,4 +905,3 @@ sigs.k8s.io/structured-merge-diff/v4/value
## explicit; go 1.12
sigs.k8s.io/yaml
sigs.k8s.io/yaml/goyaml.v2
# github.com/netobserv/flowlogs-pipeline => ../flowlogs-pipeline

0 comments on commit cf1e3b5

Please sign in to comment.