diff --git a/apis/flowcollector/v1beta2/flowcollector_types.go b/apis/flowcollector/v1beta2/flowcollector_types.go index 8dfea7ac3..22d6823b4 100644 --- a/apis/flowcollector/v1beta2/flowcollector_types.go +++ b/apis/flowcollector/v1beta2/flowcollector_types.go @@ -167,7 +167,7 @@ type FlowCollectorIPFIX struct { // `clusterNetworkOperator` defines the settings related to the OpenShift Cluster Network Operator, when available. ClusterNetworkOperator ClusterNetworkOperatorConfig `json:"clusterNetworkOperator,omitempty" mapstructure:"-"` - // `ovnKubernetes` defines the settings of the OVN-Kubernetes CNI, when available. This configuration is used when using OVN's IPFIX exports, without OpenShift. When using OpenShift, refer to the `clusterNetworkOperator` property instead. + // `ovnKubernetes` defines the settings of the OVN-Kubernetes network plugin, when available. This configuration is used when using OVN's IPFIX exports, without OpenShift. When using OpenShift, refer to the `clusterNetworkOperator` property instead. OVNKubernetes OVNKubernetesConfig `json:"ovnKubernetes,omitempty" mapstructure:"-"` } @@ -175,7 +175,7 @@ type FlowCollectorIPFIX struct { // - `PacketDrop`, to track packet drops.
// - `DNSTracking`, to track specific information on DNS traffic.
// - `FlowRTT`, to track TCP latency.
-// - `NetworkEvents`, to track Network events.
+// - `NetworkEvents`, to track Network events [Developer Preview].
// +kubebuilder:validation:Enum:="PacketDrop";"DNSTracking";"FlowRTT";"NetworkEvents" type AgentFeature string @@ -358,8 +358,10 @@ type FlowCollectorEBPF struct { // If the `spec.agent.ebpf.privileged` parameter is not set, an error is reported.
// - `DNSTracking`: enable the DNS tracking feature.
// - `FlowRTT`: enable flow latency (sRTT) extraction in the eBPF agent from TCP traffic.
- // - `NetworkEvents`: enable the Network events monitoring feature. This feature requires mounting + // - `NetworkEvents`: enable the Network events monitoring feature. This feature requires mounting // the kernel debug filesystem, so the eBPF pod has to run as privileged. + // It requires using the OVN-Kubernetes network plugin with the Observability feature. + // IMPORTANT: this feature is available as a Developer Preview.
// +optional Features []AgentFeature `json:"features,omitempty"` @@ -1017,7 +1019,7 @@ type ClusterNetworkOperatorConfig struct { Namespace string `json:"namespace,omitempty"` } -// `OVNKubernetesConfig` defines the desired configuration related to the OVN-Kubernetes network provider, when Cluster Network Operator isn't installed. +// `OVNKubernetesConfig` defines the desired configuration related to the OVN-Kubernetes network plugin, when Cluster Network Operator isn't installed. type OVNKubernetesConfig struct { // Important: Run "make generate" to regenerate code after modifying this file diff --git a/bundle/manifests/flows.netobserv.io_flowcollectors.yaml b/bundle/manifests/flows.netobserv.io_flowcollectors.yaml index dac8798d1..62a6978e4 100644 --- a/bundle/manifests/flows.netobserv.io_flowcollectors.yaml +++ b/bundle/manifests/flows.netobserv.io_flowcollectors.yaml @@ -3729,15 +3729,17 @@ spec: If the `spec.agent.ebpf.privileged` parameter is not set, an error is reported.
- `DNSTracking`: enable the DNS tracking feature.
- `FlowRTT`: enable flow latency (sRTT) extraction in the eBPF agent from TCP traffic.
- - `NetworkEvents`: enable the Network events monitoring feature. This feature requires mounting + - `NetworkEvents`: enable the Network events monitoring feature. This feature requires mounting the kernel debug filesystem, so the eBPF pod has to run as privileged. + It requires using the OVN-Kubernetes network plugin with the Observability feature. + IMPORTANT: this feature is available as a Developer Preview.
items: description: |- Agent feature, can be one of:
- `PacketDrop`, to track packet drops.
- `DNSTracking`, to track specific information on DNS traffic.
- `FlowRTT`, to track TCP latency.
- - `NetworkEvents`, to track Network events.
+ - `NetworkEvents`, to track Network events [Developer Preview].
enum: - PacketDrop - DNSTracking @@ -4122,8 +4124,8 @@ spec: type: boolean ovnKubernetes: description: '`ovnKubernetes` defines the settings of the - OVN-Kubernetes CNI, when available. This configuration is - used when using OVN''s IPFIX exports, without OpenShift. + OVN-Kubernetes network plugin, when available. This configuration + is used when using OVN''s IPFIX exports, without OpenShift. When using OpenShift, refer to the `clusterNetworkOperator` property instead.' properties: diff --git a/config/crd/bases/flows.netobserv.io_flowcollectors.yaml b/config/crd/bases/flows.netobserv.io_flowcollectors.yaml index ce5d63409..abf628f4f 100644 --- a/config/crd/bases/flows.netobserv.io_flowcollectors.yaml +++ b/config/crd/bases/flows.netobserv.io_flowcollectors.yaml @@ -3442,15 +3442,17 @@ spec: If the `spec.agent.ebpf.privileged` parameter is not set, an error is reported.
- `DNSTracking`: enable the DNS tracking feature.
- `FlowRTT`: enable flow latency (sRTT) extraction in the eBPF agent from TCP traffic.
- - `NetworkEvents`: enable the Network events monitoring feature. This feature requires mounting + - `NetworkEvents`: enable the Network events monitoring feature. This feature requires mounting the kernel debug filesystem, so the eBPF pod has to run as privileged. + It requires using the OVN-Kubernetes network plugin with the Observability feature. + IMPORTANT: this feature is available as a Developer Preview.
items: description: |- Agent feature, can be one of:
- `PacketDrop`, to track packet drops.
- `DNSTracking`, to track specific information on DNS traffic.
- `FlowRTT`, to track TCP latency.
- - `NetworkEvents`, to track Network events.
+ - `NetworkEvents`, to track Network events [Developer Preview].
enum: - PacketDrop - DNSTracking @@ -3799,7 +3801,7 @@ spec: When it is set to `true`, the value of `sampling` is ignored. type: boolean ovnKubernetes: - description: '`ovnKubernetes` defines the settings of the OVN-Kubernetes CNI, when available. This configuration is used when using OVN''s IPFIX exports, without OpenShift. When using OpenShift, refer to the `clusterNetworkOperator` property instead.' + description: '`ovnKubernetes` defines the settings of the OVN-Kubernetes network plugin, when available. This configuration is used when using OVN''s IPFIX exports, without OpenShift. When using OpenShift, refer to the `clusterNetworkOperator` property instead.' properties: containerName: default: ovnkube-node diff --git a/docs/FlowCollector.md b/docs/FlowCollector.md index f87848390..1c1d0e7a8 100644 --- a/docs/FlowCollector.md +++ b/docs/FlowCollector.md @@ -5958,8 +5958,10 @@ the kernel debug filesystem, so the eBPF pod has to run as privileged. If the `spec.agent.ebpf.privileged` parameter is not set, an error is reported.
- `DNSTracking`: enable the DNS tracking feature.
- `FlowRTT`: enable flow latency (sRTT) extraction in the eBPF agent from TCP traffic.
-- `NetworkEvents`: enable the Network events monitoring feature. This feature requires mounting -the kernel debug filesystem, so the eBPF pod has to run as privileged.
+- `NetworkEvents`: enable the Network events monitoring feature. This feature requires mounting +the kernel debug filesystem, so the eBPF pod has to run as privileged. +It requires using the OVN-Kubernetes network plugin with the Observability feature. +IMPORTANT: this feature is available as a Developer Preview.

false @@ -8368,7 +8370,7 @@ When it is set to `true`, the value of `sampling` is ignored.
ovnKubernetes object - `ovnKubernetes` defines the settings of the OVN-Kubernetes CNI, when available. This configuration is used when using OVN's IPFIX exports, without OpenShift. When using OpenShift, refer to the `clusterNetworkOperator` property instead.
+ `ovnKubernetes` defines the settings of the OVN-Kubernetes network plugin, when available. This configuration is used when using OVN's IPFIX exports, without OpenShift. When using OpenShift, refer to the `clusterNetworkOperator` property instead.
false @@ -8423,7 +8425,7 @@ refer to `forceSampleAll`. Alternatively, you can use the eBPF Agent instead of -`ovnKubernetes` defines the settings of the OVN-Kubernetes CNI, when available. This configuration is used when using OVN's IPFIX exports, without OpenShift. When using OpenShift, refer to the `clusterNetworkOperator` property instead. +`ovnKubernetes` defines the settings of the OVN-Kubernetes network plugin, when available. This configuration is used when using OVN's IPFIX exports, without OpenShift. When using OpenShift, refer to the `clusterNetworkOperator` property instead.