Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(iftop): add iftop-scanning #484

Merged
merged 16 commits into from
Dec 8, 2023
Merged

feat(iftop): add iftop-scanning #484

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f597fb3
feat(iftop): add iftop-scanning
georgettica Nov 20, 2023
a088056
fix typos and test first regex
georgettica Nov 23, 2023
0ef9ed2
add more iftop fun
georgettica Nov 30, 2023
9cde53b
Update iftop.py
georgettica Nov 30, 2023
c13c211
add tests and json
georgettica Dec 4, 2023
338c4a0
feat: make work and add tests
georgettica Dec 4, 2023
0660f74
add completion
georgettica Dec 4, 2023
e0a85e9
change schema for query looping
georgettica Dec 4, 2023
163b8e4
fix: tests
georgettica Dec 5, 2023
43b040c
fix review comments
georgettica Dec 5, 2023
9320705
feat: add byte parsing
georgettica Dec 5, 2023
45d1663
add no-port to options
georgettica Dec 5, 2023
7a2fb31
remove completion and format dep
georgettica Dec 6, 2023
8962554
Update setup.py
georgettica Dec 6, 2023
a130ce0
Update iftop.py
georgettica Dec 7, 2023
a2adf26
Merge branch 'dev' into georgettica/feature/iftop
kellyjonbrazil Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
622 changes: 622 additions & 0 deletions jc/parsers/iftop.py
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions tests/fixtures/ubuntu-20.10/iftop-b-n1-noport.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[
{
"device": "enp0s3",
"ip_address": "10.10.15.129",
"mac_address": "08:00:27:c0:4a:4f",
"total_send_rate": {
"last_2s": 4820,
"last_10s": 4820,
"last_40s": 4820
},
"total_receive_rate": {
"last_2s": 16600,
"last_10s": 16600,
"last_40s": 16600
},
"total_send_and_receive_rate": {
"last_2s": 21400,
"last_10s": 21400,
"last_40s": 21400
},
"peak_rate": {
"last_2s": 4820,
"last_10s": 16600,
"last_40s": 21400
},
"cumulative_rate": {
"last_2s": 9630,
"last_10s": 33100,
"last_40s": 42800
},
"clients": []
}
]
18 changes: 18 additions & 0 deletions tests/fixtures/ubuntu-20.10/iftop-b-n1-noport.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
interface: enp0s3
IP address is: 10.10.15.129
MAC address is: 08:00:27:c0:4a:4f
Listening on enp0s3
# Host name (port/service if enabled) last 2s last 10s last 40s cumulative
--------------------------------------------------------------------------------------------
1 ubuntu-2004-clean-01 => 4.82KB 4.82KB 4.82KB 9.63KB
10.10.15.72 <= 14.5KB 14.5KB 14.5KB 29.1KB
2 ubuntu-2004-clean-02 => 0B 0B 0B 0B
10.10.15.72 <= 2.02KB 2.02KB 2.02KB 4.04KB
--------------------------------------------------------------------------------------------
Total send rate: 4.82KB 4.82KB 4.82KB
Total receive rate: 16.6KB 16.6KB 16.6KB
Total send and receive rate: 21.4KB 21.4KB 21.4KB
--------------------------------------------------------------------------------------------
Peak rate (sent/received/total): 4.82KB 16.6KB 21.4KB
Cumulative (sent/received/total): 9.63KB 33.1KB 42.8KB
============================================================================================
57 changes: 57 additions & 0 deletions tests/fixtures/ubuntu-20.10/iftop-b-n1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
[
{
"device": "enp0s3",
"ip_address": "10.10.15.129",
"mac_address": "08:00:27:c0:4a:4f",
"clients": [
{
"index": 1,
"connections": [
{
"host_name": "ubuntu-2004-clean-01",
"host_port": "ssh",
"last_2s": 448,
"last_10s": 448,
"last_40s": 448,
"cumulative": 112,
"direction": "send"
},
{
"host_name": "10.10.15.72",
"host_port": "40876",
"last_2s": 208,
"last_10s": 208,
"last_40s": 208,
"cumulative": 52,
"direction": "receive"
}
]
}
],
"total_send_rate": {
"last_2s": 448,
"last_10s": 448,
"last_40s": 448
},
"total_receive_rate": {
"last_2s": 208,
"last_10s": 208,
"last_40s": 208
},
"total_send_and_receive_rate": {
"last_2s": 656,
"last_10s": 656,
"last_40s": 656
},
"peak_rate": {
"last_2s": 448,
"last_10s": 208,
"last_40s": 656
},
"cumulative_rate": {
"last_2s": 112,
"last_10s": 52,
"last_40s": 164
}
}
]
16 changes: 16 additions & 0 deletions tests/fixtures/ubuntu-20.10/iftop-b-n1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
interface: enp0s3
IP address is: 10.10.15.129
MAC address is: 08:00:27:c0:4a:4f
Listening on enp0s3
# Host name (port/service if enabled) last 2s last 10s last 40s cumulative
--------------------------------------------------------------------------------------------
1 ubuntu-2004-clean-01:ssh => 448b 448b 448b 112B
10.10.15.72:40876 <= 208b 208b 208b 52B
--------------------------------------------------------------------------------------------
Total send rate: 448b 448b 448b
Total receive rate: 208b 208b 208b
Total send and receive rate: 656b 656b 656b
--------------------------------------------------------------------------------------------
Peak rate (sent/received/total): 448b 208b 656b
Cumulative (sent/received/total): 112B 52B 164B
============================================================================================
236 changes: 236 additions & 0 deletions tests/fixtures/ubuntu-20.10/iftop-b-n3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
[
{
"device": "enp0s3",
"ip_address": "10.10.15.129",
"mac_address": "08:00:27:c0:4a:4f",
"total_send_rate": {
"last_2s": 23200000,
"last_10s": 23200000,
"last_40s": 23200000
},
"total_receive_rate": {
"last_2s": 5650000,
"last_10s": 5650000,
"last_40s": 5650000
},
"total_send_and_receive_rate": {
"last_2s": 28800000,
"last_10s": 28800000,
"last_40s": 28800000
},
"peak_rate": {
"last_2s": 23200000,
"last_10s": 5650000,
"last_40s": 28800000
},
"cumulative_rate": {
"last_2s": 5790000,
"last_10s": 1410000,
"last_40s": 7200000
},
"clients": [
{
"index": 1,
"connections": [
{
"host_name": "ubuntu-2004-clean-01",
"host_port": "33222",
"last_2s": 4720,
"last_10s": 4720,
"last_40s": 4720,
"cumulative": 1180,
"direction": "send"
},
{
"host_name": "10.10.15.72",
"host_port": "https",
"last_2s": 1990000,
"last_10s": 1990000,
"last_40s": 1990000,
"cumulative": 508000,
"direction": "receive"
}
]
},
{
"index": 2,
"connections": [
{
"host_name": "ubuntu-2004-clean-01",
"host_port": "https",
"last_2s": 1980000,
"last_10s": 1980000,
"last_40s": 1980000,
"cumulative": 507000,
"direction": "send"
},
{
"host_name": "10.10.15.73",
"host_port": "34562",
"last_2s": 3170,
"last_10s": 3170,
"last_40s": 3170,
"cumulative": 811,
"direction": "receive"
}
]
}
]
},
{
"device": "enp0s3",
"ip_address": "10.10.15.129",
"mac_address": "08:00:27:c0:4a:4f",
"total_send_rate": {
"last_2s": 23200000,
"last_10s": 23200000,
"last_40s": 23200000
},
"total_receive_rate": {
"last_2s": 5650000,
"last_10s": 5650000,
"last_40s": 5650000
},
"total_send_and_receive_rate": {
"last_2s": 28800000,
"last_10s": 28800000,
"last_40s": 28800000
},
"peak_rate": {
"last_2s": 23200000,
"last_10s": 5650000,
"last_40s": 28800000
},
"cumulative_rate": {
"last_2s": 5790000,
"last_10s": 1410000,
"last_40s": 7200000
},
"clients": [
{
"index": 1,
"connections": [
{
"host_name": "ubuntu-2004-clean-01",
"host_port": "33222",
"last_2s": 4720,
"last_10s": 4720,
"last_40s": 4720,
"cumulative": 1180,
"direction": "send"
},
{
"host_name": "10.10.15.72",
"host_port": "https",
"last_2s": 1990000,
"last_10s": 1990000,
"last_40s": 1990000,
"cumulative": 508000,
"direction": "receive"
}
]
},
{
"index": 2,
"connections": [
{
"host_name": "ubuntu-2004-clean-01",
"host_port": "https",
"last_2s": 1980000,
"last_10s": 1980000,
"last_40s": 1980000,
"cumulative": 507000,
"direction": "send"
},
{
"host_name": "10.10.15.73",
"host_port": "34562",
"last_2s": 3170,
"last_10s": 3170,
"last_40s": 3170,
"cumulative": 811,
"direction": "receive"
}
]
}
]
},
{
"device": "enp0s3",
"ip_address": "10.10.15.129",
"mac_address": "08:00:27:c0:4a:4f",
"total_send_rate": {
"last_2s": 23200000,
"last_10s": 23200000,
"last_40s": 23200000
},
"total_receive_rate": {
"last_2s": 5650000,
"last_10s": 5650000,
"last_40s": 5650000
},
"total_send_and_receive_rate": {
"last_2s": 28800000,
"last_10s": 28800000,
"last_40s": 28800000
},
"peak_rate": {
"last_2s": 23200000,
"last_10s": 5650000,
"last_40s": 28800000
},
"cumulative_rate": {
"last_2s": 5790000,
"last_10s": 1410000,
"last_40s": 7200000
},
"clients": [
{
"index": 1,
"connections": [
{
"host_name": "ubuntu-2004-clean-01",
"host_port": "33222",
"last_2s": 4720,
"last_10s": 4720,
"last_40s": 4720,
"cumulative": 1180,
"direction": "send"
},
{
"host_name": "10.10.15.72",
"host_port": "https",
"last_2s": 1990000,
"last_10s": 1990000,
"last_40s": 1990000,
"cumulative": 508000,
"direction": "receive"
}
]
},
{
"index": 2,
"connections": [
{
"host_name": "ubuntu-2004-clean-01",
"host_port": "https",
"last_2s": 1980000,
"last_10s": 1980000,
"last_40s": 1980000,
"cumulative": 507000,
"direction": "send"
},
{
"host_name": "10.10.15.73",
"host_port": "34562",
"last_2s": 3170,
"last_10s": 3170,
"last_40s": 3170,
"cumulative": 811,
"direction": "receive"
}
]
}
]
}
]
Loading