diff -Nru sosreport-4.0/debian/changelog sosreport-4.0/debian/changelog --- sosreport-4.0/debian/changelog 2020-09-21 20:17:11.000000000 +0530 +++ sosreport-4.0/debian/changelog 2020-10-21 11:15:55.000000000 +0530 @@ -1,3 +1,11 @@ +sosreport (4.0-1ubuntu3) groovy; urgency=medium + + * d/p/0008-add-conntrack-info.patch + - Rename conntrackd plugin to conntrack and add conntrack + commands to the plugin (LP: #1898077) + + -- Hemanth Nakkina Wed, 21 Oct 2020 11:15:55 +0530 + sosreport (4.0-1ubuntu2) groovy; urgency=medium [Nicolas Bock] diff -Nru sosreport-4.0/debian/patches/0008-add-conntrack-info.patch sosreport-4.0/debian/patches/0008-add-conntrack-info.patch --- sosreport-4.0/debian/patches/0008-add-conntrack-info.patch 1970-01-01 05:30:00.000000000 +0530 +++ sosreport-4.0/debian/patches/0008-add-conntrack-info.patch 2020-10-21 11:15:41.000000000 +0530 @@ -0,0 +1,63 @@ +From e6af5287b6bde901690c58090f958960a536660a Mon Sep 17 00:00:00 2001 +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 0244c9c6..79fc2809 100644 +--- a/sos/report/plugins/conntrackd.py ++++ b/sos/report/plugins/conntrack.py +@@ -11,16 +11,17 @@ from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, + 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 @@ class Conntrackd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, SuSEPlugin): + "conntrackd -s expect", + ]) + ++ # Collect info from conntrack ++ self.add_cmd_output([ ++ "conntrack -L -o extended", ++ "conntrack -S", ++ ]) ++ + # vim: set et ts=4 sw=4 : +-- +2.17.1 + diff -Nru sosreport-4.0/debian/patches/series sosreport-4.0/debian/patches/series --- sosreport-4.0/debian/patches/series 2020-09-21 20:13:40.000000000 +0530 +++ sosreport-4.0/debian/patches/series 2020-10-21 11:15:41.000000000 +0530 @@ -5,3 +5,4 @@ 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-add-conntrack-info.patch