2007-06-15 Eugene Teo <eteo@redhat.com>

        * lib/sos/plugins/apache.py, lib/sos/plugins/nfsserver.py, lib/sos/plugins/selinux.py, lib/sos/plugins/xinetd.py, lib/sos/plugins/ssh.py, lib/sos/plugins/sendmail.py, lib/sos/plugins/samba.py, lib/sos/plugins/named.py, lib/sos/plugins/cluster.py:
        - Edited apache.py to gather /var/log/httpd/* log files
        - Added nfsserver.py to gather NFS server-related debugging information
        - Edited selinux.py to gather /etc/selinux/* configuration files
        - Added xinetd.py to gather xinetd-related information
        - Added ssh.py to gather ssh-related information
        - Added sendmail.py to gather sendmail information
        - Edited samba.py to gather /var/log/samba/* log files
        - Edited named.py to gather /etc/sysconfig/named
        - Edited cluster.py to gather the output of fdisk -l to show the
        shared storage devices that should be available to each system



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

10 files changed, 127 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f773345f..0e42d5d7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2007-06-15  Eugene Teo  <eteo@redhat.com>
+
+	* lib/sos/plugins/apache.py, lib/sos/plugins/nfsserver.py, lib/sos/plugins/selinux.py, lib/sos/plugins/xinetd.py, lib/sos/plugins/ssh.py, lib/sos/plugins/sendmail.py, lib/sos/plugins/samba.py, lib/sos/plugins/named.py, lib/sos/plugins/cluster.py:
+	- Edited apache.py to gather /var/log/httpd/* log files
+	- Added nfsserver.py to gather NFS server-related debugging information
+	- Edited selinux.py to gather /etc/selinux/* configuration files
+	- Added xinetd.py to gather xinetd-related information
+	- Added ssh.py to gather ssh-related information
+	- Added sendmail.py to gather sendmail information
+	- Edited samba.py to gather /var/log/samba/* log files
+	- Edited named.py to gather /etc/sysconfig/named
+	- Edited cluster.py to gather the output of fdisk -l to show the
+	shared storage devices that should be available to each system
+
 2007-05-28  Eugene Teo  <eteo@redhat.com>
 
 	* lib/sos/plugins/systemtap.py:
diff --git a/src/lib/sos/plugins/apache.py b/src/lib/sos/plugins/apache.py
index 81a91c55..78fb725d 100644
--- a/src/lib/sos/plugins/apache.py
+++ b/src/lib/sos/plugins/apache.py
@@ -21,5 +21,6 @@ class apache(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/etc/httpd/conf/httpd.conf")
         self.addCopySpec("/etc/httpd/conf.d/*.conf")
+        self.addCopySpec("/var/log/httpd/*")
         return
 
diff --git a/src/lib/sos/plugins/cluster.py b/src/lib/sos/plugins/cluster.py
index cc37cee5..00ef1753 100644
--- a/src/lib/sos/plugins/cluster.py
+++ b/src/lib/sos/plugins/cluster.py
@@ -18,6 +18,7 @@ class cluster(sos.plugintools.PluginBase):
     """This plugin gathers cluster related information
     """
     def setup(self):
+        self.collectExtOutput("/sbin/fdisk -l")
         self.addCopySpec("/etc/cluster.conf")
         self.addCopySpec("/etc/cluster.xml")
         self.addCopySpec("/etc/cluster")
diff --git a/src/lib/sos/plugins/named.py b/src/lib/sos/plugins/named.py
index 3178bbe1..8de3937b 100644
--- a/src/lib/sos/plugins/named.py
+++ b/src/lib/sos/plugins/named.py
@@ -23,6 +23,7 @@ class named(sos.plugintools.PluginBase):
       dnsdir = ""
       self.addCopySpec("/etc/named.boot")
       self.addCopySpec("/etc/named.conf")
+      self.addCopySpec("/etc/sysconfig/named")
       if os.access("/etc/named.conf", os.R_OK):
         dnsdir = commands.getoutput("/bin/grep -i directory /etc/named.conf | /bin/gawk '{print $2}' | /bin/sed 's/\\\"//g' | /bin/sed 's/\;//g'")
       if os.access("/etc/named.boot", os.R_OK):
diff --git a/src/lib/sos/plugins/nfsserver.py b/src/lib/sos/plugins/nfsserver.py
new file mode 100644
index 00000000..efdb832b
--- /dev/null
+++ b/src/lib/sos/plugins/nfsserver.py
@@ -0,0 +1,27 @@
+## Copyright (C) 2007 Red Hat, Inc., Eugene Teo <eteo@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
+
+class nfsserver(sos.plugintools.PluginBase):
+    """This plugin gathers NFS server-related information
+    """
+    def setup(self):
+        self.addCopySpec("/etc/exports")
+        self.collectExtOutput("/usr/sbin/rpcinfo -p localhost")
+        self.collectExtOutput("/usr/sbin/nfsstat")
+        return
+
diff --git a/src/lib/sos/plugins/samba.py b/src/lib/sos/plugins/samba.py
index 17c0937f..084627bd 100644
--- a/src/lib/sos/plugins/samba.py
+++ b/src/lib/sos/plugins/samba.py
@@ -19,6 +19,7 @@ class samba(sos.plugintools.PluginBase):
     """
     def setup(self):
         self.addCopySpec("/etc/samba")
+        self.addCopySpec("/var/log/samba/*")
         self.collectExtOutput("/usr/bin/wbinfo -g")
         self.collectExtOutput("/usr/bin/wbinfo -u")
         return
diff --git a/src/lib/sos/plugins/selinux.py b/src/lib/sos/plugins/selinux.py
index 7ba1781b..6aa61d58 100644
--- a/src/lib/sos/plugins/selinux.py
+++ b/src/lib/sos/plugins/selinux.py
@@ -18,6 +18,7 @@ class selinux(sos.plugintools.PluginBase):
     """This plugin gathers selinux related information
     """
     def setup(self):
+        self.addCopySpec("/etc/selinux/*")
         self.collectExtOutput("/usr/bin/selinuxconfig")
         self.collectExtOutput("/usr/sbin/sestatus")
         self.collectExtOutput("/bin/rpm -q -V selinux-policy-targeted")
diff --git a/src/lib/sos/plugins/sendmail.py b/src/lib/sos/plugins/sendmail.py
new file mode 100644
index 00000000..16ac912d
--- /dev/null
+++ b/src/lib/sos/plugins/sendmail.py
@@ -0,0 +1,27 @@
+## Copyright (C) 2007 Red Hat, Inc., Eugene Teo <eteo@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
+
+class sendmail(sos.plugintools.PluginBase):
+    """This plugin gathers sendmail information
+    """
+    def setup(self):
+        self.addCopySpec("/etc/mail/*")
+        self.addCopySpec("/var/log/maillog")
+        self.collectExtOutput("/sbin/chkconfig --list sendmail")
+        return
+
diff --git a/src/lib/sos/plugins/ssh.py b/src/lib/sos/plugins/ssh.py
new file mode 100644
index 00000000..5b9fd9cf
--- /dev/null
+++ b/src/lib/sos/plugins/ssh.py
@@ -0,0 +1,27 @@
+## Copyright (C) 2007 Red Hat, Inc., Eugene Teo <eteo@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
+
+class ssh(sos.plugintools.PluginBase):
+    """This plugin gathers ssh-related information
+    """
+    def setup(self):
+        self.addCopySpec("/etc/ssh/ssh_config")
+        self.addCopySpec("/etc/ssh/sshd_config")
+        self.collectExtOutput("/sbin/chkconfig --list sshd")
+        return
+
diff --git a/src/lib/sos/plugins/xinetd.py b/src/lib/sos/plugins/xinetd.py
new file mode 100644
index 00000000..f6ace143
--- /dev/null
+++ b/src/lib/sos/plugins/xinetd.py
@@ -0,0 +1,27 @@
+## Copyright (C) 2007 Red Hat, Inc., Eugene Teo <eteo@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
+
+class xinetd(sos.plugintools.PluginBase):
+    """This plugin gathers xinetd information
+    """
+    def setup(self):
+        self.addCopySpec("/etc/xinetd.conf")
+        self.addCopySpec("/etc/xinetd.d/*")
+        self.collectExtOutput("/sbin/chkconfig --list xinetd")
+        return
+