bytes / packets zeros

netobserv · Aug 7, 2023 · 6e698a5 · 6e698a5
1 parent c15abab
commit 6e698a5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 19 deletions.
diff --git a/pkg/loki/filter.go b/pkg/loki/filter.go
@@ -160,17 +160,6 @@ func (f *lineFilter) asLabelFilters() []labelFilter {
 	return lfs
 }
 
-func numberMatchLineFilter(key string, strictKey bool, value string) lineFilter {
-	return lineFilter{
-		key:       key,
-		strictKey: strictKey,
-		values: []lineMatch{{
-			valueType: typeNumber,
-			value:     value,
-		}},
-	}
-}
-
 func regexMatchLineFilter(key string, strictKey bool, value string) lineFilter {
 	return lineFilter{
 		key:       key,

diff --git a/pkg/loki/flow_query.go b/pkg/loki/flow_query.go
@@ -66,9 +66,10 @@ func NewFlowQueryBuilder(cfg *Config, start, end, limit string, reporter constan
 
 	lineFilters := []lineFilter{}
 	if packetLoss == constants.PacketLossDropped {
-		// match 0 packet sent and 1+ packets dropped
+		// match records that doesn't contains "Packets" field and 1+ packets dropped
+		// as FLP will ensure the filtering
 		lineFilters = append(lineFilters,
-			numberMatchLineFilter(fields.Packets, true, "0"),
+			notContainsKeyLineFilter(fields.Packets),
 			regexMatchLineFilter(fields.PktDropPackets, true, "[1-9][0-9]*"),
 		)
 	} else if packetLoss == constants.PacketLossHasDrop {

diff --git a/web/src/api/ipfix.ts b/web/src/api/ipfix.ts
@@ -75,13 +75,13 @@ export interface Fields {
   /** TCP flags */
   Flags?: number;
   /** Number of packets in this flow */
-  Packets: number;
+  Packets?: number;
   /** In conversation tracking, A to B packets counter per conversation */
   Packets_AB?: number;
   /** In conversation tracking, B to A packets counter per conversation */
   Packets_BA?: number;
   /** Number of bytes in this flow */
-  Bytes: number;
+  Bytes?: number;
   /** In conversation tracking, A to B bytes counter per conversation */
   Bytes_AB?: number;
   /** In conversation tracking, B to A bytes counter per conversation */

diff --git a/web/src/components/query-summary/flows-query-summary.tsx b/web/src/components/query-summary/flows-query-summary.tsx
@@ -39,8 +39,8 @@ export const FlowsQuerySummaryContent: React.FC<{
   const rangeInSeconds = rangeToSeconds(range);
 
   const counters = React.useCallback(() => {
-    const bytes = filteredFlows.map(f => f.fields.Bytes).reduce((a, b) => a + b, 0);
-    const packets = filteredFlows.map(f => f.fields.Packets).reduce((a, b) => a + b, 0);
+    const bytes = filteredFlows.map(f => f.fields.Bytes || 0).reduce((a, b) => a + b, 0);
+    const packets = filteredFlows.map(f => f.fields.Packets || 0).reduce((a, b) => a + b, 0);
 
     return (
       <>

diff --git a/web/src/utils/columns.ts b/web/src/utils/columns.ts
@@ -759,7 +759,7 @@ export const getExtraColumns = (t: TFunction): Column[] => {
       tooltip: t('The total aggregated number of bytes.'),
       fieldName: 'Bytes',
       isSelected: true,
-      value: f => (f.fields.PktDropBytes ? [f.fields.Bytes, f.fields.PktDropBytes] : f.fields.Bytes),
+      value: f => (f.fields.PktDropBytes ? [f.fields.Bytes || 0, f.fields.PktDropBytes] : f.fields.Bytes || 0),
       sort: (a, b, col) => compareNumbers(col.value(a) as number, col.value(b) as number),
       width: 5
     },
@@ -769,7 +769,7 @@ export const getExtraColumns = (t: TFunction): Column[] => {
       tooltip: t('The total aggregated number of packets.'),
       fieldName: 'Packets',
       isSelected: true,
-      value: f => (f.fields.PktDropPackets ? [f.fields.Packets, f.fields.PktDropPackets] : f.fields.Packets),
+      value: f => (f.fields.PktDropPackets ? [f.fields.Packets || 0, f.fields.PktDropPackets] : f.fields.Packets || 0),
       sort: (a, b, col) => compareNumbers(col.value(a) as number, col.value(b) as number),
       width: 5
     },