Merge pull request #912 from Amoghrd/netobserv-1981

NETOBSERV-1981: Fix Exporters form view

Author: Amoghrd

apis/flowcollector/v1beta2/flowcollector_types.go

@@ -410,11 +410,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"`
 
@@ -428,11 +428,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`.
@@ -444,13 +445,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.
@@ -472,6 +473,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`.

bundle/manifests/flows.netobserv.io_flowcollectors.yaml

@@ -6067,6 +6067,7 @@ spec:
                           description: Address of the IPFIX external receiver.
                           type: string
                         targetPort:
+                          default: 4739
                           description: Port for the IPFIX external receiver.
                           type: integer
                         transport:
@@ -6303,6 +6304,7 @@ spec:
                           description: Address of the OpenTelemetry receiver.
                           type: string
                         targetPort:
+                          default: 4317
                           description: Port for the OpenTelemetry receiver.
                           type: integer
                         tls:

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

config/crd/bases/flows.netobserv.io_flowcollectors.yaml

@@ -5616,6 +5616,7 @@ spec:
                             description: Address of the IPFIX external receiver.
                             type: string
                           targetPort:
+                            default: 4739
                             description: Port for the IPFIX external receiver.
                             type: integer
                           transport:
@@ -5817,6 +5818,7 @@ spec:
                             description: Address of the OpenTelemetry receiver.
                             type: string
                           targetPort:
+                            default: 4317
                             description: Port for the OpenTelemetry receiver.
                             type: integer
                           tls:

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.

docs/FlowCollector.md

@@ -12056,6 +12056,8 @@ IPFIX configuration, such as the IP address and port to send enriched IPFIX flow
         <td>integer</td>
         <td>
           Port for the IPFIX external receiver.<br/>
+          <br/>
+            <i>Default</i>: 4739<br/>
         </td>
         <td>true</td>
       </tr><tr>
@@ -12476,6 +12478,8 @@ OpenTelemetry configuration, such as the IP address and port to send enriched lo
         <td>integer</td>
         <td>
           Port for the OpenTelemetry receiver.<br/>
+          <br/>
+            <i>Default</i>: 4317<br/>
         </td>
         <td>true</td>
       </tr><tr>