Skip to content

Commit a593dd9

Browse files
authored
Fix update config script (#1132)
* fix update config script * fix column number
1 parent cabe8c5 commit a593dd9

File tree

3 files changed

+50
-25
lines changed

3 files changed

+50
-25
lines changed

config/sample-config.yaml

Lines changed: 48 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,9 @@ frontend:
335335
tooltip: Network name, such as Secondary network or UDN.
336336
field: SrcK8S_NetworkName
337337
filter: src_network
338-
default: false
338+
default: true
339339
width: 15
340+
feature: multiNetworks
340341
- id: DstK8S_Name
341342
group: Destination
342343
name: Name
@@ -475,8 +476,9 @@ frontend:
475476
tooltip: Network name, such as Secondary network or UDN.
476477
field: DstK8S_NetworkName
477478
filter: dst_network
478-
default: false
479+
default: true
479480
width: 15
481+
feature: multiNetworks
480482
- id: K8S_Name
481483
name: Names
482484
calculated: '[SrcK8S_Name,DstK8S_Name]'
@@ -587,7 +589,7 @@ frontend:
587589
width: 10
588590
- id: TCPFlags
589591
name: TCP Flags
590-
tooltip: Logical OR combination of unique TCP flags comprised in the flow, as per RFC-9293, with additional custom values.
592+
tooltip: Logical OR combination of unique TCP flags comprised in the flow, according to RFC-9293, with additional custom values.
591593
field: Flags
592594
filter: tcp_flags
593595
default: false
@@ -618,7 +620,7 @@ frontend:
618620
tooltip: The list of User Defined Networks.
619621
field: Udns
620622
filter: udns
621-
default: true
623+
default: false
622624
width: 15
623625
feature: udnMapping
624626
- id: FlowDirInts
@@ -643,7 +645,6 @@ frontend:
643645
fields:
644646
- Packets
645647
- PktDropPackets
646-
filter: pkt_drop_cause
647648
default: true
648649
width: 5
649650
- id: FlowDuration
@@ -683,13 +684,15 @@ frontend:
683684
name: Drop State
684685
tooltip: TCP state on last dropped packet.
685686
field: PktDropLatestState
687+
filter: pkt_drop_state
686688
default: false
687689
width: 10
688690
feature: pktDrop
689691
- id: PktDropLatestDropCause
690692
name: Drop Cause
691693
tooltip: TCP state on last dropped packet.
692694
field: PktDropLatestDropCause
695+
filter: pkt_drop_cause
693696
default: false
694697
width: 10
695698
feature: pktDrop
@@ -826,6 +829,14 @@ frontend:
826829
default: false
827830
width: 15
828831
feature: packetTranslation
832+
- id: IPSecStatus
833+
name: IPsec Status
834+
tooltip: Status of the IPsec encryption (on egress, provided by the kernel function xfrm_output) or decryption (on ingress, via xfrm_input).
835+
field: IPSecStatus
836+
filter: ipsec_status
837+
default: true
838+
width: 10
839+
feature: ipsec
829840
filters:
830841
- id: cluster_name
831842
name: Cluster
@@ -1124,7 +1135,7 @@ frontend:
11241135
component: autocomplete
11251136
hint: Specify a TCP flags value.
11261137
examples: |-
1127-
Logical OR combination of unique TCP flags comprised in the flow, as per RFC-9293, with additional custom flags (SYN_ACK, FIN_ACK and RST_ACK).
1138+
Logical OR combination of unique TCP flags comprised in the flow, according to RFC-9293, with additional custom flags (SYN_ACK, FIN_ACK and RST_ACK).
11281139
- id: node_direction
11291140
name: Node Direction
11301141
component: autocomplete
@@ -1211,28 +1222,34 @@ frontend:
12111222
name: Xlat Zone Id
12121223
component: number
12131224
- id: xlat_src_address
1214-
name: Xlat src address
1225+
name: Xlat source address
12151226
component: text
12161227
category: source
12171228
hint: Specify a single IP or range.
12181229
- id: xlat_dst_address
1219-
name: Xlat dst address
1230+
name: Xlat destination address
12201231
component: text
12211232
category: destination
12221233
hint: Specify a single IP or range.
12231234
- id: xlat_src_port
1224-
name: Xlat src port
1235+
name: Xlat source port
12251236
component: autocomplete
12261237
category: source
12271238
hint: Specify a single port number or name.
12281239
- id: xlat_dst_port
1229-
name: Xlat dst port
1240+
name: Xlat destination port
12301241
component: autocomplete
12311242
category: destination
12321243
hint: Specify a single port number or name.
1244+
- id: ipsec_status
1245+
name: IPsec Status
1246+
component: text
1247+
placeholder: 'E.g: success, error'
1248+
hint: Status of the IPsec encryption (on egress, provided by the kernel function xfrm_output) or decryption (on ingress, via xfrm_input).
12331249
scopes:
12341250
- id: cluster
12351251
name: Cluster
1252+
shortName: Cl
12361253
description: Cluster name or identifier
12371254
labels:
12381255
- K8S_ClusterName
@@ -1246,13 +1263,14 @@ frontend:
12461263
labels:
12471264
- SrcK8S_NetworkName
12481265
- DstK8S_NetworkName
1249-
feature: udnMapping
1266+
feature: multiNetworks
12501267
filters:
12511268
- src_network
12521269
- dst_network
12531270
stepInto: namespace
12541271
- id: zone
12551272
name: Zone
1273+
shortName: AZ
12561274
description: Availability zone
12571275
labels:
12581276
- SrcK8S_Zone
@@ -1284,6 +1302,7 @@ frontend:
12841302
stepInto: resource
12851303
- id: namespace
12861304
name: Namespace
1305+
shortName: NS
12871306
description: Resource namespace
12881307
labels:
12891308
- SrcK8S_Namespace
@@ -1304,6 +1323,7 @@ frontend:
13041323
stepInto: owner
13051324
- id: owner
13061325
name: Owner
1326+
shortName: Own
13071327
description: Controller owner, such as a Deployment
13081328
labels:
13091329
- SrcK8S_OwnerName
@@ -1312,6 +1332,8 @@ frontend:
13121332
- DstK8S_OwnerType
13131333
- SrcK8S_Namespace
13141334
- DstK8S_Namespace
1335+
- SrcSubnetLabel
1336+
- DstSubnetLabel
13151337
groups:
13161338
- clusters
13171339
- clusters+zones
@@ -1333,6 +1355,7 @@ frontend:
13331355
stepInto: resource
13341356
- id: resource
13351357
name: Resource
1358+
shortName: Res
13361359
description: Base resource, such as a Pod, a Service or a Node
13371360
labels:
13381361
- SrcK8S_Name
@@ -1342,13 +1365,15 @@ frontend:
13421365
- SrcK8S_Namespace
13431366
- SrcAddr
13441367
- SrcK8S_HostName
1368+
- SrcSubnetLabel
13451369
- DstK8S_Name
13461370
- DstK8S_Type
13471371
- DstK8S_OwnerName
13481372
- DstK8S_OwnerType
13491373
- DstK8S_Namespace
13501374
- DstAddr
13511375
- DstK8S_HostName
1376+
- DstSubnetLabel
13521377
groups:
13531378
- clusters
13541379
- clusters+zones
@@ -1505,7 +1530,7 @@ frontend:
15051530
- name: Flags
15061531
type: string[]
15071532
description: |
1508-
List of TCP flags comprised in the flow, as per RFC-9293, with additional custom flags to represent the following per-packet combinations: +
1533+
List of TCP flags comprised in the flow, according to RFC-9293, with additional custom flags to represent the following per-packet combinations: +
15091534
- SYN_ACK +
15101535
- FIN_ACK +
15111536
- RST_ACK
@@ -1524,21 +1549,18 @@ frontend:
15241549
- name: PktDropLatestState
15251550
type: string
15261551
description: TCP state on last dropped packet
1527-
filter: pkt_drop_state # couldn't guess from config
15281552
- name: PktDropLatestDropCause
15291553
type: string
15301554
description: Latest drop cause
1531-
filter: pkt_drop_cause # couldn't guess from config
15321555
- name: PktDropLatestFlags
15331556
type: number
15341557
description: TCP flags on last dropped packet
15351558
- name: DnsId
15361559
type: number
15371560
description: DNS record id
1538-
- id: dns_name
1539-
name: DNS Name
1540-
component: text
1541-
hint: Specify a single DNS name.
1561+
- name: DnsName
1562+
type: string
1563+
description: DNS queried name
15421564
- name: DnsLatencyMs
15431565
type: number
15441566
description: Time between a DNS request and response, in milliseconds
@@ -1570,22 +1592,25 @@ frontend:
15701592
description: packet translation zone id
15711593
- name: XlatSrcPort
15721594
type: number
1573-
description: packet translation src port
1595+
description: packet translation source port
15741596
- name: XlatDstPort
15751597
type: number
1576-
description: packet translation dst port
1598+
description: packet translation destination port
15771599
- name: XlatSrcAddr
15781600
type: string
1579-
description: packet translation src address
1601+
description: packet translation source address
15801602
- name: XlatDstAddr
15811603
type: string
1582-
description: packet translation dst address
1604+
description: packet translation destination address
15831605
- name: K8S_ClusterName
15841606
type: string
15851607
description: Cluster name or identifier
1608+
- name: IPSecStatus
1609+
type: string
1610+
description: Status of the IPsec encryption (on egress, given by the kernel xfrm_output function) or decryption (on ingress, via xfrm_input)
15861611
- name: _RecordType
15871612
type: string
1588-
description: "Type of record: 'flowLog' for regular flow logs, or 'newConnection', 'heartbeat', 'endConnection' for conversation tracking"
1613+
description: "Type of record: `flowLog` for regular flow logs, or `newConnection`, `heartbeat`, `endConnection` for conversation tracking"
15891614
- name: _HashId
15901615
type: string
15911616
description: In conversation tracking, the conversation identifier

scripts/update-config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
echo "Downloading config from controller repo..."
22
mkdir -p ./tmp
3-
curl -o ./tmp/config.yaml https://raw.githubusercontent.com/netobserv/network-observability-operator/main/controllers/consoleplugin/config/static-frontend-config.yaml
3+
curl -o ./tmp/config.yaml https://raw.githubusercontent.com/netobserv/network-observability-operator/refs/heads/main/internal/controller/consoleplugin/config/static-frontend-config.yaml
44

55
echo "Updating sample-config.yaml..."
66
echo " - columns..."

web/cypress/support/const.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ export const defaultPanelsCount = 2;
1111

1212
// table specific config
1313
export const availableColumnGroupCount = 31;
14-
export const availableColumnCount = 59;
14+
export const availableColumnCount = 57;
1515
export const defaultColumnGroupCount = 6;
1616
export const defaultColumnCount = 11;

0 commit comments

Comments
 (0)