NETOBSERV-1904 add configs for UDNs (#909)

* add configs for UDNs * fix tests * Update controllers/consoleplugin/config/static-frontend-config.yaml Co-authored-by: Joel Takvorian <jtakvori@redhat.com> --------- Co-authored-by: Joel Takvorian <jtakvori@redhat.com>
netobserv · Jan 20, 2025 · c559a13 · c559a13
1 parent 3108dfe
commit c559a13
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/controllers/consoleplugin/config/static-frontend-config.yaml b/controllers/consoleplugin/config/static-frontend-config.yaml
@@ -443,6 +443,13 @@ columns:
     field: Interfaces
     default: false
     width: 15
+  - id: UDN
+    name: User Defined Network
+    tooltip: The user defined network identifier.
+    field: UdnId
+    filter: udn
+    default: false
+    width: 15
   - id: Bytes
     name: Bytes
     tooltip: The total aggregated number of bytes.
@@ -944,6 +951,10 @@ filters:
     component: autocomplete
     placeholder: 'E.g: Ingress, Egress'
     hint: Specify the direction of the Flow observed at the network interface observation point.
+  - id: udn
+    name: User Defined Network
+    component: autocomplete
+    hint: Specify a user defined network name.
   - id: id
     name: Conversation Id
     component: text
@@ -1031,6 +1042,14 @@ scopes:
     feature: multiCluster
     filter: cluster_name
     stepInto: zone
+  - id: udn
+    name: UDN
+    shortName: UDN
+    description: User Defined Network
+    labels:
+      - UdnId
+    filter: udn
+    stepInto: namespace
   - id: zone
     name: Zone
     shortName: AZ
@@ -1053,9 +1072,12 @@ scopes:
       - SrcK8S_HostName
       - DstK8S_HostName
     groups:
-      - clusters
+      - udns
       - zones
+      - clusters
       - clusters+zones
+      - clusters+udns
+      - udns+zones
     filters:
       - src_host_name
       - dst_host_name
@@ -1074,6 +1096,9 @@ scopes:
       - zones
       - zones+hosts
       - hosts
+      - udns
+      - udns+zones
+      - udns+hosts
     filters:
       - src_namespace
       - dst_namespace
@@ -1100,6 +1125,10 @@ scopes:
       - hosts
       - hosts+namespaces
       - namespaces
+      - udns
+      - udns+zones
+      - udns+hosts
+      - udns+namespaces
     filters:
       - src_owner_name
       - dst_owner_name
@@ -1139,6 +1168,11 @@ scopes:
       - namespaces
       - namespaces+owners
       - owners
+      - udns
+      - udns+zones
+      - udns+hosts
+      - udns+namespaces
+      - udns+owners
     filters:
       - src_resource
       - dst_resource
@@ -1331,6 +1365,10 @@ fields:
   - name: K8S_ClusterName
     type: string
     description: Cluster name or identifier
+  - name: UdnId
+    type: string
+    description: User Defined Network
+    lokiLabel: true
   - name: _RecordType
     type: string
     description: "Type of record: 'flowLog' for regular flow logs, or 'newConnection', 'heartbeat', 'endConnection' for conversation tracking"

diff --git a/controllers/flp/flp_test.go b/controllers/flp/flp_test.go
@@ -655,6 +655,7 @@ func TestConfigMapShouldDeserializeAsJSONWithLokiManual(t *testing.T) {
 		"DstK8S_Type",
 		"K8S_FlowLayer",
 		"FlowDirection",
+		"UdnId",
 		"_RecordType",
 	}, lokiCfg.Labels)
 	assert.Equal(`{app="netobserv-flowcollector"}`, fmt.Sprintf("%v", lokiCfg.StaticLabels))
@@ -711,6 +712,7 @@ func TestConfigMapShouldDeserializeAsJSONWithLokiStack(t *testing.T) {
 		"DstK8S_Type",
 		"K8S_FlowLayer",
 		"FlowDirection",
+		"UdnId",
 		"_RecordType",
 	}, lokiCfg.Labels)
 	assert.Equal(`{app="netobserv-flowcollector"}`, fmt.Sprintf("%v", lokiCfg.StaticLabels))

diff --git a/pkg/helper/loki/labels_test.go b/pkg/helper/loki/labels_test.go
@@ -20,6 +20,7 @@ func TestDefaultLokiLabels(t *testing.T) {
 		"DstK8S_Type",
 		"K8S_FlowLayer",
 		"FlowDirection",
+		"UdnId",
 	})
 }
 
@@ -40,6 +41,7 @@ func TestAllLokiLabels(t *testing.T) {
 		"DstK8S_Type",
 		"K8S_FlowLayer",
 		"FlowDirection",
+		"UdnId",
 		"_RecordType",
 		"K8S_ClusterName",
 		"SrcK8S_Zone",

diff --git a/pkg/helper/loki/loki-labels.json b/pkg/helper/loki/loki-labels.json
@@ -7,7 +7,8 @@
     "DstK8S_OwnerName",
     "DstK8S_Type",
     "K8S_FlowLayer",
-    "FlowDirection"
+    "FlowDirection",
+    "UdnId"
   ],
   "conntrack": [
     "_RecordType"