NETOBSERV-2227: UDN adjustments, and auto-detect filters

pkg/config/config.go

@@ -116,8 +116,6 @@ type FieldConfig struct {
 	Type        string `yaml:"type" json:"type"`
 	Format      string `yaml:"format,omitempty" json:"format,omitempty"`
 	Description string `yaml:"description" json:"description"`
-	// lokiLabel flag is for documentation only. Use loki.labels instead
-	Filter string `yaml:"filter,omitempty" json:"filter,omitempty"`
 }
 
 type Frontend struct {

pkg/handler/k8s.go

@@ -56,7 +56,7 @@ func (h *Handlers) GetUDNIdss(ctx context.Context) func(w http.ResponseWriter, r
 		}
 		for _, udn := range udns {
 			md := udn.Object["metadata"].(map[string]interface{})
-			values = append(values, fmt.Sprintf("%s.%s", md["namespace"], md["name"]))
+			values = append(values, fmt.Sprintf("%s/%s", md["namespace"], md["name"]))
 		}
 		writeJSON(w, http.StatusOK, utils.NonEmpty(utils.Dedup(values)))
 	}

web/locales/en/plugin__netobserv-plugin.json

@@ -44,7 +44,6 @@
   "The flow contains packets with various flags: ": "The flow contains packets with various flags: ",
   "ICMP type provided but protocol is {{proto}}": "ICMP type provided but protocol is {{proto}}",
   "ICMP code provided but protocol is {{proto}}": "ICMP code provided but protocol is {{proto}}",
-  "None": "None",
   "Invalid data provided. Check JSON for details.": "Invalid data provided. Check JSON for details.",
   "dropped": "dropped",
   "dropped by": "dropped by",
@@ -161,6 +160,7 @@
   "M": "M",
   "S": "S",
   "XS": "XS",
+  "None": "None",
   "Step {{index}}/{{count}}": "Step {{index}}/{{count}}",
   "Step {{index}}/{{count}}_plural": "Step {{index}}/{{count}}",
   "Previous tip": "Previous tip",

web/src/components/__tests-data__/columns.ts

@@ -1,6 +1,6 @@
 /* eslint-disable max-len */
 import * as _ from 'lodash';
