diff options
| -rw-r--r-- | sos/plugins/kernel.py | 4 | ||||
| -rw-r--r-- | sos/plugins/networking.py | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py index 5c852143..8224e5c0 100644 --- a/sos/plugins/kernel.py +++ b/sos/plugins/kernel.py @@ -143,10 +143,6 @@ class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): if not self.get_option("trace"): self.add_forbidden_path("/sys/kernel/debug/tracing/trace") - # collect list of bpf program attachments in the kernel - # networking subsystem - self.add_cmd_output("bpftool net list") - # collect list of eBPF programs and maps and their dumps prog_file = self.exec_cmd("bpftool -j prog list") for prog_id in self.get_bpftool_prog_ids(prog_file): diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py index 2f655042..0026cda9 100644 --- a/sos/plugins/networking.py +++ b/sos/plugins/networking.py @@ -191,6 +191,10 @@ class Networking(Plugin): if self.get_option("traceroute"): self.add_cmd_output("/bin/traceroute -n %s" % self.trace_host) + # collect list of bpf program attachments in the kernel + # networking subsystem + self.add_cmd_output("bpftool net list") + # Capture additional data from namespaces; each command is run # per-namespace. ip_netns = self.exec_cmd("ip netns") @@ -212,7 +216,8 @@ class Networking(Plugin): ns_cmd_prefix + "iptables-save", ns_cmd_prefix + "netstat %s -neopa" % self.ns_wide, ns_cmd_prefix + "netstat -s", - ns_cmd_prefix + "netstat %s -agn" % self.ns_wide + ns_cmd_prefix + "netstat %s -agn" % self.ns_wide, + ns_cmd_prefix + "bpftool net list", ]) ss_cmd = ns_cmd_prefix + "ss -peaonmi" |