Add UDNs merger logic to merge udns accross nodes for the same flow

Signed-off-by: Mohamed Mahmoud <[email protected]>

Author: msherif1234

pkg/model/fields/fields.go

@@ -35,6 +35,7 @@ const (
 	DstZone                = Dst + Zone
 	Cluster                = "K8S_ClusterName"
 	UDN                    = "UDN"
+	Udns                   = "Udns"
 	Layer                  = "K8S_FlowLayer"
 	Packets                = "Packets"
 	Proto                  = "Proto"

web/src/api/ipfix.ts

@@ -115,6 +115,8 @@ export interface Fields {
   Interfaces?: string[];
   /** Flow direction array from the network interface observation point */
   IfDirections?: IfDirection[];
+  /** UDNs labels array */
+  Udns?: string[];
   /** Network Events */
   NetworkEvents?: string[];
   /** Logical OR combination of unique TCP flags comprised in the flow, as per RFC-9293, with additional custom flags to represent the following per-packet combinations: SYN+ACK (0x100), FIN+ACK (0x200) and RST+ACK (0x400). */

web/src/components/drawer/record/record-field.tsx

@@ -1,21 +1,21 @@
-import { ResourceIcon, ResourceLink } from '@openshift-console/dynamic-plugin-sdk';
-import { Button, Flex, FlexItem, Popover, Text, TextContent, TextVariants, Tooltip } from '@patternfly/react-core';
-import { FilterIcon, GlobeAmericasIcon, TimesIcon, ToggleOffIcon, ToggleOnIcon } from '@patternfly/react-icons';
+import {ResourceIcon, ResourceLink} from '@openshift-console/dynamic-plugin-sdk';
+import {Button, Flex, FlexItem, Popover, Text, TextContent, TextVariants, Tooltip} from '@patternfly/react-core';
+import {FilterIcon, GlobeAmericasIcon, TimesIcon, ToggleOffIcon, ToggleOnIcon} from '@patternfly/react-icons';
 import * as React from 'react';
-import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
-import { FlowDirection, getDirectionDisplayString, Record } from '../../../api/ipfix';
-import { Column, ColumnsId, getFullColumnName, isKubeObj, KubeObj } from '../../../utils/columns';
-import { dateFormatter, getFormattedDate, timeMSFormatter, utcDateTimeFormatter } from '../../../utils/datetime';
-import { dnsCodesNames, dnsErrorsValues, getDNSErrorDescription, getDNSRcodeDescription } from '../../../utils/dns';
-import { getDSCPDocUrl, getDSCPServiceClassDescription, getDSCPServiceClassName } from '../../../utils/dscp';
-import { formatDurationAboveMillisecond, formatDurationAboveNanosecond } from '../../../utils/duration';
-import { getICMPCode, getICMPDocUrl, getICMPType, icmpAllTypesValues, isValidICMPProto } from '../../../utils/icmp';
-import { dropCausesNames, getDropCauseDescription, getDropCauseDocUrl } from '../../../utils/pkt-drop';
-import { formatPort } from '../../../utils/port';
-import { formatProtocol, getProtocolDocUrl } from '../../../utils/protocol';
-import { getFlagsList, getTCPFlagsDocUrl } from '../../../utils/tcp-flags';
-import { Size } from '../../dropdowns/table-display-dropdown';
+import {useTranslation} from 'react-i18next';
+import {Link} from 'react-router-dom';
+import {FlowDirection, getDirectionDisplayString, Record} from '../../../api/ipfix';
+import {Column, ColumnsId, getFullColumnName, isKubeObj, KubeObj} from '../../../utils/columns';
+import {dateFormatter, getFormattedDate, timeMSFormatter, utcDateTimeFormatter} from '../../../utils/datetime';
+import {dnsCodesNames, dnsErrorsValues, getDNSErrorDescription, getDNSRcodeDescription} from '../../../utils/dns';
+import {getDSCPDocUrl, getDSCPServiceClassDescription, getDSCPServiceClassName} from '../../../utils/dscp';
+import {formatDurationAboveMillisecond, formatDurationAboveNanosecond} from '../../../utils/duration';
+import {getICMPCode, getICMPDocUrl, getICMPType, icmpAllTypesValues, isValidICMPProto} from '../../../utils/icmp';
+import {dropCausesNames, getDropCauseDescription, getDropCauseDocUrl} from '../../../utils/pkt-drop';
+import {formatPort} from '../../../utils/port';
+import {formatProtocol, getProtocolDocUrl} from '../../../utils/protocol';
+import {getFlagsList, getTCPFlagsDocUrl} from '../../../utils/tcp-flags';
+import {Size} from '../../dropdowns/table-display-dropdown';
 import './record-field.css';
 
 export type RecordFieldFilter = {
@@ -413,7 +413,8 @@ export const RecordField: React.FC<RecordFieldProps> = ({
         }
         return singleContainer(simpleTextWithTooltip(getDirectionDisplayString(String(value) as FlowDirection, t)));
       }
-      case ColumnsId.interfaces: {
+      case ColumnsId.interfaces:
+      case ColumnsId.udns: {
         if (Array.isArray(value)) {
           return nthContainer(
             value.map(iName => simpleTextWithTooltip(String(iName))),

web/src/utils/__tests__/flows.spec.ts

@@ -76,7 +76,8 @@ describe('mergeFlowReporters', () => {
           SrcAddr: '10.0.0.1',
           DstAddr: '10.0.0.2',
           IfDirections: [IfDirection.Ingress, IfDirection.Egress],
-          Interfaces: ['eth0', 'abcd']
+          Interfaces: ['eth0', 'abcd'],
+          Udns: ['udn1', 'udn2']
         } as Fields,
         labels: { FlowDirection: FlowDirection.Ingress }
       },
@@ -86,7 +87,8 @@ describe('mergeFlowReporters', () => {
           SrcAddr: '10.0.0.1',
           DstAddr: '10.0.0.2',
           IfDirections: [IfDirection.Ingress],
-          Interfaces: ['genev']
+          Interfaces: ['genev'],
+          Udns: ['udn3']
         } as Fields,
         labels: { FlowDirection: FlowDirection.Egress }
       }
@@ -99,7 +101,8 @@ describe('mergeFlowReporters', () => {
         SrcAddr: '10.0.0.1',
         DstAddr: '10.0.0.2',
         IfDirections: [IfDirection.Ingress, IfDirection.Egress, IfDirection.Ingress],
-        Interfaces: ['eth0', 'abcd', 'genev']
+        Interfaces: ['eth0', 'abcd', 'genev'],
+        Udns: ['udn1', 'udn2', 'udn3']
       } as Fields,
       labels: { FlowDirection: FlowDirection.Ingress }
     });

web/src/utils/columns.ts

@@ -79,6 +79,7 @@ export enum ColumnsId {
   interfaces = 'Interfaces',
   ifdirs = 'IfDirections',
   flowdirints = 'FlowDirInts',
+  udns = 'Udns',
   recordtype = 'RecordType',
   bytesab = 'Bytes_AB',
   bytesba = 'Bytes_BA',

web/src/utils/flows.ts

@@ -35,24 +35,47 @@ const getInvolvedInterfaces = (flowsFor5Tuples: Record[]): { ifnames: string[];
   return { ifnames, ifdirs };
 };
 
+const getInvolvedUdns = (flowsFor5Tuples: Record[]): string[] => {
+  const cache = new Set();
+  const udns: string[] = [];
+  flowsFor5Tuples.forEach(f => {
+    if (f.fields.Udns) {
+      _.zip(f.fields.Udns).forEach(([udn]) => {
+        const key = `${udn}`;
+        if (!cache.has(key)) {
+          cache.add(key);
+          udns.push(udn!);
+        }
+      });
+    }
+  });
+  return udns;
+};
+
 export const mergeFlowReporters = (flows: Record[]): Record[] => {
   // The purpose of this function is to determine if, for a given 5 tuple, we'll look at INGRESS, EGRESS or INNER reporter
   // The assumption is that INGRESS alone, EGRESS alone or INNER alone always provide a complete visiblity
   // Favor whichever contains pktDrop and/or DNS responses
   const grouped = _.groupBy(flows, get5Tuple);
   const filtersIndex = _.mapValues(grouped, (records: Record[]) => electMostRelevant(records));
   const involvedInterfaces = _.mapValues(grouped, (records: Record[]) => getInvolvedInterfaces(records));
-  // Filter and inject other interfaces in elected flows
-  // An assumption is made that interfaces involved for a 5 tuples will keep being involved in the whole flows sequence
+  const involvedUdns = _.mapValues(grouped, (records: Record[]) => getInvolvedUdns(records));
+  // Filter and inject other interfaces and udns in elected flows
+  // An assumption is made that interfaces and udns involved for a 5 tuples will keep being involved in the whole flows sequence
   // If that assumption proves wrong, we may refine by looking at time overlaps between flows
   return flows
     .filter((r: Record) => r.labels.FlowDirection === filtersIndex[get5Tuple(r)].labels.FlowDirection)
     .map(r => {
-      const interfaces = involvedInterfaces[get5Tuple(r)];
+      const key = get5Tuple(r);
+      const interfaces = involvedInterfaces[key];
       if (interfaces) {
         r.fields.Interfaces = interfaces.ifnames;
         r.fields.IfDirections = interfaces.ifdirs;
       }
+      const udns = involvedUdns[key];
+      if (udns) {
+        r.fields.Udns = udns;
+      }
       return r;
     });
 };