added netump support, resolves rhbz466819

remove sysrq triggers in kernel rhbz476970
make httpd logs optional rhbz433040


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

3 files changed, 42 insertions, 2 deletions

diff --git a/src/lib/sos/plugins/apache.py b/src/lib/sos/plugins/apache.py
index c5250fd9..1b44e322 100644
--- a/src/lib/sos/plugins/apache.py
+++ b/src/lib/sos/plugins/apache.py
@@ -18,9 +18,12 @@ from threading import Thread
 class apache(sos.plugintools.PluginBase):
     """Apache related information
     """
+    optionList = [("log", "gathers all apache logs", "slow", False)]
+    
     def setup(self):
         self.addCopySpec("/etc/httpd/conf/httpd.conf")
         self.addCopySpec("/etc/httpd/conf.d/*.conf")
-        self.addCopySpec("/var/log/httpd/*")
+        if self.getOption("log"):
+            self.addCopySpec("/var/log/httpd/*")
         return
 
diff --git a/src/lib/sos/plugins/kernel.py b/src/lib/sos/plugins/kernel.py
index e3f33635..669d8300 100644
--- a/src/lib/sos/plugins/kernel.py
+++ b/src/lib/sos/plugins/kernel.py
@@ -71,7 +71,6 @@ class kernel(sos.plugintools.PluginBase):
         self.addCopySpec("/proc/cmdline")
         self.addCopySpec("/proc/driver")
         self.addCopySpec("/proc/sys/kernel/tainted")
-
         self.addCopySpec("/var/log/messages")
 
         return
diff --git a/src/lib/sos/plugins/netdump.py b/src/lib/sos/plugins/netdump.py
new file mode 100644
index 00000000..8fe721e8
--- /dev/null
+++ b/src/lib/sos/plugins/netdump.py
@@ -0,0 +1,38 @@
+### 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.
+
+#############################################################
+# This plugin assumes is to assist in troubleshooting netdump
+# issues that deal with netdump configuration.  Any improvements
+# to the plugin are appreciated.  Please send them to
+# sos@lists.fedorahosted.org
+# thanks
+#############################################################
+# grabs both client and server netdump configs
+
+import sos.plugintools
+from os import exists
+
+class netdump(sos.plugintools.PluginBase):
+    """Netdump Configuration Information
+    """
+
+    def checkenabled(self):
+        if self.cInfo["policy"].pkgByName("netdump") or exists("/etc/sysconfig/netdump*"):
+            return True
+        return False
+
+    def setup(self):
+        self.addCopySpec("/etc/sysconfig/netdump")
+        return