Skip to content

Commit 403e635

Browse files
authored
NETOBSERV-1580 add update-config target (#621)
* add update-config target * update config and manage drop columns * keep features disabled to avoid cypress failures * update config to fix icmp cols
1 parent 30fbfa6 commit 403e635

File tree

5 files changed

+68
-3
lines changed

5 files changed

+68
-3
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ endif
135135
generate-doc: ## Generate documentation of the flows JSON format
136136
cd web && npm run generate-doc
137137

138+
.PHONY: update-config
139+
update-config: ## Update sample config from operator repo
140+
./scripts/update-config.sh
141+
138142
##@ Develop frontend
139143

140144
.PHONY: install-frontend

config/sample-config.yaml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@ frontend:
589589
- id: Bytes
590590
name: Bytes
591591
tooltip: The total aggregated number of bytes.
592+
field: Bytes
592593
fields:
593594
- Bytes
594595
- PktDropBytes
@@ -597,6 +598,7 @@ frontend:
597598
- id: Packets
598599
name: Packets
599600
tooltip: The total aggregated number of packets.
601+
field: Packets
600602
fields:
601603
- Packets
602604
- PktDropPackets
@@ -622,6 +624,41 @@ frontend:
622624
calculated: substract(column.CollectionTime,TimeFlowEndMs)
623625
default: false
624626
width: 5
627+
- id: PktDropBytes
628+
name: Dropped Bytes
629+
tooltip: The total aggregated number of bytes dropped.
630+
field: PktDropBytes
631+
default: false
632+
width: 5
633+
feature: pktDrop
634+
- id: PktDropPackets
635+
name: Dropped Packets
636+
tooltip: The total aggregated number of packets dropped.
637+
field: PktDropPackets
638+
default: false
639+
width: 5
640+
feature: pktDrop
641+
- id: PktDropLatestState
642+
name: Drop State
643+
tooltip: TCP state on last dropped packet.
644+
field: PktDropLatestState
645+
default: false
646+
width: 10
647+
feature: pktDrop
648+
- id: PktDropLatestDropCause
649+
name: Drop Cause
650+
tooltip: TCP state on last dropped packet.
651+
field: PktDropLatestDropCause
652+
default: false
653+
width: 10
654+
feature: pktDrop
655+
- id: PktDropLatestFlags
656+
name: Drop Flags
657+
tooltip: TCP flags on last dropped packet.
658+
field: PktDropLatestFlags
659+
default: false
660+
width: 10
661+
feature: pktDrop
625662
- id: DNSId
626663
group: DNS
627664
name: DNS Id
@@ -1036,7 +1073,7 @@ frontend:
10361073
component: number
10371074
hint: Specify a TCP smoothed Round Trip Time in nanoseconds.
10381075
- id: network_events
1039-
name: Network events flow monitoring
1076+
name: Network Events
10401077
component: text
10411078
hint: Specify a single network event.
10421079
scopes:

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ export const RecordField: React.FC<RecordFieldProps> = ({
338338
}
339339
return singleContainer(child);
340340
}
341-
case ColumnsId.tcpflags: {
341+
case ColumnsId.tcpflags:
342+
case ColumnsId.dropflags: {
342343
let child = emptyText();
343344
if (Array.isArray(value) && value.length > 0) {
344345
const flags = getFlagsList(value as string[]);
@@ -485,6 +486,16 @@ export const RecordField: React.FC<RecordFieldProps> = ({
485486
simpleTextWithTooltip(detailed ? `${String(value)} ${c.name.toLowerCase()} ${t('sent')}` : String(value))
486487
);
487488
}
489+
case ColumnsId.dropbytes:
490+
case ColumnsId.droppackets:
491+
const droppedText = t('dropped');
492+
const droppedCount = String(value);
493+
return singleContainer(
494+
simpleTextWithTooltip(
495+
detailed ? `${droppedCount} ${c.name.toLowerCase()} ${droppedText}` : droppedCount,
496+
isDark ? '#C9190B' : '#A30000'
497+
)
498+
);
488499
case ColumnsId.dnsid: {
489500
return singleContainer(
490501
typeof value === 'number' && !isNaN(value) ? simpleTextWithTooltip(String(value)) : emptyDnsErrorText()

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,15 @@ export const RecordPanel: React.FC<RecordDrawerProps> = ({
7979

8080
// hide empty columns
8181
const getVisibleColumns = React.useCallback(() => {
82-
const forbiddenColumns = [ColumnsId.ifdirs, ColumnsId.interfaces];
82+
const forbiddenColumns = [
83+
ColumnsId.ifdirs,
84+
ColumnsId.interfaces,
85+
ColumnsId.dropbytes,
86+
ColumnsId.droppackets,
87+
ColumnsId.dropstate,
88+
ColumnsId.dropcause,
89+
ColumnsId.dropflags
90+
];
8391
return columns.filter((c: Column) => {
8492
if (!c.fieldValue) {
8593
return false;

web/src/utils/columns.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ export enum ColumnsId {
4444
tcpflags = 'TCPFlags',
4545
bytes = 'Bytes',
4646
packets = 'Packets',
47+
dropbytes = 'PktDropBytes',
48+
droppackets = 'PktDropPackets',
49+
dropstate = 'PktDropLatestState',
50+
dropcause = 'PktDropLatestDropCause',
51+
dropflags = 'PktDropLatestFlags',
4752
owner = 'K8S_OwnerName',
4853
srcowner = 'SrcK8S_OwnerName',
4954
dstowner = 'DstK8S_OwnerName',

0 commit comments

Comments
 (0)