diff --git a/apis/flowcollector/v1beta2/flowcollector_types.go b/apis/flowcollector/v1beta2/flowcollector_types.go index 96a46c8cdc..f54b033745 100644 --- a/apis/flowcollector/v1beta2/flowcollector_types.go +++ b/apis/flowcollector/v1beta2/flowcollector_types.go @@ -378,11 +378,11 @@ type FlowCollectorEBPF struct { type FlowCollectorKafka struct { // Important: Run "make generate" to regenerate code after modifying this file - //+kubebuilder:default:="" + // +kubebuilder:default:="" // Address of the Kafka server Address string `json:"address"` - //+kubebuilder:default:="" + // +kubebuilder:default:="" // Kafka topic to use. It must exist. NetObserv does not create it. Topic string `json:"topic"` @@ -396,11 +396,12 @@ type FlowCollectorKafka struct { } type FlowCollectorIPFIXReceiver struct { - //+kubebuilder:default:="" + // +kubebuilder:default:="" // Address of the IPFIX external receiver. TargetHost string `json:"targetHost"` // Port for the IPFIX external receiver. + // +kubebuilder:default:=4739 TargetPort int `json:"targetPort"` // Transport protocol (`TCP` or `UDP`) to be used for the IPFIX connection, defaults to `TCP`. @@ -412,13 +413,13 @@ type FlowCollectorIPFIXReceiver struct { type FlowCollectorOpenTelemetryLogs struct { // Set `enable` to `true` to send logs to an OpenTelemetry receiver. - //+kubebuilder:default:=true + // +kubebuilder:default:=true Enable *bool `json:"enable,omitempty"` } type FlowCollectorOpenTelemetryMetrics struct { // Set `enable` to `true` to send metrics to an OpenTelemetry receiver. - //+kubebuilder:default:=true + // +kubebuilder:default:=true Enable *bool `json:"enable,omitempty"` // Specify how often metrics are sent to a collector. @@ -440,6 +441,7 @@ type FlowCollectorOpenTelemetry struct { TargetHost string `json:"targetHost"` // Port for the OpenTelemetry receiver. + // +kubebuilder:default:=4317 TargetPort int `json:"targetPort"` // Protocol of the OpenTelemetry connection. The available options are `http` and `grpc`. diff --git a/bundle/manifests/flows.netobserv.io_flowcollectors.yaml b/bundle/manifests/flows.netobserv.io_flowcollectors.yaml index 03ccc8a074..ec5468cfb2 100644 --- a/bundle/manifests/flows.netobserv.io_flowcollectors.yaml +++ b/bundle/manifests/flows.netobserv.io_flowcollectors.yaml @@ -5782,6 +5782,7 @@ spec: description: Address of the IPFIX external receiver. type: string targetPort: + default: 4739 description: Port for the IPFIX external receiver. type: integer transport: @@ -6018,6 +6019,7 @@ spec: description: Address of the OpenTelemetry receiver. type: string targetPort: + default: 4317 description: Port for the OpenTelemetry receiver. type: integer tls: diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index c6261ad2d8..46a7559e09 100644 --- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml +++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml @@ -732,6 +732,10 @@ spec: path: exporters[0].kafka x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:exporters.type:Kafka + - displayName: OpenTelemetry configuration + path: exporters[0].openTelemetry + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:fieldDependency:exporters.type:OpenTelemetry - displayName: Exclude interfaces path: agent.ebpf.excludeInterfaces - displayName: Features diff --git a/config/crd/bases/flows.netobserv.io_flowcollectors.yaml b/config/crd/bases/flows.netobserv.io_flowcollectors.yaml index 9ccefcfd34..7532856865 100644 --- a/config/crd/bases/flows.netobserv.io_flowcollectors.yaml +++ b/config/crd/bases/flows.netobserv.io_flowcollectors.yaml @@ -5366,6 +5366,7 @@ spec: description: Address of the IPFIX external receiver. type: string targetPort: + default: 4739 description: Port for the IPFIX external receiver. type: integer transport: @@ -5567,6 +5568,7 @@ spec: description: Address of the OpenTelemetry receiver. type: string targetPort: + default: 4317 description: Port for the OpenTelemetry receiver. type: integer tls: diff --git a/config/csv/bases/netobserv-operator.clusterserviceversion.yaml b/config/csv/bases/netobserv-operator.clusterserviceversion.yaml index 775919a310..93605a45fc 100644 --- a/config/csv/bases/netobserv-operator.clusterserviceversion.yaml +++ b/config/csv/bases/netobserv-operator.clusterserviceversion.yaml @@ -281,6 +281,10 @@ spec: path: exporters[0].kafka x-descriptors: - "urn:alm:descriptor:com.tectonic.ui:fieldDependency:exporters.type:Kafka" + - displayName: OpenTelemetry configuration + path: exporters[0].openTelemetry + x-descriptors: + - "urn:alm:descriptor:com.tectonic.ui:fieldDependency:exporters.type:OpenTelemetry" statusDescriptors: - displayName: Namespace description: Namespace where console plugin and flowlogs-pipeline have been deployed. diff --git a/docs/FlowCollector.md b/docs/FlowCollector.md index 39277a71cc..0d9fd27890 100644 --- a/docs/FlowCollector.md +++ b/docs/FlowCollector.md @@ -11715,6 +11715,8 @@ IPFIX configuration, such as the IP address and port to send enriched IPFIX flow integer Port for the IPFIX external receiver.
+
+ Default: 4739
true @@ -12135,6 +12137,8 @@ OpenTelemetry configuration, such as the IP address and port to send enriched lo integer Port for the OpenTelemetry receiver.
+
+ Default: 4317
true