diff -Nru sosreport-4.0/debian/changelog sosreport-4.0/debian/changelog --- sosreport-4.0/debian/changelog 2020-09-21 11:47:11.000000000 -0300 +++ sosreport-4.0/debian/changelog 2020-11-23 15:10:12.000000000 -0300 @@ -1,3 +1,20 @@ +sosreport (4.0-1ubuntu2.1) groovy; urgency=medium + + [Hemanth Nakkina] + * d/p/0008-conntrack-add-conntrack-info.patch: rename the + conntrackd plugin to conntrack; add conntrack commands. + (LP: #1898077) + + [Mauricio Oliveira] + * d/p/0009-conntrack-gather-per-namespace-data.patch: add + conntrack commands for network namespaces. + + [Edward Hope-Morley] + * d/p/0010-networking-include-ns-ip-neigh-and-ip-rule-info.patch: + add ip neigh and ip rule commands for network namespaces. + + -- Mauricio Faria de Oliveira Mon, 23 Nov 2020 15:10:12 -0300 + sosreport (4.0-1ubuntu2) groovy; urgency=medium [Nicolas Bock] diff -Nru sosreport-4.0/debian/patches/0008-conntrack-add-conntrack-info.patch sosreport-4.0/debian/patches/0008-conntrack-add-conntrack-info.patch --- sosreport-4.0/debian/patches/0008-conntrack-add-conntrack-info.patch 1969-12-31 21:00:00.000000000 -0300 +++ sosreport-4.0/debian/patches/0008-conntrack-add-conntrack-info.patch 2020-11-23 15:10:12.000000000 -0300 @@ -0,0 +1,61 @@ +Origin: upstream, https://github.com/sosreport/sos/commit/e6af5287b6bde901690c58090f958960a536660a +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1898077 +From: Hemanth Nakkina +Date: Sun, 27 Sep 2020 02:28:11 +0000 +Subject: [PATCH] [conntrack] add conntrack info + +The plugin conntrackd is renamed to conntrack. Added the following +conntrack commands to the plugin. +conntrack -L -o extended +conntrack -S + +Closes: #2049 +Resolves: #2251 + +Signed-off-by: Hemanth Nakkina hemanth.nakkina@canonical.com +Signed-off-by: Jake Hunsaker +--- + .../plugins/{conntrackd.py => conntrack.py} | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + rename sos/report/plugins/{conntrackd.py => conntrack.py} (70%) + +diff --git a/sos/report/plugins/conntrackd.py b/sos/report/plugins/conntrack.py +similarity index 70% +rename from sos/report/plugins/conntrackd.py +rename to sos/report/plugins/conntrack.py +index 0244c9c63..79fc28096 100644 +--- a/sos/report/plugins/conntrackd.py ++++ b/sos/report/plugins/conntrack.py +@@ -11,16 +11,17 @@ + UbuntuPlugin, SuSEPlugin) + + +-class Conntrackd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, SuSEPlugin): ++class Conntrack(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, SuSEPlugin): + +- short_desc = 'conntrackd - netfilter connection tracking user-space daemon' ++ short_desc = 'conntrack - netfilter connection tracking' + +- plugin_name = 'conntrackd' ++ plugin_name = 'conntrack' + profiles = ('network', 'cluster') + +- packages = ('conntrack-tools', 'conntrackd') ++ packages = ('conntrack-tools', 'conntrack', 'conntrackd') + + def setup(self): ++ # Collect info from conntrackd + self.add_copy_spec("/etc/conntrackd/conntrackd.conf") + self.add_cmd_output([ + "conntrackd -s network", +@@ -33,4 +34,10 @@ def setup(self): + "conntrackd -s expect", + ]) + ++ # Collect info from conntrack ++ self.add_cmd_output([ ++ "conntrack -L -o extended", ++ "conntrack -S", ++ ]) ++ + # vim: set et ts=4 sw=4 : diff -Nru sosreport-4.0/debian/patches/0009-conntrack-gather-per-namespace-data.patch sosreport-4.0/debian/patches/0009-conntrack-gather-per-namespace-data.patch --- sosreport-4.0/debian/patches/0009-conntrack-gather-per-namespace-data.patch 1969-12-31 21:00:00.000000000 -0300 +++ sosreport-4.0/debian/patches/0009-conntrack-gather-per-namespace-data.patch 2020-11-23 15:10:12.000000000 -0300 @@ -0,0 +1,91 @@ +Origin: upstream, https://github.com/sosreport/sos/commit/ef6e1bd537a9da2c0368b15988755bc4412b39e8 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1898077 +From ef6e1bd537a9da2c0368b15988755bc4412b39e8 Mon Sep 17 00:00:00 2001 +From: Mauricio Faria de Oliveira +Date: Wed, 11 Nov 2020 23:52:51 +0000 +Subject: [PATCH] [conntrack] gather per-namespace data + +Run conntrack commands per-namespace, as the ebpf/networking plugins: + +Test-case: +``` + # ip netns + ns3 + ns2 + ns1 +``` + +Before: +``` + # ./bin/sos report -o conntrack,ebpf,networking --batch + + # tar tf /tmp/sosreport-*.tar.xz | grep ip_netns_exec + .../sos_commands/ebpf/ip_netns_exec_ns1_bpftool_net_list + .../sos_commands/ebpf/ip_netns_exec_ns2_bpftool_net_list + .../sos_commands/ebpf/ip_netns_exec_ns3_bpftool_net_list + ... + .../sos_commands/networking/ip_netns_exec_ns1_ip_address_show + ... + .../sos_commands/networking/ip_netns_exec_ns2_ip_address_show + ... + .../sos_commands/networking/ip_netns_exec_ns3_ip_address_show + ... +``` + +After: + +``` + # ./bin/sos report -o conntrack,ebpf,networking --batch + + # tar tf /tmp/sosreport-*.tar.xz | grep ip_netns_exec + .../sos_commands/conntrack/ip_netns_exec_ns1_conntrack_-L_-o_extended + .../sos_commands/conntrack/ip_netns_exec_ns1_conntrack_-S + .../sos_commands/conntrack/ip_netns_exec_ns2_conntrack_-L_-o_extended + .../sos_commands/conntrack/ip_netns_exec_ns2_conntrack_-S + .../sos_commands/conntrack/ip_netns_exec_ns3_conntrack_-L_-o_extended + .../sos_commands/conntrack/ip_netns_exec_ns3_conntrack_-S + .../sos_commands/ebpf/ip_netns_exec_ns1_bpftool_net_list + .../sos_commands/ebpf/ip_netns_exec_ns2_bpftool_net_list + .../sos_commands/ebpf/ip_netns_exec_ns3_bpftool_net_list + ... + .../sos_commands/networking/ip_netns_exec_ns1_ip_address_show + ... + .../sos_commands/networking/ip_netns_exec_ns2_ip_address_show + ... + .../sos_commands/networking/ip_netns_exec_ns3_ip_address_show + ... +``` + +Signed-off-by: Mauricio Faria de Oliveira +Signed-off-by: Jake Hunsaker +--- + sos/report/plugins/conntrack.py | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/sos/report/plugins/conntrack.py b/sos/report/plugins/conntrack.py +index 80de3125a..be7e41d8d 100644 +--- a/sos/report/plugins/conntrack.py ++++ b/sos/report/plugins/conntrack.py +@@ -40,4 +40,22 @@ def setup(self): + "conntrack -S", + ]) + ++ # Capture additional data from namespaces; each command is run ++ # per-namespace ++ ip_netns = self.exec_cmd("ip netns") ++ cmd_prefix = "ip netns exec " ++ if ip_netns['status'] == 0: ++ out_ns = [] ++ for line in ip_netns['output'].splitlines(): ++ # If there's no namespaces, no need to continue ++ if line.startswith("Object \"netns\" is unknown") \ ++ or line.isspace() \ ++ or line[:1].isspace(): ++ continue ++ out_ns.append(line.partition(' ')[0]) ++ for namespace in out_ns: ++ ns_cmd_prefix = cmd_prefix + namespace + " " ++ self.add_cmd_output(ns_cmd_prefix + "conntrack -L -o extended") ++ self.add_cmd_output(ns_cmd_prefix + "conntrack -S") ++ + # vim: set et ts=4 sw=4 : diff -Nru sosreport-4.0/debian/patches/0010-networking-include-ns-ip-neigh-and-ip-rule-info.patch sosreport-4.0/debian/patches/0010-networking-include-ns-ip-neigh-and-ip-rule-info.patch --- sosreport-4.0/debian/patches/0010-networking-include-ns-ip-neigh-and-ip-rule-info.patch 1969-12-31 21:00:00.000000000 -0300 +++ sosreport-4.0/debian/patches/0010-networking-include-ns-ip-neigh-and-ip-rule-info.patch 2020-11-23 15:10:12.000000000 -0300 @@ -0,0 +1,29 @@ +Origin: backport, https://github.com/sosreport/sos/commit/0c5b4c15f880b1e96ac70ced1de2d7d4f989c19e +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1901555 +From 0c5b4c15f880b1e96ac70ced1de2d7d4f989c19e Mon Sep 17 00:00:00 2001 +From: Edward Hope-Morley +Date: Sat, 24 Oct 2020 14:50:06 +0100 +Subject: [PATCH] [networking] Include ns ip neigh and ip rule info + +Resolves: #2282 +Closes: #2281 + +Signed-off-by: Edward Hope-Morley +Signed-off-by: Jake Hunsaker +--- + sos/report/plugins/networking.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sos/report/plugins/networking.py b/sos/report/plugins/networking.py +index 3d9aa149f..af73ffe63 100644 +--- a/sos/report/plugins/networking.py ++++ b/sos/report/plugins/networking.py +@@ -268,6 +268,8 @@ def setup(self): + self.add_cmd_output([ + ns_cmd_prefix + "ip address show", + ns_cmd_prefix + "ip route show table all", ++ ns_cmd_prefix + "ip -s -s neigh show", ++ ns_cmd_prefix + "ip rule list", + ns_cmd_prefix + "iptables-save", + ns_cmd_prefix + "netstat %s -neopa" % self.ns_wide, + ns_cmd_prefix + "netstat -s", diff -Nru sosreport-4.0/debian/patches/series sosreport-4.0/debian/patches/series --- sosreport-4.0/debian/patches/series 2020-09-21 11:43:40.000000000 -0300 +++ sosreport-4.0/debian/patches/series 2020-11-23 15:10:12.000000000 -0300 @@ -5,3 +5,6 @@ 0005-ceph-collect-balancer-and-pg-autoscale-status.patch 0006-rabbitmq-add-info-on-maybe-stuck-processes.patch 0007-rabbitmq-add-10sec-timeout-to-call-to-maybestuck.patch +0008-conntrack-add-conntrack-info.patch +0009-conntrack-gather-per-namespace-data.patch +0010-networking-include-ns-ip-neigh-and-ip-rule-info.patch