- updates to various plugins, added additional

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@608 ef72aa8b-4018-0410-8976-d6e080ef94d8

9 files changed, 181 insertions, 1 deletions

diff --git a/src/lib/sos/plugins/acpid.py b/src/lib/sos/plugins/acpid.py
new file mode 100644
index 00000000..7e94e650
--- /dev/null
+++ b/src/lib/sos/plugins/acpid.py
@@ -0,0 +1,24 @@
+### This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sos.plugintools
+
+class acpid(sos.plugintools.PluginBase):
+    """acpid related information
+    """
+    def setup(self):
+        self.addCopySpec("/var/log/acpid*")
+        self.addCopySpec("/etc/acpi/events/power.conf")
+        return
+
diff --git a/src/lib/sos/plugins/anaconda.py b/src/lib/sos/plugins/anaconda.py
index 7e40a60d..27132fb2 100644
--- a/src/lib/sos/plugins/anaconda.py
+++ b/src/lib/sos/plugins/anaconda.py
@@ -21,7 +21,6 @@ class anaconda(sos.plugintools.PluginBase):
     def checkenabled(self):
         if os.path.exists("/var/log/anaconda.log"):
             return True
-
         return False
 
     def setup(self):
diff --git a/src/lib/sos/plugins/hardware.py b/src/lib/sos/plugins/hardware.py
index 178f35d5..7b99e063 100644
--- a/src/lib/sos/plugins/hardware.py
+++ b/src/lib/sos/plugins/hardware.py
@@ -35,6 +35,7 @@ class hardware(sos.plugintools.PluginBase):
         self.addCopySpec("/proc/dasd")
         self.addCopySpec("/proc/s390dbf/tape")
         self.addCopySpec("/sys/bus/scsi")
+        self.addCopySpec("/sys/state")
         self.collectExtOutput("/usr/share/rhn/up2date_client/hardware.py")
         self.collectExtOutput("""/bin/echo -e "lspci:\n" ; /sbin/lspci ; /bin/echo -e "\nlspci -nvv:\n" ; /sbin/lspci -nvv ; /bin/echo -e "\nlspci -tv:\n" ; /sbin/lspci -tv""", suggest_filename = "lspci", root_symlink = "lspci")
 
diff --git a/src/lib/sos/plugins/nscd.py b/src/lib/sos/plugins/nscd.py
new file mode 100644
index 00000000..ed0e2eb7
--- /dev/null
+++ b/src/lib/sos/plugins/nscd.py
@@ -0,0 +1,31 @@
+## Copyright (C) 2007 Shijoe George <spanjikk@redhat.com>
+
+### This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sos.plugintools
+from os.path import exists
+
+class nscd(sos.plugintools.PluginBase):
+    """NSCD related information
+    """
+    def checkenabled(self):
+         if self.cInfo["policy"].pkgByName("nscd") or exists("/etc/nscd.conf"):
+             return True
+         return False
+
+    def setup(self):
+        self.addCopySpec("/etc/nscd.conf")
+        return
+
diff --git a/src/lib/sos/plugins/oddjob.py b/src/lib/sos/plugins/oddjob.py
new file mode 100644
index 00000000..13e3049a
--- /dev/null
+++ b/src/lib/sos/plugins/oddjob.py
@@ -0,0 +1,31 @@
+## Copyright (C) 2007 Sadique Puthen <sputhenp@redhat.com>
+
+### This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sos.plugintools
+import os
+
+class oddjob(sos.plugintools.PluginBase):
+    """oddjob related information
+    """
+    def checkenabled(self):
+        if self.cInfo["policy"].pkgByName("oddjob") or os.path.exists("/etc/oddjobd.conf"):
+            return True
+        return False
+
+    def setup(self):
+        self.addCopySpec("/etc/oddjobd.conf")
+        self.addCopySpec("/etc/oddjobd.conf.d")
+        self.addCopySpec("/etc/dbus-1/system.d/oddjob.conf")
diff --git a/src/lib/sos/plugins/openssl.py b/src/lib/sos/plugins/openssl.py
new file mode 100644
index 00000000..6d799904
--- /dev/null
+++ b/src/lib/sos/plugins/openssl.py
@@ -0,0 +1,29 @@
+## Copyright (C) 2007 Sadique Puthen <sputhenp@redhat.com>
+
+### This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sos.plugintools
+import os
+
+class openssl(sos.plugintools.PluginBase):
+    """openssl related information
+    """
+    def checkenabled(self):
+        if self.cInfo["policy"].pkgByName("openssl") or os.path.exists("/etc/pki/tls/openssl.cnf"):
+            return True
+        return False
+
+    def setup(self):
+        self.addCopySpec("/etc/pki/tls/openssl.cnf")
diff --git a/src/lib/sos/plugins/ppp.py b/src/lib/sos/plugins/ppp.py
new file mode 100644
index 00000000..a60517e2
--- /dev/null
+++ b/src/lib/sos/plugins/ppp.py
@@ -0,0 +1,32 @@
+## Copyright (C) 2007 Sadique Puthen <sputhenp@redhat.com>
+
+### This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sos.plugintools
+import os
+
+class ppp(sos.plugintools.PluginBase):
+    """ppp, wvdial and rp-pppoe related information
+    """
+    def checkenabled(self):
+        if self.cInfo["policy"].pkgByName("ppp") or os.path.exists("/etc/wvdial.conf"):
+            return True
+        return False
+
+    def setup(self):
+        self.addCopySpec("/etc/wvdial.conf")
+        self.addCopySpec("/etc/ppp")
+        self.addCopySpec("/var/log/ppp")
+        self.collectExtOutput("/usr/sbin/adsl-status")
diff --git a/src/lib/sos/plugins/rhn.py b/src/lib/sos/plugins/rhn.py
index 817a3f5f..aa5c9d22 100644
--- a/src/lib/sos/plugins/rhn.py
+++ b/src/lib/sos/plugins/rhn.py
@@ -20,6 +20,8 @@ class rhn(sos.plugintools.PluginBase):
     satellite = False
     proxy = False
 
+    optionList = [("log", 'gathers all apache logs', 'slow', False)]
+
     def defaultenabled(self):
         return False
 
diff --git a/src/lib/sos/plugins/tftpserver.py b/src/lib/sos/plugins/tftpserver.py
new file mode 100644
index 00000000..0056d221
--- /dev/null
+++ b/src/lib/sos/plugins/tftpserver.py
@@ -0,0 +1,31 @@
+## Copyright (C) 2007 Shijoe George <spanjikk@redhat.com>
+
+### This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sos.plugintools
+from os.path import exists
+
+class tftpserver(sos.plugintools.PluginBase):
+    """tftpserver related information
+    """
+    def checkenabled(self):
+        if self.cInfo["policy"].pkgByName("tftp-server") or exists("/etc/xinetd.d/tftp"):
+            return True
+        return False
+
+    def setup(self):
+        self.collectExtOutput("/bin/ls -laR /tftpboot")
+        return
+