feature filtering from config

netobserv · Jan 30, 2024 · a52607a · a52607a
1 parent 7b7a896
commit a52607a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/config/sample-config.yaml b/config/sample-config.yaml
@@ -66,6 +66,7 @@ frontend:
       filter: cluster_name
       default: false
       width: 15
+      feature: multiCluster
     - id: SrcK8S_Name
       group: Source
       name: Name
@@ -185,6 +186,7 @@ frontend:
       filter: src_zone
       default: false
       width: 15
+      feature: zones
     - id: DstK8S_Name
       group: Destination
       name: Name
@@ -304,6 +306,7 @@ frontend:
       filter: dst_zone
       default: false
       width: 15
+      feature: zones
     - id: K8S_Name
       name: Names
       calculated: getSrcOrDstValue(SrcK8S_Name,DstK8S_Name)
@@ -471,6 +474,7 @@ frontend:
       filter: dns_id
       default: false
       width: 5
+      feature: dnsTracking
     - id: DNSLatency
       group: DNS
       name: DNS Latency
@@ -479,6 +483,7 @@ frontend:
       filter: dns_latency
       default: true
       width: 5
+      feature: dnsTracking
     - id: DNSResponseCode
       group: DNS
       name: DNS Response Code
@@ -487,6 +492,7 @@ frontend:
       filter: dns_flag_response_code
       default: true
       width: 5
+      feature: dnsTracking
     - id: DNSErrNo
       group: DNS
       name: DNS Error
@@ -495,13 +501,15 @@ frontend:
       filter: dns_errno
       default: false
       width: 5
+      feature: dnsTracking
     - id: TimeFlowRttMs
       name: Flow RTT
       tooltip: TCP handshake Round Trip Time
       field: TimeFlowRttNs
       filter: time_flow_rtt
       default: true
       width: 5
+      feature: flowRTT
   filters:
     - id: cluster_name
       name: Cluster

diff --git a/pkg/handler/config.go b/pkg/handler/config.go
@@ -55,6 +55,7 @@ type Column struct {
 	Filter     string   `yaml:"filter,omitempty" json:"filter,omitempty"`
 	Default    bool     `yaml:"default,omitempty" json:"default,omitempty"`
 	Width      int      `yaml:"width,omitempty" json:"width,omitempty"`
+	Feature    string   `yaml:"feature" json:"feature"`
 }
 
 type Filter struct {

diff --git a/web/src/components/netflow-traffic.tsx b/web/src/components/netflow-traffic.tsx
@@ -318,15 +318,11 @@ export const NetflowTraffic: React.FC<NetflowTrafficProps> = ({ forcedFilters, i
       return columns.filter(
         col =>
           (!isSidePanel || !col.isCommon) &&
-          (isMultiCluster() || ![ColumnsId.clustername].includes(col.id)) &&
-          (isZones() || ![ColumnsId.srczone, ColumnsId.dstzone].includes(col.id)) &&
           (isConnectionTracking() || ![ColumnsId.recordtype, ColumnsId.hashid].includes(col.id)) &&
-          (isDNSTracking() ||
-            ![ColumnsId.dnsid, ColumnsId.dnslatency, ColumnsId.dnsresponsecode, ColumnsId.dnserrno].includes(col.id)) &&
-          (isFlowRTT() || ![ColumnsId.rttTime].includes(col.id))
+          (!col.feature || config.features.includes(col.feature))
       );
     },
-    [columns, isConnectionTracking, isDNSTracking, isFlowRTT, isMultiCluster, isZones]
+    [columns, config.features, isConnectionTracking]
   );
 
   const getSelectedColumns = React.useCallback(() => {

diff --git a/web/src/utils/columns.ts b/web/src/utils/columns.ts
@@ -5,6 +5,7 @@ import { compareNumbers, compareStrings } from './base-compare';
 import { compareIPs } from './ip';
 import { comparePorts } from './port';
 import { compareProtocols } from './protocol';
+import { Feature } from '../model/config';
 
 export enum ColumnsId {
   starttime = 'StartTime',
@@ -92,6 +93,7 @@ export interface ColumnConfigDef {
   filter?: string;
   default?: boolean;
   width?: number;
+  feature?: Feature;
 }
 
 export interface Column {
@@ -108,6 +110,7 @@ export interface Column {
   sort(a: Record, b: Record, col: Column): number;
   // width in "em"
   width: number;
+  feature?: Feature;
 }
 
 export type ColumnSizeMap = {
@@ -339,7 +342,8 @@ export const getDefaultColumns = (columnDefs: ColumnConfigDef[]): Column[] => {
           return 0;
         }
       },
-      width: d.width || 15
+      width: d.width || 15,
+      feature: d.feature
     });
   });
   return columns;