Skip to content

Commit

Permalink
Display server provided flows rate
Browse files Browse the repository at this point in the history 
This change switches from reporting the calculate `Flows Per Second`
field to the more up-to-date `flowsRate` field provided by the server.

If the server doesn't provide the flows rate, we fall back to
calculating the flows per second using uptime and seen flows.

closes: #952
Signed-off-by: Fabian Fischer <fabian.fischer@isovalent.com>
  • Loading branch information
@glrf @lambdanis
glrf authored and lambdanis committed Oct 24, 2023
1 parent 8ce1b88 commit 5ed64da
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 14 deletions.
10 changes: 8 additions & 2 deletions pkg/printer/printer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,10 @@ func (p *Printer) WriteServerStatusResponse(res *observerpb.ServerStatusResponse
if n := res.GetNumUnavailableNodes(); n != nil {
numUnavailableNodes = fmt.Sprintf("%d", n.Value)
}
flowsPerSec := "N/A"
if fr := res.GetFlowsRate(); fr > 0 {
flowsPerSec = fmt.Sprintf("%.2f", fr)
}

switch p.opts.output {
case TabOutput:
Expand All @@ -833,13 +837,15 @@ func (p *Printer) WriteServerStatusResponse(res *observerpb.ServerStatusResponse
"NUM FLOWS", tab,
"MAX FLOWS", tab,
"SEEN FLOWS", tab,
"FLOWS PER SECOND", tab,
"UPTIME", tab,
"NUM CONNECTED NODES", tab,
"NUM UNAVAILABLE NODES", tab,
"VERSION", newline,
uint64Grouping(res.GetNumFlows()), tab,
uint64Grouping(res.GetMaxFlows()), tab,
uint64Grouping(res.GetSeenFlows()), tab,
flowsPerSec, tab,
formatDurationNS(res.GetUptimeNs()), tab,
numConnectedNodes, tab,
numUnavailableNodes, tab,
Expand All @@ -854,6 +860,7 @@ func (p *Printer) WriteServerStatusResponse(res *observerpb.ServerStatusResponse
" NUM FLOWS: ", uint64Grouping(res.GetNumFlows()), newline,
" MAX FLOWS: ", uint64Grouping(res.GetMaxFlows()), newline,
" SEEN FLOWS: ", uint64Grouping(res.GetSeenFlows()), newline,
" FLOWS PER SECOND: ", flowsPerSec, newline,
" UPTIME: ", formatDurationNS(res.GetUptimeNs()), newline,
"NUM CONNECTED NODES: ", numConnectedNodes, newline,
" NUM UNAVAIL. NODES: ", numUnavailableNodes, newline,
Expand All @@ -870,8 +877,7 @@ func (p *Printer) WriteServerStatusResponse(res *observerpb.ServerStatusResponse
}
ew.writef("Current/Max Flows: %v/%v%s\n", uint64Grouping(res.NumFlows), uint64Grouping(res.MaxFlows), flowsRatio)

flowsPerSec := "N/A"
if uptime := time.Duration(res.UptimeNs).Seconds(); uptime > 0 {
if uptime := time.Duration(res.UptimeNs).Seconds(); flowsPerSec == "N/A" && uptime > 0 {
flowsPerSec = fmt.Sprintf("%.2f", float64(res.SeenFlows)/uptime)
}
ew.writef("Flows/s: %s\n", flowsPerSec)
Expand Down
86 changes: 74 additions & 12 deletions pkg/printer/printer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,14 @@ Jan 1 00:20:34.567 k8s1 cilium-test/pod-to-a-denied-cnp-75cb89dfd-vqhd9 (ID
func TestPrinter_WriteServerStatusResponse(t *testing.T) {
buf := bytes.Buffer{}
ss := &observerpb.ServerStatusResponse{
NumFlows: 2031,
MaxFlows: 4095,
SeenFlows: 2348885,
FlowsRate: 23.456,
UptimeNs: 301515181665,
Version: "cilium v1.15.0+g4145278",
}
sso := &observerpb.ServerStatusResponse{
NumFlows: 2031,
MaxFlows: 4095,
SeenFlows: 2348885,
Expand All @@ -1204,8 +1212,9 @@ func TestPrinter_WriteServerStatusResponse(t *testing.T) {
NumFlows: 2771,
MaxFlows: 8190,
SeenFlows: 2771,
FlowsRate: 23.456,
UptimeNs: 301515181665,
Version: "hubble-relay v1.10.3+g4145278",
Version: "hubble-relay v1.15.0+g4145278",
NumConnectedNodes: &wrapperspb.UInt32Value{Value: 2},
NumUnavailableNodes: &wrapperspb.UInt32Value{Value: 0},
}
Expand All @@ -1228,8 +1237,8 @@ func TestPrinter_WriteServerStatusResponse(t *testing.T) {
args: args{ss},
wantErr: false,
expected: `
NUM FLOWS MAX FLOWS SEEN FLOWS UPTIME NUM CONNECTED NODES NUM UNAVAILABLE NODES VERSION
2,031 4,095 2,348,885 5m1.515181665s N/A N/A cilium v1.10.3+g4145278`,
NUM FLOWS MAX FLOWS SEEN FLOWS FLOWS PER SECOND UPTIME NUM CONNECTED NODES NUM UNAVAILABLE NODES VERSION
2,031 4,095 2,348,885 23.46 5m1.515181665s N/A N/A cilium v1.15.0+g4145278`,
}, {
name: "tabular-with-nodes",
options: []Option{
Expand All @@ -1239,8 +1248,19 @@ NUM FLOWS MAX FLOWS SEEN FLOWS UPTIME NUM CONNECTED NODES NUM
args: args{ssn},
wantErr: false,
expected: `
NUM FLOWS MAX FLOWS SEEN FLOWS UPTIME NUM CONNECTED NODES NUM UNAVAILABLE NODES VERSION
2,771 8,190 2,771 5m1.515181665s 2 0 hubble-relay v1.10.3+g4145278`,
NUM FLOWS MAX FLOWS SEEN FLOWS FLOWS PER SECOND UPTIME NUM CONNECTED NODES NUM UNAVAILABLE NODES VERSION
2,771 8,190 2,771 23.46 5m1.515181665s 2 0 hubble-relay v1.15.0+g4145278`,
}, {
name: "tabular-without-flow-rate",
options: []Option{
WithColor("never"),
Writer(&buf),
},
args: args{sso},
wantErr: false,
expected: `
NUM FLOWS MAX FLOWS SEEN FLOWS FLOWS PER SECOND UPTIME NUM CONNECTED NODES NUM UNAVAILABLE NODES VERSION
2,031 4,095 2,348,885 N/A 5m1.515181665s N/A N/A cilium v1.10.3+g4145278`,
}, {
name: "compact",
options: []Option{
Expand All @@ -1252,7 +1272,7 @@ NUM FLOWS MAX FLOWS SEEN FLOWS UPTIME NUM CONNECTED NODES NUM
wantErr: false,
expected: `
Current/Max Flows: 2,031/4,095 (49.60%)
Flows/s: 7790.27`,
Flows/s: 23.46`,
}, {
name: "compact-with-nodes",
options: []Option{
Expand All @@ -1264,8 +1284,20 @@ Flows/s: 7790.27`,
wantErr: false,
expected: `
Current/Max Flows: 2,771/8,190 (33.83%)
Flows/s: 9.19
Flows/s: 23.46
Connected Nodes: 2/2`,
}, {
name: "compact-without-flow-rate",
options: []Option{
Compact(),
WithColor("never"),
Writer(&buf),
},
args: args{sso},
wantErr: false,
expected: `
Current/Max Flows: 2,031/4,095 (49.60%)
Flows/s: 7790.27`,
}, {
name: "json",
options: []Option{
Expand All @@ -1275,7 +1307,7 @@ Connected Nodes: 2/2`,
},
args: args{ss},
wantErr: false,
expected: `{"num_flows":"2031","max_flows":"4095","seen_flows":"2348885","uptime_ns":"301515181665","version":"cilium v1.10.3+g4145278"}`,
expected: `{"num_flows":"2031","max_flows":"4095","seen_flows":"2348885","uptime_ns":"301515181665","version":"cilium v1.15.0+g4145278","flows_rate":23.456}`,
}, {
name: "json-with-nodes",
options: []Option{
Expand All @@ -1285,7 +1317,17 @@ Connected Nodes: 2/2`,
},
args: args{ssn},
wantErr: false,
expected: `{"num_flows":"2771","max_flows":"8190","seen_flows":"2771","uptime_ns":"301515181665","num_connected_nodes":2,"num_unavailable_nodes":0,"version":"hubble-relay v1.10.3+g4145278"}`,
expected: `{"num_flows":"2771","max_flows":"8190","seen_flows":"2771","uptime_ns":"301515181665","num_connected_nodes":2,"num_unavailable_nodes":0,"version":"hubble-relay v1.15.0+g4145278","flows_rate":23.456}`,
}, {
name: "json-without-flow-rate",
options: []Option{
JSONPB(),
WithColor("never"),
Writer(&buf),
},
args: args{sso},
wantErr: false,
expected: `{"num_flows":"2031","max_flows":"4095","seen_flows":"2348885","uptime_ns":"301515181665","version":"cilium v1.10.3+g4145278"}`,
}, {
name: "jsonpb",
options: []Option{
Expand All @@ -1295,7 +1337,7 @@ Connected Nodes: 2/2`,
},
args: args{ss},
wantErr: false,
expected: `{"num_flows":"2031","max_flows":"4095","seen_flows":"2348885","uptime_ns":"301515181665","version":"cilium v1.10.3+g4145278"}`,
expected: `{"num_flows":"2031","max_flows":"4095","seen_flows":"2348885","uptime_ns":"301515181665","version":"cilium v1.15.0+g4145278","flows_rate":23.456}`,
}, {
name: "dict",
options: []Option{
Expand All @@ -1309,10 +1351,11 @@ Connected Nodes: 2/2`,
NUM FLOWS: 2,031
MAX FLOWS: 4,095
SEEN FLOWS: 2,348,885
FLOWS PER SECOND: 23.46
UPTIME: 5m1.515181665s
NUM CONNECTED NODES: N/A
NUM UNAVAIL. NODES: N/A
VERSION: cilium v1.10.3+g4145278`,
VERSION: cilium v1.15.0+g4145278`,
}, {
name: "dict-with-nodes",
options: []Option{
Expand All @@ -1326,10 +1369,29 @@ NUM CONNECTED NODES: N/A
NUM FLOWS: 2,771
MAX FLOWS: 8,190
SEEN FLOWS: 2,771
FLOWS PER SECOND: 23.46
UPTIME: 5m1.515181665s
NUM CONNECTED NODES: 2
NUM UNAVAIL. NODES: 0
VERSION: hubble-relay v1.10.3+g4145278`,
VERSION: hubble-relay v1.15.0+g4145278`,
}, {
name: "dict",
options: []Option{
Dict(),
WithColor("never"),
Writer(&buf),
},
args: args{sso},
wantErr: false,
expected: `
NUM FLOWS: 2,031
MAX FLOWS: 4,095
SEEN FLOWS: 2,348,885
FLOWS PER SECOND: N/A
UPTIME: 5m1.515181665s
NUM CONNECTED NODES: N/A
NUM UNAVAIL. NODES: N/A
VERSION: cilium v1.10.3+g4145278`,
},
}
for _, tt := range tests {
Expand Down

0 comments on commit 5ed64da

Please sign in to comment.