diff options
| -rw-r--r-- | sos/plugins/general.py | 12 | ||||
| -rw-r--r-- | sos/plugins/juju.py | 2 | ||||
| -rw-r--r-- | sos/plugins/landscape.py | 72 |
3 files changed, 79 insertions, 7 deletions
diff --git a/sos/plugins/general.py b/sos/plugins/general.py index d94c0c54..1ee9c909 100644 --- a/sos/plugins/general.py +++ b/sos/plugins/general.py @@ -15,7 +15,7 @@ import os from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin -class general(Plugin): +class General(Plugin): """basic system information""" plugin_name = "general" @@ -57,7 +57,7 @@ class general(Plugin): self.add_cmd_output("/bin/ls -lR /var/lib") -class RedHatGeneral(general, RedHatPlugin): +class RedHatGeneral(General, RedHatPlugin): """Basic system information for RedHat based distributions""" def setup(self): @@ -90,22 +90,22 @@ class RedHatGeneral(general, RedHatPlugin): r"(\s*proxyPassword\s*=\s*)\S+", r"\1***") -class DebianGeneral(general, DebianPlugin, UbuntuPlugin): +class DebianGeneral(General, DebianPlugin): """Basic system information for Debian based distributions""" def setup(self): - super(GeneralDebian, self).setup() + super(DebianGeneral, self).setup() self.add_copy_specs([ "/etc/debian_version", "/etc/default", "/var/log/up2date", "/etc/lsb-release" ]) -class UbuntuGeneral(general, UbuntuPlugin): +class UbuntuGeneral(General, UbuntuPlugin): """Basic system information for Ubuntu based distributions""" def setup(self): - super(GeneralUbuntu, self).setup() + super(UbuntuGeneral, self).setup() self.add_copy_specs([ "/etc/os-release", "/var/log/ufw.log", diff --git a/sos/plugins/juju.py b/sos/plugins/juju.py index 9996b730..df79185e 100644 --- a/sos/plugins/juju.py +++ b/sos/plugins/juju.py @@ -20,5 +20,5 @@ class juju(Plugin, UbuntuPlugin): """ Juju Plugin """ def setup(self): - self.add_copy_specs(["/var/log/juju*", + self.add_copy_specs(["/var/log/juju", "/var/lib/juju"]) diff --git a/sos/plugins/landscape.py b/sos/plugins/landscape.py new file mode 100644 index 00000000..f544ebb7 --- /dev/null +++ b/sos/plugins/landscape.py @@ -0,0 +1,72 @@ +### 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, UbuntuPlugin +import os + +class Landscape(Plugin, UbuntuPlugin): + """ + landscape client related information + """ + + files = ('/etc/landscape/client.conf', + 'broker.log', + 'broker.log.gz', + 'broker.log.1', + 'broker.log.1.gz', + 'broker.log.2', + 'broker.log.2.gz', + 'manager.log', + 'manager.log.gz', + 'manager.log.1', + 'manager.log.1.gz', + 'manager.log.2', + 'manager.log.2.gz', + 'monitor.log', + 'monitor.log.gz', + 'monitor.log.1', + 'monitor.log.1.gz', + 'monitor.log.2', + 'monitor.log.2.gz', + 'package-reporter.log', + 'package-reporter.log.gz', + 'package-reporter.log.1', + 'package-reporter.log.1.gz', + 'package-reporter.log.2', + 'package-reporter.log.2.gz', + 'sysinfo.log', + 'sysinfo.log.gz', + 'sysinfo.log.1', + 'sysinfo.log.1.gz', + 'sysinfo.log.2', + 'sysinfo.log.2.gz', + 'watchdog.log', + 'watchdog.log.gz', + 'watchdog.log.1', + 'watchdog.log.1.gz', + 'watchdog.log.2', + 'watchdog.log.2.gz' + ,) + packages = ('landscape-client',) + + def setup(self): + self.addCopySpec("/etc/landscape/client.conf") + + def postproc(self): + self.doFileSub("/etc/landscape/client.conf", + r"registration_password(.*)", + r"registration_password[***]" + ) + +
\ No newline at end of file |