-import { Column, ColumnsId, getDefaultColumns } from '../../utils/columns';
+import { Column, ColumnConfigDef, ColumnsId, getDefaultColumns } from '../../utils/columns';
 import { FieldConfig } from '../../utils/fields';
 
 export const ColumnConfigSampleDefs = [
@@ -170,6 +170,16 @@ export const ColumnConfigSampleDefs = [
     default: false,
     width: 15
   },
+  {
+    id: 'SrcZone',
+    group: 'Source',
+    name: 'Zone',
+    field: 'SrcK8S_Zone',
+    filter: 'src_zone',
+    default: false,
+    width: 15,
+    feature: 'zones'
+  },
   {
     id: 'DstK8S_Name',
     group: 'Destination',
@@ -303,6 +313,16 @@ export const ColumnConfigSampleDefs = [
     default: false,
     width: 15
   },
+  {
+    id: 'DstZone',
+    group: 'Destination',
+    name: 'Zone',
+    field: 'DstK8S_Zone',
+    filter: 'dst_zone',
+    default: false,
+    width: 15,
+    feature: 'zones'
+  },
   {
     id: 'K8S_Name',
     name: 'Names',
@@ -476,6 +496,7 @@ export const ColumnConfigSampleDefs = [
     tooltip: 'DNS request identifier.',
     field: 'DnsId',
     filter: 'dns_id',
+    feature: 'dnsTracking',
     default: false,
     width: 5
   },
@@ -485,6 +506,8 @@ export const ColumnConfigSampleDefs = [
     name: 'DNS Latency',
     tooltip: 'Time elapsed between DNS request and response.',
     field: 'DnsLatencyMs',
+    filter: 'dns_latency',
+    feature: 'dnsTracking',
     default: false,
     width: 5
   },
@@ -495,6 +518,7 @@ export const ColumnConfigSampleDefs = [
     tooltip: 'DNS RCODE name from response header.',
     field: 'DnsFlagsResponseCode',
     filter: 'dns_flag_response_code',
+    feature: 'dnsTracking',
     default: false,
     width: 5
   },
@@ -518,7 +542,7 @@ export const ColumnConfigSampleDefs = [
     default: false,
     width: 10
   }
-];
+] as ColumnConfigDef[];
 
 export const FieldConfigSample = [
   {

web/src/components/__tests-data__/filters.ts

@@ -182,6 +182,18 @@ export const FilterConfigSampleDefs = [
     examples:
       'Specify a single kubernetes name following these rules:\n    - Containing any alphanumeric, hyphen, underscrore or dot character\n    - Partial text like cluster, cluster-image, image-registry\n    - Exact match using quotes like "cluster-image-registry"\n    - Case sensitive match using quotes like "Deployment"\n    - Starting text like cluster, "cluster-*"\n    - Ending text like "*-registry"\n    - Pattern like "cluster-*-registry", "c*-*-r*y", -i*e-'
   },
+  {
+    id: 'src_zone',
+    name: 'Zone',
+    component: 'autocomplete',
+    category: 'source'
+  },
+  {
+    id: 'dst_zone',
+    name: 'Zone',
+    component: 'autocomplete',
+    category: 'destination'
+  },
   {
     id: 'protocol',
     name: 'Protocol',

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

@@ -218,14 +218,18 @@ export const RecordField: React.FC<RecordFieldProps> = ({
   const nthContainer = (children: (JSX.Element | undefined)[], asChild = true, childIcon = true, forcedSize?: Size) => {
     return (
       <Flex className={`record-field-flex-container ${forcedSize || size}`} flex={{ default: 'flex_1' }}>
-        {children.map((c, i) => {
-          const child = c ? c : emptyText();
-          if (i > 0 && asChild && childIcon) {
-            const arrow = <span className="child-arrow">{'↪'}</span>;
-            return sideBySideContainer(arrow, child, 'flexNone', 'flex_1', 'nowrap');
-          }
-          return child;
-        })}
+        {children.length > 0 ? (
+          children.map((c, i) => {
+            const child = c ? c : emptyText();
+            if (i > 0 && asChild && childIcon) {
+              const arrow = <span className="child-arrow">{'↪'}</span>;
+              return sideBySideContainer(arrow, child, 'flexNone', 'flex_1', 'nowrap');
+            }
+            return child;
+          })
+        ) : (
+          <Text className="text-muted record-field-value">{t('n/a')}</Text>
+        )}
       </Flex>
     );
   };
@@ -435,7 +439,10 @@ export const RecordField: React.FC<RecordFieldProps> = ({
       case ColumnsId.udns: {
         if (Array.isArray(value)) {
           return nthContainer(
-            value.map(iName => simpleTextWithTooltip(iName !== '' ? String(iName) : t('None'))),
+            value
+              .map(iName => String(iName))
+              .filter(iName => iName !== '')
+              .map(iName => simpleTextWithTooltip(iName)),
             true,
             false
           );

web/src/components/netflow-traffic.tsx

@@ -124,22 +124,6 @@ export const NetflowTraffic: React.FC<NetflowTrafficProps> = ({
     return model.config.features.includes('pktDrop');
   }, [model.config.features]);
 
-  const isUdn = React.useCallback(() => {
-    return model.config.features.includes('udnMapping');
-  }, [model.config.features]);
-
-  const isPktXlat = React.useCallback(() => {
-    return model.config.features.includes('packetTranslation');
-  }, [model.config.features]);
-
-  const isNetEvents = React.useCallback(() => {
-    return model.config.features.includes('networkEvents');
-  }, [model.config.features]);
-
-  const isIPSec = React.useCallback(() => {
-    return model.config.features.includes('ipsec');
-  }, [model.config.features]);
-
   const isPromOnly = React.useCallback(() => {
     return !allowLoki() || model.dataSource === 'prom';
   }, [allowLoki, model.dataSource]);
@@ -159,14 +143,6 @@ export const NetflowTraffic: React.FC<NetflowTrafficProps> = ({
     [model.config.promLabels, isPromOnly]
   );
 
-  const isMultiCluster = React.useCallback(() => {
-    return isPromOnly() ? dataSourceHasLabels(['K8S_ClusterName']) : model.config.features.includes('multiCluster');
-  }, [model.config.features, dataSourceHasLabels, isPromOnly]);
-
-  const isZones = React.useCallback(() => {
-    return isPromOnly() ? dataSourceHasLabels(['SrcK8S_Zone', 'DstK8S_Zone']) : model.config.features.includes('zones');
-  }, [model.config.features, dataSourceHasLabels, isPromOnly]);
-
   const getAvailableScopes = React.useCallback(() => {
     return model.config.scopes.filter(sc => {
       if (sc.feature) {
@@ -219,22 +195,14 @@ export const NetflowTraffic: React.FC<NetflowTrafficProps> = ({
   }, [getAvailableColumns]);
 
   const getFilterDefs = React.useCallback(() => {
-    return getFilterDefinitions(model.config.filters, model.config.columns, t).filter(
-      fd =>
-        (isMultiCluster() || fd.id !== 'cluster_name') &&
-        (isZones() || !fd.id.endsWith('_zone')) &&
-        (isConnectionTracking() || fd.id !== 'id') &&
-        (isDNSTracking() || !fd.id.startsWith('dns_')) &&
-        (isPktDrop() || !fd.id.startsWith('pkt_drop_')) &&
-        (isFlowRTT() || fd.id !== 'time_flow_rtt') &&
-        (isUdn() || fd.id !== 'udns') &&
-        (isPktXlat() || !fd.id.startsWith('xlat_')) &&
-        (isNetEvents() || fd.id !== 'network_events') &&
-        (!isPromOnly() || checkFilterAvailable(fd, model.config.promLabels)) &&
-        (isIPSec() || !fd.id.startsWith('ipsec_'))
-    );
+    return getFilterDefinitions(model.config.filters, model.config.columns, t).filter(fd => {
+      if (fd.id === 'id') {
+        return isConnectionTracking();
+      }
+      return checkFilterAvailable(fd, model.config, model.dataSource);
+    });
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [model.config.columns, model.config.filters, model.config.promLabels, isPromOnly]);
+  }, [model.config, model.dataSource]);
 
   const getQuickFilters = React.useCallback(
     (c: Config = model.config) => {

web/src/utils/__tests__/filter-definitions.spec.ts

@@ -1,4 +1,6 @@
+import { ColumnConfigSampleDefs } from '../../components/__tests-data__/columns';
 import { FilterDefinitionSample } from '../../components/__tests-data__/filters';
+import { Config, Feature } from '../../model/config';
 import { checkFilterAvailable, findFilter } from '../filter-definitions';
 
 describe('Resource validation', () => {
@@ -99,35 +101,92 @@ describe('Resource checkCompletion', () => {
   });
 });
 
-describe('Check availability', () => {
+describe('Check availability for prometheus only', () => {
   const simpleFilter = findFilter(FilterDefinitionSample, 'src_name')!;
   const k8sFilter = findFilter(FilterDefinitionSample, 'src_resource')!;
+  const getConfig = (promLabels: string[]): Config => {
+    return { promLabels, dataSources: ['prom'] } as Config;
+  };
 
   it('should be available', () => {
-    let available = checkFilterAvailable(simpleFilter, ['SrcK8S_Name', 'DstK8S_Name']);
+    let available = checkFilterAvailable(simpleFilter, getConfig(['SrcK8S_Name', 'DstK8S_Name']), 'prom');
     expect(available).toBe(true);
 
-    available = checkFilterAvailable(k8sFilter, [
-      'SrcK8S_OwnerName',
-      'SrcK8S_OwnerType',
-      'SrcK8S_Namespace',
-      'DstK8S_OwnerName',
-      'DstK8S_OwnerType',
-      'DstK8S_Namespace'
-    ]);
+    available = checkFilterAvailable(
+      k8sFilter,
+      getConfig([
+        'SrcK8S_OwnerName',
+        'SrcK8S_OwnerType',
+        'SrcK8S_Namespace',
+        'DstK8S_OwnerName',
+        'DstK8S_OwnerType',
+        'DstK8S_Namespace'
+      ]),
+      'prom'
+    );
     expect(available).toBe(true);
   });
 
   it('should not be available', () => {
-    let available = checkFilterAvailable(simpleFilter, ['SrcK8S_OwnerName', 'DstK8S_OwnerName']);
+    let available = checkFilterAvailable(simpleFilter, getConfig(['SrcK8S_OwnerName', 'DstK8S_OwnerName']), 'prom');
     expect(available).toBe(false);
 
-    available = checkFilterAvailable(k8sFilter, [
-      'SrcK8S_OwnerName',
-      'SrcK8S_Namespace',
-      'DstK8S_OwnerName',
-      'DstK8S_Namespace'
-    ]);
+    available = checkFilterAvailable(
+      k8sFilter,
+      getConfig(['SrcK8S_OwnerName', 'SrcK8S_Namespace', 'DstK8S_OwnerName', 'DstK8S_Namespace']),
+      'prom'
+    );
     expect(available).toBe(false);
   });
 });
+
+describe('Check availability against features', () => {
+  const getConfig = (feats: Feature[]): Config => {
+    return { features: feats, dataSources: ['loki'], columns: ColumnConfigSampleDefs } as Config;
+  };
+
+  it('with standard filters', () => {
+    const simpleFilter = findFilter(FilterDefinitionSample, 'src_name')!;
+    const k8sFilter = findFilter(FilterDefinitionSample, 'src_resource')!;
+
+    let available = checkFilterAvailable(simpleFilter, getConfig([]), 'auto');
+    expect(available).toBe(true);
+
+    available = checkFilterAvailable(k8sFilter, getConfig([]), 'auto');
+    expect(available).toBe(true);
+
+    available = checkFilterAvailable(simpleFilter, getConfig(['dnsTracking']), 'auto');
+    expect(available).toBe(true);
+
+    available = checkFilterAvailable(k8sFilter, getConfig(['dnsTracking']), 'auto');
+    expect(available).toBe(true);
+  });
+
+  it('with AZ filters', () => {
+    const azFilter = findFilter(FilterDefinitionSample, 'src_zone')!;
+
+    let available = checkFilterAvailable(azFilter, getConfig([]), 'auto');
+    expect(available).toBe(false);
+
+    available = checkFilterAvailable(azFilter, getConfig(['dnsTracking']), 'auto');
+    expect(available).toBe(false);
+
+    available = checkFilterAvailable(azFilter, getConfig(['zones']), 'auto');
+    expect(available).toBe(true);
+  });
+
+  it('with DNS filters', () => {
+    const dnsIdFilter = findFilter(FilterDefinitionSample, 'dns_id')!;
+    const dnsLatilter = findFilter(FilterDefinitionSample, 'dns_latency')!;
+
+    let available = checkFilterAvailable(dnsIdFilter, getConfig([]), 'auto');
+    expect(available).toBe(false);
+    available = checkFilterAvailable(dnsLatilter, getConfig([]), 'auto');
+    expect(available).toBe(false);
+
+    available = checkFilterAvailable(dnsIdFilter, getConfig(['dnsTracking']), 'auto');
+    expect(available).toBe(true);
+    available = checkFilterAvailable(dnsLatilter, getConfig(['dnsTracking']), 'auto');
+    expect(available).toBe(true);
+  });
+});

web/src/utils/fields.ts

@@ -7,5 +7,4 @@ export interface FieldConfig {
   type: FieldType;
   format?: FieldFormat;
   description: string;
-  filter?: string;
 }