Merge pull request #206 from jamesodhunt/master

Addition of plugins for procenv and upstart.
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>

2 files changed, 66 insertions, 0 deletions

diff --git a/sos/plugins/procenv.py b/sos/plugins/procenv.py
new file mode 100644
index 00000000..d413cd16
--- /dev/null
+++ b/sos/plugins/procenv.py
@@ -0,0 +1,25 @@
+## Copyright (c) 2012 Adam Stokes <adam.stokes@canonical.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.
+
+from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+
+class Procenv(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+    """Process environment.
+    """
+
+    plugin_name = 'procenv'
+
+    def setup(self):
+        self.add_cmd_output('procenv')
diff --git a/sos/plugins/upstart.py b/sos/plugins/upstart.py
new file mode 100644
index 00000000..5aa0e1db
--- /dev/null
+++ b/sos/plugins/upstart.py
@@ -0,0 +1,41 @@
+## Copyright (C) 2012 Red Hat, Inc., Bryn M. Reeves <bmr@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.
+
+from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+
+class Upstart(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+    """ Information on Upstart, the event-based init system.
+    """
+
+    plugin_name = 'upstart'
+    packages = ('upstart',)
+
+    def setup(self):
+        self.add_cmd_output('initctl --system list')
+        self.add_cmd_output('initctl --system version')
+        self.add_cmd_output('init --version')
+        self.add_cmd_output("ls -l /etc/init/")
+
+        # Job Configuration Files
+        self.add_copy_spec('/etc/init.conf')
+        self.add_copy_spec('/etc/init/')
+
+        # State file
+        self.add_copy_spec('/var/log/upstart/upstart.state')
+
+        # Session Jobs (running Upstart as a Session Init)
+        self.add_copy_spec('/usr/share/upstart/')
+