[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 <jhunsake@redhat.com>

sos/report/plugins/conntrackd.py → 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 :