diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2012-12-17 16:57:25 +0000 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2012-12-17 16:57:25 +0000 |
| commit | 81a64eb8ace38675a696bfc20893f167948f0b38 (patch) | |
| tree | 9f4bfece1571729f620d14c0d16d668cda5aeef4 | |
| parent | 2c94e5787647c989e45ddb0c96edab50afdefbb3 (diff) | |
| download | sos-81a64eb8ace38675a696bfc20893f167948f0b38.tar.gz | |
Rename command output collection interfaces
The method names for collecting external output are ugly and
awkward to type. Rename them to be more consistent with the file
collection API and easier to remember and type.
This change touches virtually every plugin class but is a very
simple search/replace (plugin changes were done with sed).
Fixes Issue #92.
64 files changed, 360 insertions, 360 deletions
diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py index 42a85aea..95a1ea16 100644 --- a/sos/plugins/__init__.py +++ b/sos/plugins/__init__.py @@ -164,7 +164,7 @@ class Plugin(object): '''Is the package $package_name installed?''' return (self.policy().pkgByName(package_name) is not None) - def doExtOutputSub(self, cmd, regexp, subst): + def doCmdOutputSub(self, cmd, regexp, subst): '''Apply a regexp substitution to command output archived by sosreport. cmd is the command name from which output is collected (i.e. excluding parameters). The regexp can be a string or a compiled re object. The @@ -494,7 +494,7 @@ class Plugin(object): return (status == 0) - def collectExtOutput(self, exe, suggest_filename=None, root_symlink=None, timeout=300): + def addCmdOutput(self, exe, suggest_filename=None, root_symlink=None, timeout=300): """Run a program and collect the output""" self.collectProgs.append( (exe, suggest_filename, root_symlink, timeout) ) @@ -529,7 +529,7 @@ class Plugin(object): """Add a string to the archive as a file named `filename`""" self.copyStrings.append((content, filename)) - def collectOutputNow(self, exe, suggest_filename=None, root_symlink=False, timeout=300): + def getCmdOutputNow(self, exe, suggest_filename=None, root_symlink=False, timeout=300): """Execute a command and save the output to a file for inclusion in the report. """ @@ -592,7 +592,7 @@ class Plugin(object): prog, suggest_filename, root_symlink, timeout = progs[0] self.soslog.debug("collecting output of '%s'" % prog) try: - self.collectOutputNow(prog, suggest_filename, + self.getCmdOutputNow(prog, suggest_filename, root_symlink, timeout) except Exception, e: self.soslog.debug("error collecting output of '%s' (%s)" diff --git a/sos/plugins/abrt.py b/sos/plugins/abrt.py index 3ab7584c..8eff9628 100644 --- a/sos/plugins/abrt.py +++ b/sos/plugins/abrt.py @@ -31,13 +31,13 @@ class abrt(Plugin, RedHatPlugin): ret, output, rtime = self.callExtProg('/usr/bin/sqlite3 /var/spool/abrt/abrt-db \'select UUID from abrt_v4\'') try: for uuid in output.split(): - self.collectExtOutput("/usr/bin/abrt-cli -ib %s" % uuid, + self.addCmdOutput("/usr/bin/abrt-cli -ib %s" % uuid, suggest_filename=("backtrace_%s" % uuid)) except IndexError: pass def setup(self): - self.collectExtOutput("/usr/bin/abrt-cli -lf", + self.addCmdOutput("/usr/bin/abrt-cli -lf", suggest_filename="abrt-log") if self.getOption('backtraces'): self.do_backtraces() diff --git a/sos/plugins/amd.py b/sos/plugins/amd.py index 08078694..d5e1673a 100644 --- a/sos/plugins/amd.py +++ b/sos/plugins/amd.py @@ -24,5 +24,5 @@ class amd(Plugin, RedHatPlugin): def setup(self): self.addCopySpecs("/etc/amd.*") - self.collectExtOutput("/bin/egrep -e 'automount|pid.*nfs' /proc/mounts") - self.collectExtOutput("/bin/mount | egrep -e 'automount|pid.*nfs'") + self.addCmdOutput("/bin/egrep -e 'automount|pid.*nfs' /proc/mounts") + self.addCmdOutput("/bin/mount | egrep -e 'automount|pid.*nfs'") diff --git a/sos/plugins/autofs.py b/sos/plugins/autofs.py index d2c422f1..5d19f8b5 100644 --- a/sos/plugins/autofs.py +++ b/sos/plugins/autofs.py @@ -46,10 +46,10 @@ class autofs(Plugin): def setup(self): self.addCopySpec("/etc/auto*") - self.collectExtOutput("/etc/init.d/autofs status") - self.collectExtOutput("ps auxwww | grep automount") - self.collectExtOutput("/bin/egrep -e 'automount|pid.*nfs' /proc/mounts") - self.collectExtOutput("/bin/mount | egrep -e 'automount|pid.*nfs'") + self.addCmdOutput("/etc/init.d/autofs status") + self.addCmdOutput("ps auxwww | grep automount") + self.addCmdOutput("/bin/egrep -e 'automount|pid.*nfs' /proc/mounts") + self.addCmdOutput("/bin/mount | egrep -e 'automount|pid.*nfs'") if self.checkdebug(): self.addCopySpec(self.getdaemondebug()) @@ -58,11 +58,11 @@ class RedHatAutofs(autofs, RedHatPlugin): def setup(self): super(RedHatAutofs, self).setup() - self.collectExtOutput("/bin/rpm -qV autofs") + self.addCmdOutput("/bin/rpm -qV autofs") class DebianAutofs(autofs, DebianPlugin, UbuntuPlugin): """autofs server-related on Debian based distributions""" def setup(self): super(DebianAutofs, self).setup() - self.collectExtOutput("/usr/bin/dpkg-query -s autofs") + self.addCmdOutput("/usr/bin/dpkg-query -s autofs") diff --git a/sos/plugins/bootloader.py b/sos/plugins/bootloader.py index e447bd9d..1c3cde2a 100644 --- a/sos/plugins/bootloader.py +++ b/sos/plugins/bootloader.py @@ -27,5 +27,5 @@ class bootloader(Plugin, RedHatPlugin, UbuntuPlugin): "/boot/grub/device.map", "/etc/grub.d", "/boot/yaboot.conf"]) - self.collectExtOutput("/sbin/lilo -q") - self.collectExtOutput("/bin/ls -lanR /boot") + self.addCmdOutput("/sbin/lilo -q") + self.addCmdOutput("/bin/ls -lanR /boot") diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py index 8a805dc5..7d02ce10 100644 --- a/sos/plugins/ceph.py +++ b/sos/plugins/ceph.py @@ -29,11 +29,11 @@ class ceph(Plugin, RedHatPlugin, UbuntuPlugin): self.addCopySpecs(["/etc/ceph/", "/var/log/ceph/"]) - self.collectExtOutput("/usr/bin/ceph status") - self.collectExtOutput("/usr/bin/ceph health") - self.collectExtOutput("/usr/bin/ceph osd tree") - self.collectExtOutput("/usr/bin/ceph osd stat") - self.collectExtOutput("/usr/bin/ceph osd dump") - self.collectExtOutput("/usr/bin/ceph mon stat") - self.collectExtOutput("/usr/bin/ceph mon dump") + self.addCmdOutput("/usr/bin/ceph status") + self.addCmdOutput("/usr/bin/ceph health") + self.addCmdOutput("/usr/bin/ceph osd tree") + self.addCmdOutput("/usr/bin/ceph osd stat") + self.addCmdOutput("/usr/bin/ceph osd dump") + self.addCmdOutput("/usr/bin/ceph mon stat") + self.addCmdOutput("/usr/bin/ceph mon dump") diff --git a/sos/plugins/cloudforms.py b/sos/plugins/cloudforms.py index db66d269..8f6c0a03 100644 --- a/sos/plugins/cloudforms.py +++ b/sos/plugins/cloudforms.py @@ -30,8 +30,8 @@ class cloudforms(Plugin, RedHatPlugin): aeolus_debug = "/usr/bin/aeolus-debug" if os.path.isfile(katello_debug): katello_debug_path = os.path.join(self.cInfo['dstroot'],"katello-debug") - self.collectExtOutput("%s --notar -d %s" % (katello_debug, katello_debug_path)) + self.addCmdOutput("%s --notar -d %s" % (katello_debug, katello_debug_path)) if os.path.isfile(aeolus_debug): aeolus_debug_path = os.path.join(self.cInfo['dstroot'],"aeolus-debug") - self.collectExtOutput("%s --notar -d %s" % (aeolus_debug, aeolus_debug_path)) + self.addCmdOutput("%s --notar -d %s" % (aeolus_debug, aeolus_debug_path)) diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py index 675d48df..e8076cb0 100644 --- a/sos/plugins/cluster.py +++ b/sos/plugins/cluster.py @@ -65,45 +65,45 @@ class cluster(Plugin, RedHatPlugin): if self.getOption('lockdump'): self.do_lockdump() - self.collectExtOutput("/usr/sbin/rg_test test " + self.addCmdOutput("/usr/sbin/rg_test test " + "/etc/cluster/cluster.conf" ) - self.collectExtOutput("fence_tool ls -n") - self.collectExtOutput("gfs_control ls -n") - self.collectExtOutput("dlm_tool log_plock") - - self.collectExtOutput("/sbin/fdisk -l") - self.collectOutputNow("clustat") - self.collectOutputNow("group_tool dump") - self.collectExtOutput("cman_tool services") - self.collectExtOutput("cman_tool nodes") - self.collectExtOutput("cman_tool status") - self.collectExtOutput("ccs_tool lsnode") - self.collectExtOutput("/sbin/ipvsadm -L") + self.addCmdOutput("fence_tool ls -n") + self.addCmdOutput("gfs_control ls -n") + self.addCmdOutput("dlm_tool log_plock") + + self.addCmdOutput("/sbin/fdisk -l") + self.getCmdOutputNow("clustat") + self.getCmdOutputNow("group_tool dump") + self.addCmdOutput("cman_tool services") + self.addCmdOutput("cman_tool nodes") + self.addCmdOutput("cman_tool status") + self.addCmdOutput("ccs_tool lsnode") + self.addCmdOutput("/sbin/ipvsadm -L") if rhelver is 4: self.addCopySpec("/proc/cluster/*") - self.collectExtOutput("cman_tool nodes") + self.addCmdOutput("cman_tool nodes") if rhelver is not 4: # 5+ - self.collectExtOutput("cman_tool -a nodes") + self.addCmdOutput("cman_tool -a nodes") if rhelver is 5: - self.collectExtOutput("group_tool -v") - self.collectExtOutput("group_tool dump fence") - self.collectExtOutput("group_tool dump gfs") + self.addCmdOutput("group_tool -v") + self.addCmdOutput("group_tool dump fence") + self.addCmdOutput("group_tool dump gfs") if rhelver not in (4,5): # 6+ - self.collectExtOutput("corosync-quorumtool -l") - self.collectExtOutput("corosync-quorumtool -s") - self.collectExtOutput("corosync-cpgtool") - self.collectExtOutput("corosync-objctl") - self.collectExtOutput("group_tool ls -g1") - self.collectExtOutput("gfs_control ls -n") - self.collectExtOutput("gfs_control dump") - self.collectExtOutput("fence_tool dump") - self.collectExtOutput("dlm_tool dump") - self.collectExtOutput("dlm_tool ls -n") - self.collectExtOutput("mkqdisk -L") + self.addCmdOutput("corosync-quorumtool -l") + self.addCmdOutput("corosync-quorumtool -s") + self.addCmdOutput("corosync-cpgtool") + self.addCmdOutput("corosync-objctl") + self.addCmdOutput("group_tool ls -g1") + self.addCmdOutput("gfs_control ls -n") + self.addCmdOutput("gfs_control dump") + self.addCmdOutput("fence_tool dump") + self.addCmdOutput("dlm_tool dump") + self.addCmdOutput("dlm_tool ls -n") + self.addCmdOutput("mkqdisk -L") def do_lockdump(self): rhelver = self.policy().rhelVersion() @@ -114,28 +114,28 @@ class cluster(Plugin, RedHatPlugin): re.MULTILINE).findall(output): self.callExtProg("echo %s > /proc/cluster/dlm_locks" % lockspace) - self.collectOutputNow("cat /proc/cluster/dlm_locks", + self.getCmdOutputNow("cat /proc/cluster/dlm_locks", suggest_filename = "dlm_locks_%s" % lockspace) if rhelver is 5: status, output, time = self.callExtProg("group_tool") for lockspace in re.compile(r'^dlm\s+[^\s]+\s+([^\s]+)$', re.MULTILINE).findall(output): - self.collectExtOutput("dlm_tool lockdebug '%s'" % lockspace, + self.addCmdOutput("dlm_tool lockdebug '%s'" % lockspace, suggest_filename = "dlm_locks_%s" % lockspace) else: # RHEL6 or recent Fedora status, output, time = self.callExtProg("dlm_tool ls") for lockspace in re.compile(r'^name\s+([^\s]+)$', re.MULTILINE).findall(output): - self.collectExtOutput("dlm_tool lockdebug -svw '%s'" + self.addCmdOutput("dlm_tool lockdebug -svw '%s'" % lockspace, suggest_filename = "dlm_locks_%s" % lockspace) def do_gfslockdump(self): for mntpoint in self.doRegexFindAll(r'^\S+\s+([^\s]+)\s+gfs\s+.*$', "/proc/mounts"): - self.collectExtOutput("/sbin/gfs_tool lockdump %s" % mntpoint, + self.addCmdOutput("/sbin/gfs_tool lockdump %s" % mntpoint, suggest_filename = "gfs_lockdump_" + self.mangleCommand(mntpoint)) @@ -144,7 +144,7 @@ class cluster(Plugin, RedHatPlugin): self.doFileSub(cluster_conf, r"(\s*\<fencedevice\s*.*\s*passwd\s*=\s*)\S+(\")", r"\1%s" %('"***"')) - self.doExtOutputSub("corosync-objctl", + self.doCmdOutputSub("corosync-objctl", r"(.*fence.*\.passwd=)(.*)", r"\1******") return diff --git a/sos/plugins/corosync.py b/sos/plugins/corosync.py index 87f764ca..6fb0ad0a 100644 --- a/sos/plugins/corosync.py +++ b/sos/plugins/corosync.py @@ -26,11 +26,11 @@ class corosync(Plugin, RedHatPlugin): "/etc/corosync", "/var/lib/corosync/fdata", "/var/log/cluster/corosync.log"]) - self.collectExtOutput("corosync-quorumtool -l") - self.collectExtOutput("corosync-quorumtool -s") - self.collectExtOutput("corosync-cpgtool") - self.collectExtOutput("corosync-objctl -a") - self.collectExtOutput("corosync-fplay") - self.collectExtOutput("/usr/sbin/corosync-objctl -w runtime.blackbox.dump_state=$(date +\%s)") - self.collectExtOutput("/usr/sbin/corosync-objctl -w runtime.blackbox.dump_flight_data=$(date +\%s)") + self.addCmdOutput("corosync-quorumtool -l") + self.addCmdOutput("corosync-quorumtool -s") + self.addCmdOutput("corosync-cpgtool") + self.addCmdOutput("corosync-objctl -a") + self.addCmdOutput("corosync-fplay") + self.addCmdOutput("/usr/sbin/corosync-objctl -w runtime.blackbox.dump_state=$(date +\%s)") + self.addCmdOutput("/usr/sbin/corosync-objctl -w runtime.blackbox.dump_flight_data=$(date +\%s)") self.callExtProg("killall -USR2 corosync") diff --git a/sos/plugins/crontab.py b/sos/plugins/crontab.py index 3df0a688..8125aafd 100644 --- a/sos/plugins/crontab.py +++ b/sos/plugins/crontab.py @@ -22,7 +22,7 @@ class crontab(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): def setup(self): self.addCopySpec("/etc/cron*") - self.collectExtOutput("/usr/bin/crontab -l -u root", suggest_filename = "root_crontab") - self.collectExtOutput("""for i in `ls /home/`;\ + self.addCmdOutput("/usr/bin/crontab -l -u root", suggest_filename = "root_crontab") + self.addCmdOutput("""for i in `ls /home/`;\ do echo "User :" $i;/usr/bin/crontab -l -u $i;\ echo "---------------";done""", suggest_filename = "users_crontabs") diff --git a/sos/plugins/devicemapper.py b/sos/plugins/devicemapper.py index 022faabe..288472a8 100644 --- a/sos/plugins/devicemapper.py +++ b/sos/plugins/devicemapper.py @@ -29,33 +29,33 @@ class devicemapper(Plugin, RedHatPlugin): cmd = "lvmdump -d '%s'" % os.path.join(self.cInfo['dstroot'],"lvmdump") if self.getOption('lvmdump-a'): cmd += " -a" - self.collectExtOutput(cmd) + self.addCmdOutput(cmd) def setup(self): - self.collectExtOutput("/sbin/dmsetup info -c") - self.collectExtOutput("/sbin/dmsetup table") - self.collectExtOutput("/sbin/dmsetup status") - self.collectExtOutput("/sbin/dmsetup ls --tree") + self.addCmdOutput("/sbin/dmsetup info -c") + self.addCmdOutput("/sbin/dmsetup table") + self.addCmdOutput("/sbin/dmsetup status") + self.addCmdOutput("/sbin/dmsetup ls --tree") - self.collectExtOutput("/sbin/vgdisplay -vv", root_symlink = "vgdisplay") - self.collectExtOutput("/sbin/vgscan -vvv") - self.collectExtOutput("/sbin/pvscan -v") - self.collectExtOutput("/sbin/lvs -a -o +devices") - self.collectExtOutput("/sbin/pvs -a -v") - self.collectExtOutput("/sbin/vgs -v") - self.collectExtOutput("/sbin/mdadm -D /dev/md*") + self.addCmdOutput("/sbin/vgdisplay -vv", root_symlink = "vgdisplay") + self.addCmdOutput("/sbin/vgscan -vvv") + self.addCmdOutput("/sbin/pvscan -v") + self.addCmdOutput("/sbin/lvs -a -o +devices") + self.addCmdOutput("/sbin/pvs -a -v") + self.addCmdOutput("/sbin/vgs -v") + self.addCmdOutput("/sbin/mdadm -D /dev/md*") self.addCopySpecs([ "/etc/lvm", "/etc/multipath/", "/etc/multipath.conf", "/var/lib/multipath/bindings"]) - self.collectExtOutput("/sbin/multipath -v4 -ll") + self.addCmdOutput("/sbin/multipath -v4 -ll") - self.collectExtOutput("/usr/bin/systool -v -c -b scsi") + self.addCmdOutput("/usr/bin/systool -v -c -b scsi") - self.collectExtOutput("/bin/ls -lanR /dev") - self.collectExtOutput("/bin/ls -lanR /sys/block") + self.addCmdOutput("/bin/ls -lanR /dev") + self.addCmdOutput("/bin/ls -lanR /sys/block") if self.getOption('lvmdump'): self.do_lvmdump() @@ -64,6 +64,6 @@ class devicemapper(Plugin, RedHatPlugin): for disk in os.listdir("/sys/block"): if disk in [ ".", ".." ] or disk.startswith("ram"): continue - self.collectExtOutput("/usr/bin/udevinfo -ap /sys/block/%s" % (disk)) + self.addCmdOutput("/usr/bin/udevinfo -ap /sys/block/%s" % (disk)) for opt in self.dmraidOptions: - self.collectExtOutput("/sbin/dmraid -%s" % (opt,)) + self.addCmdOutput("/sbin/dmraid -%s" % (opt,)) diff --git a/sos/plugins/dovecot.py b/sos/plugins/dovecot.py index 705088e2..ae6addb3 100644 --- a/sos/plugins/dovecot.py +++ b/sos/plugins/dovecot.py @@ -21,4 +21,4 @@ class dovecot(Plugin, RedHatPlugin): def setup(self): if os.path.exists("/etc/dovecot.conf"): self.addCopySpec("/etc/dovecot*") - self.collectExtOutput("/usr/sbin/dovecot -n") + self.addCmdOutput("/usr/sbin/dovecot -n") diff --git a/sos/plugins/dpkg.py b/sos/plugins/dpkg.py index db305f71..5f8d38a1 100644 --- a/sos/plugins/dpkg.py +++ b/sos/plugins/dpkg.py @@ -20,4 +20,4 @@ class dpkg(Plugin, DebianPlugin, UbuntuPlugin): """ def setup(self): self.addCopySpec("/var/log/dpkg.log") - self.collectExtOutput("/usr/bin/dpkg-query -W -f='${Package}-${Version}-${Architecture}\n' \*", root_symlink = "installed-debs") + self.addCmdOutput("/usr/bin/dpkg-query -W -f='${Package}-${Version}-${Architecture}\n' \*", root_symlink = "installed-debs") diff --git a/sos/plugins/emc.py b/sos/plugins/emc.py index 4d88e151..7a625e66 100644 --- a/sos/plugins/emc.py +++ b/sos/plugins/emc.py @@ -36,7 +36,7 @@ class emc(Plugin, RedHatPlugin): def get_pp_files(self): """ EMC PowerPath specific information - files """ - self.collectExtOutput("/sbin/powermt version") + self.addCmdOutput("/sbin/powermt version") self.addCopySpecs([ "/etc/init.d/PowerPath", "/etc/powermt.custom", @@ -51,13 +51,13 @@ class emc(Plugin, RedHatPlugin): def get_pp_config(self): """ EMC PowerPath specific information - commands """ - self.collectExtOutput("/sbin/powermt display") - self.collectExtOutput("/sbin/powermt display dev=all") - self.collectExtOutput("/sbin/powermt check_registration") - self.collectExtOutput("/sbin/powermt display options") - self.collectExtOutput("/sbin/powermt display ports") - self.collectExtOutput("/sbin/powermt display paths") - self.collectExtOutput("/sbin/powermt dump") + self.addCmdOutput("/sbin/powermt display") + self.addCmdOutput("/sbin/powermt display dev=all") + self.addCmdOutput("/sbin/powermt check_registration") + self.addCmdOutput("/sbin/powermt display options") + self.addCmdOutput("/sbin/powermt display ports") + self.addCmdOutput("/sbin/powermt display paths") + self.addCmdOutput("/sbin/powermt dump") def get_symcli_files(self): """ EMC Solutions Enabler SYMCLI specific information - files @@ -70,51 +70,51 @@ class emc(Plugin, RedHatPlugin): def get_symcli_config(self): """ EMC Solutions Enabler SYMCLI specific information - Symmetrix/DMX - commands """ - self.collectExtOutput("/usr/symcli/bin/symcli -def") - self.collectExtOutput("/usr/symcli/bin/symdg list") - self.collectExtOutput("/usr/symcli/bin/symdg -v list") - self.collectExtOutput("/usr/symcli/bin/symcg list") - self.collectExtOutput("/usr/symcli/bin/symcg -v list") - self.collectExtOutput("/usr/symcli/bin/symcfg list") - self.collectExtOutput("/usr/symcli/bin/symcfg -v list") - self.collectExtOutput("/usr/symcli/bin/symcfg -db") - self.collectExtOutput("/usr/symcli/bin/symcfg -semaphores list") - self.collectExtOutput("/usr/symcli/bin/symcfg -dir all -v list") - self.collectExtOutput("/usr/symcli/bin/symcfg -connections list") - self.collectExtOutput("/usr/symcli/bin/symcfg -app -v list") - self.collectExtOutput("/usr/symcli/bin/symcfg -fa all -port list") - self.collectExtOutput("/usr/symcli/bin/symcfg -ra all -port list") - self.collectExtOutput("/usr/symcli/bin/symcfg -sa all -port list") - self.collectExtOutput("/usr/symcli/bin/symcfg list -lock") - self.collectExtOutput("/usr/symcli/bin/symcfg list -lockn all") - self.collectExtOutput("/usr/symcli/bin/syminq") - self.collectExtOutput("/usr/symcli/bin/syminq -v") - self.collectExtOutput("/usr/symcli/bin/syminq -symmids") - self.collectExtOutput("/usr/symcli/bin/syminq hba -fibre") - self.collectExtOutput("/usr/symcli/bin/syminq hba -scsi") - self.collectExtOutput("/usr/symcli/bin/symhost show -config") - self.collectExtOutput("/usr/symcli/bin/stordaemon list") - self.collectExtOutput("/usr/symcli/bin/stordaemon -v list") - self.collectExtOutput("/usr/symcli/bin/sympd list") - self.collectExtOutput("/usr/symcli/bin/sympd list -vcm") - self.collectExtOutput("/usr/symcli/bin/symdev list") - self.collectExtOutput("/usr/symcli/bin/symdev -v list") - self.collectExtOutput("/usr/symcli/bin/symdev -rdfa list") - self.collectExtOutput("/usr/symcli/bin/symdev -rdfa -v list") - self.collectExtOutput("/usr/symcli/bin/symbcv list") - self.collectExtOutput("/usr/symcli/bin/symbcv -v list") - self.collectExtOutput("/usr/symcli/bin/symrdf list") - self.collectExtOutput("/usr/symcli/bin/symrdf -v list") - self.collectExtOutput("/usr/symcli/bin/symrdf -rdfa list") - self.collectExtOutput("/usr/symcli/bin/symrdf -rdfa -v list") - self.collectExtOutput("/usr/symcli/bin/symsnap list") - self.collectExtOutput("/usr/symcli/bin/symsnap list -savedevs") - self.collectExtOutput("/usr/symcli/bin/symclone list") - self.collectExtOutput("/usr/symcli/bin/symevent list") - self.collectExtOutput("/usr/symcli/bin/symmask list hba") - self.collectExtOutput("/usr/symcli/bin/symmask list logins") - self.collectExtOutput("/usr/symcli/bin/symmaskdb list database") - self.collectExtOutput("/usr/symcli/bin/symmaskdb -v list database") + self.addCmdOutput("/usr/symcli/bin/symcli -def") + self.addCmdOutput("/usr/symcli/bin/symdg list") + self.addCmdOutput("/usr/symcli/bin/symdg -v list") + self.addCmdOutput("/usr/symcli/bin/symcg list") + self.addCmdOutput("/usr/symcli/bin/symcg -v list") + self.addCmdOutput("/usr/symcli/bin/symcfg list") + self.addCmdOutput("/usr/symcli/bin/symcfg -v list") + self.addCmdOutput("/usr/symcli/bin/symcfg -db") + self.addCmdOutput("/usr/symcli/bin/symcfg -semaphores list") + self.addCmdOutput("/usr/symcli/bin/symcfg -dir all -v list") + self.addCmdOutput("/usr/symcli/bin/symcfg -connections list") + self.addCmdOutput("/usr/symcli/bin/symcfg -app -v list") + self.addCmdOutput("/usr/symcli/bin/symcfg -fa all -port list") + self.addCmdOutput("/usr/symcli/bin/symcfg -ra all -port list") + self.addCmdOutput("/usr/symcli/bin/symcfg -sa all -port list") + self.addCmdOutput("/usr/symcli/bin/symcfg list -lock") + self.addCmdOutput("/usr/symcli/bin/symcfg list -lockn all") + self.addCmdOutput("/usr/symcli/bin/syminq") + self.addCmdOutput("/usr/symcli/bin/syminq -v") + self.addCmdOutput("/usr/symcli/bin/syminq -symmids") + self.addCmdOutput("/usr/symcli/bin/syminq hba -fibre") + self.addCmdOutput("/usr/symcli/bin/syminq hba -scsi") + self.addCmdOutput("/usr/symcli/bin/symhost show -config") + self.addCmdOutput("/usr/symcli/bin/stordaemon list") + self.addCmdOutput("/usr/symcli/bin/stordaemon -v list") + self.addCmdOutput("/usr/symcli/bin/sympd list") + self.addCmdOutput("/usr/symcli/bin/sympd list -vcm") + self.addCmdOutput("/usr/symcli/bin/symdev list") + self.addCmdOutput("/usr/symcli/bin/symdev -v list") + self.addCmdOutput("/usr/symcli/bin/symdev -rdfa list") + self.addCmdOutput("/usr/symcli/bin/symdev -rdfa -v list") + self.addCmdOutput("/usr/symcli/bin/symbcv list") + self.addCmdOutput("/usr/symcli/bin/symbcv -v list") + self.addCmdOutput("/usr/symcli/bin/symrdf list") + self.addCmdOutput("/usr/symcli/bin/symrdf -v list") + self.addCmdOutput("/usr/symcli/bin/symrdf -rdfa list") + self.addCmdOutput("/usr/symcli/bin/symrdf -rdfa -v list") + self.addCmdOutput("/usr/symcli/bin/symsnap list") + self.addCmdOutput("/usr/symcli/bin/symsnap list -savedevs") + self.addCmdOutput("/usr/symcli/bin/symclone list") + self.addCmdOutput("/usr/symcli/bin/symevent list") + self.addCmdOutput("/usr/symcli/bin/symmask list hba") + self.addCmdOutput("/usr/symcli/bin/symmask list logins") + self.addCmdOutput("/usr/symcli/bin/symmaskdb list database") + self.addCmdOutput("/usr/symcli/bin/symmaskdb -v list database") def get_navicli_config(self): """ EMC Navisphere Host Agent NAVICLI specific information - files @@ -129,19 +129,19 @@ class emc(Plugin, RedHatPlugin): def get_navicli_SP_info(self,SP_address): """ EMC Navisphere Host Agent NAVICLI specific information - CLARiiON - commands """ - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s getall" % SP_address) - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s getsptime -spa" % SP_address) - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s getsptime -spb" % SP_address) - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s getlog" % SP_address) - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s getdisk" % SP_address) - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s getcache" % SP_address) - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s getlun" % SP_address) - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s getlun -rg -type -default -owner -crus -capacity" % SP_address) - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s lunmapinfo" % SP_address) - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s getcrus" % SP_address) - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s port -list -all" % SP_address) - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s storagegroup -list" % SP_address) - self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s spportspeed -get" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s getall" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s getsptime -spa" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s getsptime -spb" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s getlog" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s getdisk" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s getcache" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s getlun" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s getlun -rg -type -default -owner -crus -capacity" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s lunmapinfo" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s getcrus" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s port -list -all" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s storagegroup -list" % SP_address) + self.addCmdOutput("/opt/Navisphere/bin/navicli -h %s spportspeed -get" % SP_address) def checkenabled(self): self.packages = [ "EMCpower" ] diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py index f942fa89..ee36bd1d 100644 --- a/sos/plugins/filesys.py +++ b/sos/plugins/filesys.py @@ -32,15 +32,15 @@ class filesys(Plugin, RedHatPlugin, UbuntuPlugin): "/proc/mdstat", "/etc/raidtab", "/etc/mdadm.conf"]) - mounts = self.collectOutputNow("/bin/mount -l", root_symlink = "mount") + mounts = self.getCmdOutputNow("/bin/mount -l", root_symlink = "mount") - self.collectExtOutput("/bin/findmnt") - self.collectExtOutput("/bin/df -al", root_symlink = "df") - self.collectExtOutput("/bin/df -ali") + self.addCmdOutput("/bin/findmnt") + self.addCmdOutput("/bin/df -al", root_symlink = "df") + self.addCmdOutput("/bin/df -ali") if self.getOption('lsof'): - self.collectExtOutput("/usr/sbin/lsof -b +M -n -l -P", root_symlink = "lsof") - self.collectExtOutput("/sbin/blkid -c /dev/null") - self.collectExtOutput("/usr/bin/lsblk") + self.addCmdOutput("/usr/sbin/lsof -b +M -n -l -P", root_symlink = "lsof") + self.addCmdOutput("/sbin/blkid -c /dev/null") + self.addCmdOutput("/usr/bin/lsblk") part_titlep = re.compile("^major") blankp = re.compile("^$") @@ -69,8 +69,8 @@ class filesys(Plugin, RedHatPlugin, UbuntuPlugin): devlist.append(dev) for i in devlist: - self.collectExtOutput("/sbin/parted -s %s print" % (i)) + self.addCmdOutput("/sbin/parted -s %s print" % (i)) if self.getOption('dumpe2fs'): for extfs in izip(self.doRegexFindAll(r"^(/dev/.+) on .+ type ext.\s+", mounts)): - self.collectExtOutput("/sbin/dumpe2fs %s" % (extfs)) + self.addCmdOutput("/sbin/dumpe2fs %s" % (extfs)) diff --git a/sos/plugins/general.py b/sos/plugins/general.py index 89370cdf..eccb1f57 100644 --- a/sos/plugins/general.py +++ b/sos/plugins/general.py @@ -42,19 +42,19 @@ class general(Plugin): "/root/anaconda-ks.cfg"]) limit = self.getOption("syslogsize") - self.collectExtOutput("/bin/dmesg", suggest_filename="dmesg_now") + self.addCmdOutput("/bin/dmesg", suggest_filename="dmesg_now") self.addCopySpecLimit("/var/log/messages*", sizelimit = limit) self.addCopySpecLimit("/var/log/secure*", sizelimit = limit) - self.collectExtOutput("/usr/bin/hostid") - self.collectExtOutput("/bin/hostname", root_symlink="hostname") - self.collectExtOutput("/bin/date", root_symlink="date") - self.collectExtOutput("/usr/bin/uptime", root_symlink="uptime") - self.collectExtOutput("/bin/dmesg") - self.collectExtOutput("/usr/sbin/alternatives --display java", + self.addCmdOutput("/usr/bin/hostid") + self.addCmdOutput("/bin/hostname", root_symlink="hostname") + self.addCmdOutput("/bin/date", root_symlink="date") + self.addCmdOutput("/usr/bin/uptime", root_symlink="uptime") + self.addCmdOutput("/bin/dmesg") + self.addCmdOutput("/usr/sbin/alternatives --display java", root_symlink="java") - self.collectExtOutput("/usr/bin/readlink -f /usr/bin/java") - self.collectExtOutput("/usr/bin/tree /var/lib") - self.collectExtOutput("/bin/ls -lR /var/lib") + self.addCmdOutput("/usr/bin/readlink -f /usr/bin/java") + self.addCmdOutput("/usr/bin/tree /var/lib") + self.addCmdOutput("/bin/ls -lR /var/lib") class RedHatGeneral(general, RedHatPlugin): diff --git a/sos/plugins/gluster.py b/sos/plugins/gluster.py index 957be6b4..0ce1295e 100644 --- a/sos/plugins/gluster.py +++ b/sos/plugins/gluster.py @@ -76,7 +76,7 @@ class gluster(Plugin, RedHatPlugin): pass def setup(self): - self.collectExtOutput("/usr/sbin/gluster peer status") + self.addCmdOutput("/usr/sbin/gluster peer status") # check package version handling rename of glusterfs-core -> glusterfs pkg = self.policy().pkgByName("glusterfs-core"); @@ -105,7 +105,7 @@ class gluster(Plugin, RedHatPlugin): self.addCopySpec("/etc/glusterfs") self.make_preparations(self.statedump_dir) - #self.collectExtOutput("killall -USR1 glusterfs glusterfsd") + #self.addCmdOutput("killall -USR1 glusterfs glusterfsd") os.system("killall -USR1 glusterfs glusterfsd"); # let all the processes catch the signal and create statedump file # entries. @@ -114,7 +114,7 @@ class gluster(Plugin, RedHatPlugin): self.addCopySpec('/tmp/glusterdump.options') self.addCopySpec(self.statedump_dir) - self.collectExtOutput("gluster volume status") + self.addCmdOutput("gluster volume status") # collect this last as some of the other actions create log entries self.addCopySpec("/var/log/glusterfs") diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py index 191a1541..0c420705 100644 --- a/sos/plugins/hardware.py +++ b/sos/plugins/hardware.py @@ -45,31 +45,31 @@ class hardware(Plugin): "/sys/state", "/sys/firmware/acpi/tables", "/var/log/mcelog"]) - 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") + self.addCmdOutput("""/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") - self.collectExtOutput("/usr/sbin/dmidecode", root_symlink = "dmidecode") + self.addCmdOutput("/usr/sbin/dmidecode", root_symlink = "dmidecode") if os.path.exists("/usr/bin/cpufreq-info"): - self.collectExtOutput("/usr/bin/cpufreq-info") + self.addCmdOutput("/usr/bin/cpufreq-info") if os.path.exists("/usr/bin/cpupower"): - self.collectExtOutput("/usr/bin/cpupower info") - self.collectExtOutput("/usr/bin/cpupower frequency-info") + self.addCmdOutput("/usr/bin/cpupower info") + self.addCmdOutput("/usr/bin/cpupower frequency-info") if self.policy().getArch().endswith("386"): - self.collectExtOutput("/usr/sbin/x86info -a") + self.addCmdOutput("/usr/sbin/x86info -a") if os.path.exists("/usr/bin/lsusb"): lsusb_path = "/usr/bin/lsusb" else: lsusb_path = "/usr/bin/lsusb" - self.collectExtOutput("%s"% lsusb_path) - self.collectExtOutput("%s -v"% lsusb_path) - self.collectExtOutput("%s -t"% lsusb_path) + self.addCmdOutput("%s"% lsusb_path) + self.addCmdOutput("%s -v"% lsusb_path) + self.addCmdOutput("%s -t"% lsusb_path) - self.collectExtOutput("/usr/bin/lshal") - self.collectExtOutput("/usr/bin/systool -c fc_host -v") - self.collectExtOutput("/usr/bin/systool -c scsi_host -v") + self.addCmdOutput("/usr/bin/lshal") + self.addCmdOutput("/usr/bin/systool -c fc_host -v") + self.addCmdOutput("/usr/bin/systool -c scsi_host -v") class RedHatHardware(hardware, RedHatPlugin): """hardware related information for Red Hat distribution @@ -80,7 +80,7 @@ class RedHatHardware(hardware, RedHatPlugin): hwpaths = glob("/usr/share/rhn/up2date*client/hardware.py") if (len(hwpaths) == 0): return - self.collectExtOutput(hwpaths[0]) + self.addCmdOutput(hwpaths[0]) class DebianHardware(hardware, DebianPlugin, UbuntuPlugin): diff --git a/sos/plugins/i18n.py b/sos/plugins/i18n.py index f53f411a..00c992c9 100644 --- a/sos/plugins/i18n.py +++ b/sos/plugins/i18n.py @@ -19,4 +19,4 @@ class i18n(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): """ def setup(self): self.addCopySpecs(["/etc/X11/xinit/xinput.d/*", "/etc/locale.conf"]) - self.collectExtOutput("/usr/bin/locale") + self.addCmdOutput("/usr/bin/locale") diff --git a/sos/plugins/infiniband.py b/sos/plugins/infiniband.py index 1afb4826..876ae5fb 100644 --- a/sos/plugins/infiniband.py +++ b/sos/plugins/infiniband.py @@ -30,10 +30,10 @@ class infiniband(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/etc/ofed/openib.conf", "/etc/ofed/opensm.conf"]) - self.collectExtOutput("/usr/bin/ibv_devices") - self.collectExtOutput("/usr/bin/ibv_devinfo") - self.collectExtOutput("/usr/sbin/ibstat") - self.collectExtOutput("/usr/sbin/ibstatus") - self.collectExtOutput("/usr/sbin/ibhosts") + self.addCmdOutput("/usr/bin/ibv_devices") + self.addCmdOutput("/usr/bin/ibv_devinfo") + self.addCmdOutput("/usr/sbin/ibstat") + self.addCmdOutput("/usr/sbin/ibstatus") + self.addCmdOutput("/usr/sbin/ibhosts") return diff --git a/sos/plugins/initrd.py b/sos/plugins/initrd.py index 2a3ecb3d..324d642d 100644 --- a/sos/plugins/initrd.py +++ b/sos/plugins/initrd.py @@ -20,7 +20,7 @@ class initrd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): """ def setup(self): for initrd in glob('/boot/initrd-*.img'): - self.collectExtOutput("/bin/zcat "+initrd+" | /bin/cpio "+ + self.addCmdOutput("/bin/zcat "+initrd+" | /bin/cpio "+ "--extract --to-stdout init" ) def defaultenabled(self): diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py index 64218b45..93f02f70 100644 --- a/sos/plugins/ipa.py +++ b/sos/plugins/ipa.py @@ -63,16 +63,16 @@ class ipa(Plugin, RedHatPlugin): self.addForbiddenPath("/etc/named.keytab") - self.collectExtOutput("ls -la /etc/dirsrv/slapd-*/schema/") + self.addCmdOutput("ls -la /etc/dirsrv/slapd-*/schema/") - self.collectExtOutput("ipa-getcert list") + self.addCmdOutput("ipa-getcert list") - self.collectExtOutput("certutil -L -d /etc/httpd/alias/") - self.collectExtOutput("certutil -L -d /etc/dirsrv/slapd-*/") + self.addCmdOutput("certutil -L -d /etc/httpd/alias/") + self.addCmdOutput("certutil -L -d /etc/dirsrv/slapd-*/") - self.collectExtOutput("klist -ket /etc/dirsrv/ds.keytab") - self.collectExtOutput("klist -ket /etc/httpd/conf/ipa.keytab") - self.collectExtOutput("klist -ket /etc/krb5.keytab") + self.addCmdOutput("klist -ket /etc/dirsrv/ds.keytab") + self.addCmdOutput("klist -ket /etc/httpd/conf/ipa.keytab") + self.addCmdOutput("klist -ket /etc/krb5.keytab") return diff --git a/sos/plugins/iscsi.py b/sos/plugins/iscsi.py index c02b9f62..28f93dd5 100644 --- a/sos/plugins/iscsi.py +++ b/sos/plugins/iscsi.py @@ -33,7 +33,7 @@ class RedHatIscsi(iscsi, RedHatPlugin): "/etc/iscsi/iscsid.conf", "/etc/iscsi/initiatorname.iscsi", "/var/lib/iscsi"]) - self.collectExtOutput("iscsiadm -m session -P 3") - self.collectExtOutput("iscsiadm -m node -P 3") - self.collectExtOutput("iscsiadm -m iface -P 1") - self.collectExtOutput("iscsiadm -m node --op=show") + self.addCmdOutput("iscsiadm -m session -P 3") + self.addCmdOutput("iscsiadm -m node -P 3") + self.addCmdOutput("iscsiadm -m iface -P 1") + self.addCmdOutput("iscsiadm -m node --op=show") diff --git a/sos/plugins/iscsitarget.py b/sos/plugins/iscsitarget.py index eadff90d..aa6fa37a 100644 --- a/sos/plugins/iscsitarget.py +++ b/sos/plugins/iscsitarget.py @@ -31,7 +31,7 @@ class RedHatIscsiTarget(Plugin, RedHatPlugin): def setup(self): self.addCopySpec("/etc/tgt/targets.conf") - self.collectExtOutput("tgtadm --lld iscsi --op show --mode target") + self.addCmdOutput("tgtadm --lld iscsi --op show --mode target") class DebianIscsiTarget(iscsitarget, DebianPlugin, UbuntuPlugin): """iscsi-target related information for Debian based distributions diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py index 4401cdc2..08ebb693 100644 --- a/sos/plugins/kernel.py +++ b/sos/plugins/kernel.py @@ -22,8 +22,8 @@ class kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): moduleFile = "" def setup(self): - self.collectExtOutput("/bin/uname -a", root_symlink = "uname") - self.moduleFile = self.collectOutputNow("/sbin/lsmod", root_symlink = "lsmod") + self.addCmdOutput("/bin/uname -a", root_symlink = "uname") + self.moduleFile = self.getCmdOutputNow("/sbin/lsmod", root_symlink = "lsmod") if self.getOption('modinfo'): runcmd = "" @@ -32,11 +32,11 @@ class kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): if '' != kmod.strip(): runcmd = runcmd + " " + kmod if len(runcmd): - self.collectExtOutput("/sbin/modinfo " + runcmd) + self.addCmdOutput("/sbin/modinfo " + runcmd) - self.collectExtOutput("/sbin/sysctl -a") + self.addCmdOutput("/sbin/sysctl -a") if os.path.isfile("/sbin/ksyms"): - self.collectExtOutput("/sbin/ksyms") + self.addCmdOutput("/sbin/ksyms") self.addCopySpecs([ "/proc/sys/kernel/random/boot_id", "/sys/module/*/parameters", @@ -63,4 +63,4 @@ class kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/proc/timer*", "/proc/lock*"]) - self.collectExtOutput("/usr/sbin/dkms status") + self.addCmdOutput("/usr/sbin/dkms status") diff --git a/sos/plugins/kernelrt.py b/sos/plugins/kernelrt.py index 5569ef48..a0e1e6d7 100644 --- a/sos/plugins/kernelrt.py +++ b/sos/plugins/kernelrt.py @@ -32,4 +32,4 @@ class kernel_rt(Plugin, RedHatPlugin): self.addCopySpec('/sys/devices/system/clocksource/clocksource0/available_clocksource') self.addCopySpec('/sys/devices/system/clocksource/clocksource0/current_clocksource') if self.isInstalled('tuna'): - self.collectExtOutput('/usr/bin/tuna -CP | /ust/bin/head -20') + self.addCmdOutput('/usr/bin/tuna -CP | /ust/bin/head -20') diff --git a/sos/plugins/kvm.py b/sos/plugins/kvm.py index a3e314a4..d7ad26f8 100644 --- a/sos/plugins/kvm.py +++ b/sos/plugins/kvm.py @@ -38,8 +38,8 @@ class kvm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): self.addCopySpec("/sys/module/kvm_amd/srcversion") self.addCopySpec("/sys/module/ksm/srcversion") if self.getOption('topOutput'): - self.collectExtOutput("/usr/bin/top -b -d 1 -n 5") - self.collectExtOutput("/usr/bin/kvm_stat --once") + self.addCmdOutput("/usr/bin/top -b -d 1 -n 5") + self.addCmdOutput("/usr/bin/kvm_stat --once") def postproc(self): if self._debugfs_cleanup and os.path.ismount("/sys/kernel/debug"): diff --git a/sos/plugins/libraries.py b/sos/plugins/libraries.py index 5f2210fb..7b41f624 100644 --- a/sos/plugins/libraries.py +++ b/sos/plugins/libraries.py @@ -24,5 +24,5 @@ class libraries(Plugin, RedHatPlugin, UbuntuPlugin): def setup(self): self.addCopySpecs(["/etc/ld.so.conf", "/etc/ld.so.conf.d"]) if self.getOption("ldconfigv"): - self.collectExtOutput("/sbin/ldconfig -v -N -X") - self.collectExtOutput("/sbin/ldconfig -p -N -X") + self.addCmdOutput("/sbin/ldconfig -v -N -X") + self.addCmdOutput("/sbin/ldconfig -p -N -X") diff --git a/sos/plugins/logrotate.py b/sos/plugins/logrotate.py index 660623ae..3766b7ef 100644 --- a/sos/plugins/logrotate.py +++ b/sos/plugins/logrotate.py @@ -19,7 +19,7 @@ class logrotate(Plugin, RedHatPlugin): """ def setup(self): - self.collectExtOutput("/usr/sbin/logrotate --debug /etc/logrotate.conf", + self.addCmdOutput("/usr/sbin/logrotate --debug /etc/logrotate.conf", suggest_filename = "logrotate_debug") self.addCopySpecs([ "/etc/logrotate*", diff --git a/sos/plugins/lsbrelease.py b/sos/plugins/lsbrelease.py index 5d3ca32c..d9c9a4b7 100644 --- a/sos/plugins/lsbrelease.py +++ b/sos/plugins/lsbrelease.py @@ -21,6 +21,6 @@ class lsbrelease(Plugin, RedHatPlugin): """ def setup(self): - self.collectExtOutput("/usr/bin/lsb_release -a") - self.collectExtOutput("/usr/bin/lsb_release -d", suggest_filename = "lsb_release", root_symlink = "lsb-release") + self.addCmdOutput("/usr/bin/lsb_release -a") + self.addCmdOutput("/usr/bin/lsb_release -d", suggest_filename = "lsb_release", root_symlink = "lsb-release") self.addCopySpec("/etc/lsb-release*") diff --git a/sos/plugins/memory.py b/sos/plugins/memory.py index 6fcaa955..ab786a2c 100644 --- a/sos/plugins/memory.py +++ b/sos/plugins/memory.py @@ -25,6 +25,6 @@ class memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/proc/slabinfo", "/proc/pagetypeinfo"]) - self.collectExtOutput("/bin/dmesg | grep -e 'e820.' -e 'aperature.'") - self.collectExtOutput("/usr/bin/free", root_symlink = "free") - self.collectExtOutput("/usr/bin/free -m") + self.addCmdOutput("/bin/dmesg | grep -e 'e820.' -e 'aperature.'") + self.addCmdOutput("/usr/bin/free", root_symlink = "free") + self.addCmdOutput("/usr/bin/free -m") diff --git a/sos/plugins/named.py b/sos/plugins/named.py index 36bff1ca..5740f298 100644 --- a/sos/plugins/named.py +++ b/sos/plugins/named.py @@ -41,7 +41,7 @@ class named(Plugin, RedHatPlugin): self.addCopySpec("/etc/named/") self.addCopySpec("/etc/sysconfig/named") - self.collectExtOutput("klist -ket /etc/named.keytab") + self.addCmdOutput("klist -ket /etc/named.keytab") self.addForbiddenPath("/etc/named.keytab") return diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py index d76024ba..92055007 100644 --- a/sos/plugins/networking.py +++ b/sos/plugins/networking.py @@ -58,7 +58,7 @@ class networking(Plugin, RedHatPlugin): (status, output, time) = self.callExtProg("/sbin/lsmod | grep -q "+tablename) if status == 0: cmd = "/sbin/iptables -t "+tablename+" -nvL" - self.collectExtOutput(cmd) + self.addCmdOutput(cmd) def setup(self): self.addCopySpecs([ @@ -70,40 +70,40 @@ class networking(Plugin, RedHatPlugin): "/etc/xinetd.d", "/etc/host*", "/etc/resolv.conf"]) - ipaddrFile=self.collectOutputNow("/sbin/ip -o addr", root_symlink = "ip_addr") + ipaddrFile=self.getCmdOutputNow("/sbin/ip -o addr", root_symlink = "ip_addr") ipaddrOut=self.callExtProg("/sbin/ip -o addr") - self.collectExtOutput("/sbin/route -n", root_symlink = "route") + self.addCmdOutput("/sbin/route -n", root_symlink = "route") self.collectIPTable("filter") self.collectIPTable("nat") self.collectIPTable("mangle") - self.collectExtOutput("/bin/netstat -s") - self.collectExtOutput("/bin/netstat -agn") - self.collectExtOutput("/bin/netstat -neopa", root_symlink = "netstat") - self.collectExtOutput("/sbin/ip route show table all") - self.collectExtOutput("/sbin/ip -6 route show table all") - self.collectExtOutput("/sbin/ip link") - self.collectExtOutput("/sbin/ip address") - self.collectExtOutput("/sbin/ifenslave -a") - self.collectExtOutput("/sbin/ip mroute show") - self.collectExtOutput("/sbin/ip maddr show") - self.collectExtOutput("/sbin/ip neigh show") + self.addCmdOutput("/bin/netstat -s") + self.addCmdOutput("/bin/netstat -agn") + self.addCmdOutput("/bin/netstat -neopa", root_symlink = "netstat") + self.addCmdOutput("/sbin/ip route show table all") + self.addCmdOutput("/sbin/ip -6 route show table all") + self.addCmdOutput("/sbin/ip link") + self.addCmdOutput("/sbin/ip address") + self.addCmdOutput("/sbin/ifenslave -a") + self.addCmdOutput("/sbin/ip mroute show") + self.addCmdOutput("/sbin/ip maddr show") + self.addCmdOutput("/sbin/ip neigh show") if ipaddrOut: for eth in self.get_interface_name(ipaddrOut): - self.collectExtOutput("/sbin/ethtool "+eth) - self.collectExtOutput("/sbin/ethtool -i "+eth) - self.collectExtOutput("/sbin/ethtool -k "+eth) - self.collectExtOutput("/sbin/ethtool -S "+eth) - self.collectExtOutput("/sbin/ethtool -a "+eth) - self.collectExtOutput("/sbin/ethtool -c "+eth) - self.collectExtOutput("/sbin/ethtool -g "+eth) + self.addCmdOutput("/sbin/ethtool "+eth) + self.addCmdOutput("/sbin/ethtool -i "+eth) + self.addCmdOutput("/sbin/ethtool -k "+eth) + self.addCmdOutput("/sbin/ethtool -S "+eth) + self.addCmdOutput("/sbin/ethtool -a "+eth) + self.addCmdOutput("/sbin/ethtool -c "+eth) + self.addCmdOutput("/sbin/ethtool -g "+eth) if self.getOption("traceroute"): - self.collectExtOutput("/bin/traceroute -n rhn.redhat.com") + self.addCmdOutput("/bin/traceroute -n rhn.redhat.com") if os.path.exists("/usr/sbin/brctl"): - brctlFile=self.collectExtOutput("/usr/sbin/brctl show") + brctlFile=self.addCmdOutput("/usr/sbin/brctl show") brctlOut=self.callExtProg("/usr/sbin/brctl show") if brctlOut: for brName in self.get_bridge_name(brctlOut): - self.collectExtOutput("/usr/sbin/brctl showstp "+brName) + self.addCmdOutput("/usr/sbin/brctl showstp "+brName) return diff --git a/sos/plugins/nfsserver.py b/sos/plugins/nfsserver.py index 876192ab..b1acbcf7 100644 --- a/sos/plugins/nfsserver.py +++ b/sos/plugins/nfsserver.py @@ -39,5 +39,5 @@ class nfsserver(Plugin, RedHatPlugin): "/var/lib/nfs/etab", "/var/lib/nfs/xtab", "/var/lib/nfs/rmtab"]) - self.collectExtOutput("/usr/sbin/rpcinfo -p localhost") - self.collectExtOutput("/usr/sbin/nfsstat -a") + self.addCmdOutput("/usr/sbin/rpcinfo -p localhost") + self.addCmdOutput("/usr/sbin/nfsstat -a") diff --git a/sos/plugins/ntp.py b/sos/plugins/ntp.py index c5b64026..b47ff4a8 100644 --- a/sos/plugins/ntp.py +++ b/sos/plugins/ntp.py @@ -21,5 +21,5 @@ class ntp(Plugin, RedHatPlugin): packages = ('ntp',) def setup(self): - self.collectExtOutput("/usr/bin/ntpstat") - self.collectExtOutput("/usr/sbin/ntptime") + self.addCmdOutput("/usr/bin/ntpstat") + self.addCmdOutput("/usr/sbin/ntptime") diff --git a/sos/plugins/openstack.py b/sos/plugins/openstack.py index edcfa3fe..a33185ab 100644 --- a/sos/plugins/openstack.py +++ b/sos/plugins/openstack.py @@ -89,28 +89,28 @@ class DebianOpenStack(openstack, DebianPlugin, UbuntuPlugin): def setup(self): # Nova if os.path.exists("/usr/bin/nova-manage"): - self.collectExtOutput( + self.addCmdOutput( "/usr/bin/nova-manage config list 2>/dev/null | sort", suggest_filename="nova_config_list") - self.collectExtOutput( + self.addCmdOutput( "/usr/bin/nova-manage service list 2>/dev/null", suggest_filename="nova_service_list") - self.collectExtOutput( + self.addCmdOutput( "/usr/bin/nova-manage db version 2>/dev/null", suggest_filename="nova_db_version") - self.collectExtOutput( + self.addCmdOutput( "/usr/bin/nova-manage fixed list 2>/dev/null", suggest_filename="nova_fixed_ip_list") - self.collectExtOutput( + self.addCmdOutput( "/usr/bin/nova-manage floating list 2>/dev/null", suggest_filename="nova_floating_ip_list") - self.collectExtOutput( + self.addCmdOutput( "/usr/bin/nova-manage flavor list 2>/dev/null", suggest_filename="nova_flavor_list") - self.collectExtOutput( + self.addCmdOutput( "/usr/bin/nova-manage network list 2>/dev/null", suggest_filename="nova_network_list") - self.collectExtOutput( + self.addCmdOutput( "/usr/bin/nova-manage vm list 2>/dev/null", suggest_filename="nova_vm_list") self.addCopySpecs(["/etc/nova/", @@ -120,7 +120,7 @@ class DebianOpenStack(openstack, DebianPlugin, UbuntuPlugin): "/etc/logrotate.d/nova-*"]) # Glance if os.path.exists("/usr/bin/glance-manage"): - self.collectExtOutput( + self.addCmdOutput( "/usr/bin/glance-manage db_version", suggest_filename="glance_db_version") self.addCopySpecs(["/etc/glance/", @@ -163,7 +163,7 @@ class RedHatOpenStack(openstack, RedHatPlugin): # If RHEL or Fedora then invoke script for openstack-status if (os.path.isfile('/etc/redhat-release') or os.path.isfile('/etc/fedora-release')): - self.collectExtOutput("/usr/bin/openstack-status") + self.addCmdOutput("/usr/bin/openstack-status") # Nova self.addCopySpecs(["/etc/nova/", diff --git a/sos/plugins/openswan.py b/sos/plugins/openswan.py index bd6a4fb0..fa1a99d2 100644 --- a/sos/plugins/openswan.py +++ b/sos/plugins/openswan.py @@ -28,5 +28,5 @@ class openswan(Plugin, RedHatPlugin): self.addCopySpecs([ "/etc/ipsec.conf", "/etc/ipsec.d"]) - self.collectExtOutput("/usr/sbin/ipsec verify") - self.collectExtOutput("/usr/sbin/ipsec barf") + self.addCmdOutput("/usr/sbin/ipsec verify") + self.addCmdOutput("/usr/sbin/ipsec barf") diff --git a/sos/plugins/pam.py b/sos/plugins/pam.py index dfd35416..e040f382 100644 --- a/sos/plugins/pam.py +++ b/sos/plugins/pam.py @@ -20,4 +20,4 @@ class pam(Plugin, RedHatPlugin): def setup(self): self.addCopySpec("/etc/pam.d") self.addCopySpec("/etc/security") - self.collectExtOutput("/bin/ls -lanF /lib*/security") + self.addCmdOutput("/bin/ls -lanF /lib*/security") diff --git a/sos/plugins/postfix.py b/sos/plugins/postfix.py index c0699356..b7748589 100644 --- a/sos/plugins/postfix.py +++ b/sos/plugins/postfix.py @@ -27,4 +27,4 @@ class postfix(Plugin, RedHatPlugin): "/etc/mail", "/etc/postfix/main.cf", "/etc/postfix/master.cf"]) - self.collectExtOutput("/usr/sbin/postconf") + self.addCmdOutput("/usr/sbin/postconf") diff --git a/sos/plugins/ppp.py b/sos/plugins/ppp.py index 0702b4fb..8c09b8c7 100644 --- a/sos/plugins/ppp.py +++ b/sos/plugins/ppp.py @@ -29,4 +29,4 @@ class ppp(Plugin, RedHatPlugin): "/etc/wvdial.conf", "/etc/ppp", "/var/log/ppp"]) - self.collectExtOutput("/usr/sbin/adsl-status") + self.addCmdOutput("/usr/sbin/adsl-status") diff --git a/sos/plugins/printing.py b/sos/plugins/printing.py index 986477a3..668139f0 100644 --- a/sos/plugins/printing.py +++ b/sos/plugins/printing.py @@ -26,6 +26,6 @@ class printing(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/etc/cups/lpoptions", "/etc/cups/ppd/*.ppd"]) self.addCopySpecLimit("/var/log/cups", sizelimit=self.isOptionEnabled("cupslogsize")) - self.collectExtOutput("/usr/bin/lpstat -t") - self.collectExtOutput("/usr/bin/lpstat -s") - self.collectExtOutput("/usr/bin/lpstat -d") + self.addCmdOutput("/usr/bin/lpstat -t") + self.addCmdOutput("/usr/bin/lpstat -s") + self.addCmdOutput("/usr/bin/lpstat -d") diff --git a/sos/plugins/process.py b/sos/plugins/process.py index ebe2ed4c..98b8a2fa 100644 --- a/sos/plugins/process.py +++ b/sos/plugins/process.py @@ -20,11 +20,11 @@ class process(Plugin, RedHatPlugin): """process information """ def setup(self): - self.collectExtOutput("/bin/ps auxwww", root_symlink = "ps") - self.collectExtOutput("/bin/ps auxwwwm") - self.collectExtOutput("/bin/ps alxwww") - self.collectExtOutput("/usr/bin/pstree", root_symlink = "pstree") - self.collectExtOutput("/usr/sbin/lsof -b +M -n -l", root_symlink = "lsof") + self.addCmdOutput("/bin/ps auxwww", root_symlink = "ps") + self.addCmdOutput("/bin/ps auxwwwm") + self.addCmdOutput("/bin/ps alxwww") + self.addCmdOutput("/usr/bin/pstree", root_symlink = "pstree") + self.addCmdOutput("/usr/sbin/lsof -b +M -n -l", root_symlink = "lsof") def find_mountpoint(s): if (os.path.ismount(s) or len(s)==0): return s diff --git a/sos/plugins/pxe.py b/sos/plugins/pxe.py index 313346fe..e0307351 100644 --- a/sos/plugins/pxe.py +++ b/sos/plugins/pxe.py @@ -24,7 +24,7 @@ class pxe(Plugin, RedHatPlugin): packages = ('system-config-netboot-cmd',) def setup(self): - self.collectExtOutput("/usr/sbin/pxeos -l") + self.addCmdOutput("/usr/sbin/pxeos -l") self.addCopySpec("/etc/dhcpd.conf") if self.getOption("tftpboot"): self.addCopySpec("/tftpboot") diff --git a/sos/plugins/qpidd.py b/sos/plugins/qpidd.py index aa343ad7..922cad80 100644 --- a/sos/plugins/qpidd.py +++ b/sos/plugins/qpidd.py @@ -22,15 +22,15 @@ class qpidd(Plugin, RedHatPlugin): def setup(self): """ performs data collection for mrg """ - self.collectExtOutput("/usr/bin/qpid-stat -e") - self.collectExtOutput("/usr/bin/qpid-stat -b") - self.collectExtOutput("/usr/bin/qpid-config") - self.collectExtOutput("/usr/bin/qpid-config -b exchanges") - self.collectExtOutput("/usr/bin/qpid-config -b queues") - self.collectExtOutput("/usr/bin/qpid-stat -c") - self.collectExtOutput("/usr/bin/qpid-route link list") - self.collectExtOutput("/usr/bin/qpid-route route list") - self.collectExtOutput("/bin/ls -lanR /var/lib/qpidd") + self.addCmdOutput("/usr/bin/qpid-stat -e") + self.addCmdOutput("/usr/bin/qpid-stat -b") + self.addCmdOutput("/usr/bin/qpid-config") + self.addCmdOutput("/usr/bin/qpid-config -b exchanges") + self.addCmdOutput("/usr/bin/qpid-config -b queues") + self.addCmdOutput("/usr/bin/qpid-stat -c") + self.addCmdOutput("/usr/bin/qpid-route link list") + self.addCmdOutput("/usr/bin/qpid-route route list") + self.addCmdOutput("/bin/ls -lanR /var/lib/qpidd") self.addCopySpecs([ "/etc/qpidd.conf", diff --git a/sos/plugins/rhn.py b/sos/plugins/rhn.py index 236d49de..72228bec 100644 --- a/sos/plugins/rhn.py +++ b/sos/plugins/rhn.py @@ -66,16 +66,16 @@ class rhn(Plugin, RedHatPlugin): "/var/log/nocpulse/TSDBLocalQueue/TSDBLocalQueue.log"]) self.addCopySpec("/root/ssl-build") - self.collectExtOutput("/usr/bin/rhn-schema-version", + self.addCmdOutput("/usr/bin/rhn-schema-version", root_symlink = "database-schema-version") - self.collectExtOutput("/usr/bin/rhn-charsets", + self.addCmdOutput("/usr/bin/rhn-charsets", root_symlink = "database-character-sets") if self.satellite: self.addCopySpecs(["/etc/tnsnames.ora", "/etc/jabberd", "/etc/tomcat6/", "/var/log/tomcat6/"]) if os.path.exists("/usr/bin/spacewalk-debug"): - self.collectExtOutput("/usr/bin/spacewalk-debug --dir %s" + self.addCmdOutput("/usr/bin/spacewalk-debug --dir %s" % os.path.join(self.cInfo['dstroot'], "sos_commands/rhn")) diff --git a/sos/plugins/rhui.py b/sos/plugins/rhui.py index 89462af7..39ef0416 100644 --- a/sos/plugins/rhui.py +++ b/sos/plugins/rhui.py @@ -37,7 +37,7 @@ class rhui(Plugin, RedHatPlugin): except: return - self.collectExtOutput("python %s %s --dir %s" + self.addCmdOutput("python %s %s --dir %s" % (self.rhui_debug_path, cds, rhui_debug_dst_path), suggest_filename="rhui-debug") return diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py index 7e500736..669231ff 100644 --- a/sos/plugins/rpm.py +++ b/sos/plugins/rpm.py @@ -24,7 +24,7 @@ class rpm(Plugin, RedHatPlugin): self.addCopySpec("/var/log/rpmpkgs") if self.getOption("rpmq"): - self.collectExtOutput("/bin/rpm -qa --qf=" + self.addCmdOutput("/bin/rpm -qa --qf=" "\"%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}~~" "%{INSTALLTIME:date}\t%{INSTALLTIME}\t%{VENDOR}\n\"" " --nosignature --nodigest | /bin/awk -F '~~' " @@ -32,4 +32,4 @@ class rpm(Plugin, RedHatPlugin): root_symlink = "installed-rpms") if self.getOption("rpmva"): - self.collectExtOutput("/bin/rpm -Va", root_symlink = "rpm-Va", timeout = 3600) + self.addCmdOutput("/bin/rpm -Va", root_symlink = "rpm-Va", timeout = 3600) diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py index b0b3472a..21fbd54e 100644 --- a/sos/plugins/s390.py +++ b/sos/plugins/s390.py @@ -51,20 +51,20 @@ class s390(Plugin, RedHatPlugin): "/etc/src_vipa.conf", "/etc/ccwgroup.conf", "/etc/chandev.conf"]) - self.collectExtOutput("/sbin/lscss") - self.collectExtOutput("/sbin/lsdasd") - self.collectExtOutput("/sbin/lstape") - self.collectExtOutput("find /sys -type f") - self.collectExtOutput("find /proc/s390dbf -type f") - self.collectExtOutput("/sbin/qethconf list_all") + self.addCmdOutput("/sbin/lscss") + self.addCmdOutput("/sbin/lsdasd") + self.addCmdOutput("/sbin/lstape") + self.addCmdOutput("find /sys -type f") + self.addCmdOutput("find /proc/s390dbf -type f") + self.addCmdOutput("/sbin/qethconf list_all") ret, dasdDev, rtime = self.callExtProg("/bin/ls /dev/dasd?") for x in dasdDev.split('\n'): - self.collectExtOutput("/sbin/dasdview -x -i -j -l -f %s" % (x,)) - self.collectExtOutput("/sbin/fdasd -p %s" % (x,)) + self.addCmdOutput("/sbin/dasdview -x -i -j -l -f %s" % (x,)) + self.addCmdOutput("/sbin/fdasd -p %s" % (x,)) try: rhelver = self.policy().rhelVersion() if rhelver == 5: - self.collectExtOutput("/sbin/lsqeth") - self.collectExtOutput("/sbin/lszfcp") + self.addCmdOutput("/sbin/lsqeth") + self.addCmdOutput("/sbin/lszfcp") except: rhelver = None diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py index 70273057..e998bdae 100644 --- a/sos/plugins/samba.py +++ b/sos/plugins/samba.py @@ -23,6 +23,6 @@ class samba(Plugin, RedHatPlugin): "/var/log/samba/*", "/etc/krb5.conf", "/etc/krb5.keytab"]) - self.collectExtOutput("/usr/bin/wbinfo -g") - self.collectExtOutput("/usr/bin/wbinfo -u") - self.collectExtOutput("/usr/bin/testparm -s -v") + self.addCmdOutput("/usr/bin/wbinfo -g") + self.addCmdOutput("/usr/bin/wbinfo -u") + self.addCmdOutput("/usr/bin/testparm -s -v") diff --git a/sos/plugins/sanlock.py b/sos/plugins/sanlock.py index 94cf3d6c..298ca9ff 100644 --- a/sos/plugins/sanlock.py +++ b/sos/plugins/sanlock.py @@ -22,9 +22,9 @@ class sanlock(Plugin): def setup(self): self.addCopySpec("/var/log/sanlock.log*") - self.collectExtOutput("sanlock client status -D") - self.collectExtOutput("sanlock client host_status -D") - self.collectExtOutput("sanlock client log_dump") + self.addCmdOutput("sanlock client status -D") + self.addCmdOutput("sanlock client host_status -D") + self.addCmdOutput("sanlock client log_dump") return class RedHatSanlock(sanlock, RedHatPlugin): diff --git a/sos/plugins/sar.py b/sos/plugins/sar.py index 26a4881f..d3085ba6 100644 --- a/sos/plugins/sar.py +++ b/sos/plugins/sar.py @@ -53,5 +53,5 @@ class sar(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): if sar_filename not in dirList: sar_command = "/bin/sh -c \"LANG=C /usr/bin/sar " \ + "-A -f /var/log/sa/" + fname + "\"" - self.collectExtOutput(sar_command, sar_filename) + self.addCmdOutput(sar_command, sar_filename) self.addCopySpec("/var/log/sa/sar*") diff --git a/sos/plugins/selinux.py b/sos/plugins/selinux.py index 95144138..ca7d4c9c 100644 --- a/sos/plugins/selinux.py +++ b/sos/plugins/selinux.py @@ -21,9 +21,9 @@ class selinux(Plugin, RedHatPlugin): def setup(self): # sestatus is always collected in checkenabled() self.addCopySpec("/etc/selinux") - self.collectExtOutput("/usr/bin/selinuxconfig") + self.addCmdOutput("/usr/bin/selinuxconfig") if self.getOption('fixfiles'): - self.collectExtOutput("/sbin/fixfiles check") + self.addCmdOutput("/sbin/fixfiles check") self.addForbiddenPath("/etc/selinux/targeted") if not self.policy().pkgByName('setroubleshoot'): @@ -35,12 +35,12 @@ class selinux(Plugin, RedHatPlugin): sealert=doRegexFindAll(r"^.*setroubleshoot:.*(sealert\s-l\s.*)","/var/log/messages") if sealert: for i in sealert: - self.collectExtOutput("%s" % i) + self.addCmdOutput("%s" % i) self.addAlert("There are numerous selinux errors present and "+ "possible fixes stated in the sealert output.") def checkenabled(self): try: - if self.collectOutputNow("/usr/sbin/sestatus", root_symlink = "sestatus").split(":")[1].strip() == "disabled": + if self.getCmdOutputNow("/usr/sbin/sestatus", root_symlink = "sestatus").split(":")[1].strip() == "disabled": return False except: pass diff --git a/sos/plugins/smartcard.py b/sos/plugins/smartcard.py index 49f0dc2c..b675f3f5 100644 --- a/sos/plugins/smartcard.py +++ b/sos/plugins/smartcard.py @@ -30,6 +30,6 @@ class smartcard(Plugin, RedHatPlugin): "/etc/reader.conf", "/etc/reader.conf.d/", "/etc/pam_pkcs11/"]) - self.collectExtOutput("/usr/bin/pkcs11_inspect debug") - self.collectExtOutput("/usr/bin/pklogin_finder debug") - self.collectExtOutput("/bin/ls -nl /usr/lib*/pam_pkcs11/") + self.addCmdOutput("/usr/bin/pkcs11_inspect debug") + self.addCmdOutput("/usr/bin/pklogin_finder debug") + self.addCmdOutput("/bin/ls -nl /usr/lib*/pam_pkcs11/") diff --git a/sos/plugins/soundcard.py b/sos/plugins/soundcard.py index c70729ba..2abd6886 100644 --- a/sos/plugins/soundcard.py +++ b/sos/plugins/soundcard.py @@ -27,8 +27,8 @@ class soundcard(Plugin, RedHatPlugin): "/proc/asound/*", "/etc/alsa/*", "/etc/asound.*"]) - self.collectExtOutput("/sbin/lspci | grep -i audio") - self.collectExtOutput("/usr/bin/aplay -l") - self.collectExtOutput("/usr/bin/aplay -L") - self.collectExtOutput("/usr/bin/amixer") - self.collectExtOutput("/sbin/lsmod | /bin/grep snd | /bin/awk '{print $1}'", suggest_filename = "sndmodules_loaded") + self.addCmdOutput("/sbin/lspci | grep -i audio") + self.addCmdOutput("/usr/bin/aplay -l") + self.addCmdOutput("/usr/bin/aplay -L") + self.addCmdOutput("/usr/bin/amixer") + self.addCmdOutput("/sbin/lsmod | /bin/grep snd | /bin/awk '{print $1}'", suggest_filename = "sndmodules_loaded") diff --git a/sos/plugins/startup.py b/sos/plugins/startup.py index a0b317ab..dcd7ac83 100644 --- a/sos/plugins/startup.py +++ b/sos/plugins/startup.py @@ -22,7 +22,7 @@ class startup(Plugin, RedHatPlugin): def setup(self): self.addCopySpec("/etc/rc.d") - self.collectExtOutput("/sbin/chkconfig --list", root_symlink = "chkconfig") + self.addCmdOutput("/sbin/chkconfig --list", root_symlink = "chkconfig") if self.getOption('servicestatus'): - self.collectExtOutput("/sbin/service --status-all") - self.collectExtOutput("/sbin/runlevel") + self.addCmdOutput("/sbin/service --status-all") + self.addCmdOutput("/sbin/runlevel") diff --git a/sos/plugins/sunrpc.py b/sos/plugins/sunrpc.py index cd472e50..3d45ac50 100644 --- a/sos/plugins/sunrpc.py +++ b/sos/plugins/sunrpc.py @@ -30,7 +30,7 @@ class sunrpc(Plugin): return False def setup(self): - self.collectExtOutput("/usr/sbin/rpcinfo -p localhost") + self.addCmdOutput("/usr/sbin/rpcinfo -p localhost") return class RedHatSunrpc(sunrpc, RedHatPlugin): @@ -48,7 +48,7 @@ class RedHatSunrpc(sunrpc, RedHatPlugin): # service = 'rpcbind-boot' # # def setup(self): -# self.collectExtOutput("/usr/sbin/rpcinfo -p localhost") +# self.addCmdOutput("/usr/sbin/rpcinfo -p localhost") # return diff --git a/sos/plugins/system.py b/sos/plugins/system.py index 455e179c..0e9977e2 100644 --- a/sos/plugins/system.py +++ b/sos/plugins/system.py @@ -34,5 +34,5 @@ class system(Plugin, RedHatPlugin): self.addForbiddenPath( "/proc/sys/net/ipv6/neigh/*/base_reachable_time") - self.collectExtOutput("/usr/bin/crontab -l") + self.addCmdOutput("/usr/bin/crontab -l") diff --git a/sos/plugins/systemd.py b/sos/plugins/systemd.py index d6eeead9..b9c2434b 100644 --- a/sos/plugins/systemd.py +++ b/sos/plugins/systemd.py @@ -27,19 +27,19 @@ class systemd(Plugin, RedHatPlugin): files = ('/usr/lib/systemd/systemd',) def setup(self): - self.collectExtOutput("systemctl show --all") - self.collectExtOutput("systemctl list-units --failed") - self.collectExtOutput("systemctl list-unit-files") - self.collectExtOutput("systemctl list-units --all") - self.collectExtOutput("systemctl dump") - self.collectExtOutput("systemd-delta") - self.collectExtOutput("journalctl --verify") - self.collectExtOutput("journalctl --all --this-boot --no-pager") - self.collectExtOutput("journalctl --all --this-boot --no-pager -o verbose") - self.collectExtOutput("ls -l /lib/systemd") - self.collectExtOutput("ls -l /lib/systemd/system-shutdown") - self.collectExtOutput("ls -l /lib/systemd/system-generators") - self.collectExtOutput("ls -l /lib/systemd/user-generators") + self.addCmdOutput("systemctl show --all") + self.addCmdOutput("systemctl list-units --failed") + self.addCmdOutput("systemctl list-unit-files") + self.addCmdOutput("systemctl list-units --all") + self.addCmdOutput("systemctl dump") + self.addCmdOutput("systemd-delta") + self.addCmdOutput("journalctl --verify") + self.addCmdOutput("journalctl --all --this-boot --no-pager") + self.addCmdOutput("journalctl --all --this-boot --no-pager -o verbose") + self.addCmdOutput("ls -l /lib/systemd") + self.addCmdOutput("ls -l /lib/systemd/system-shutdown") + self.addCmdOutput("ls -l /lib/systemd/system-generators") + self.addCmdOutput("ls -l /lib/systemd/user-generators") self.addCopySpecs(["/etc/systemd", "/lib/systemd/system", diff --git a/sos/plugins/systemtap.py b/sos/plugins/systemtap.py index 93e5b967..19ea5607 100644 --- a/sos/plugins/systemtap.py +++ b/sos/plugins/systemtap.py @@ -24,5 +24,5 @@ class systemtap(Plugin, RedHatPlugin): packages = ('systemtap', 'systemtap-runtime') def setup(self): - self.collectExtOutput("/usr/bin/stap -V 2") - self.collectExtOutput("/bin/uname -r") + self.addCmdOutput("/usr/bin/stap -V 2") + self.addCmdOutput("/bin/uname -r") diff --git a/sos/plugins/sysvipc.py b/sos/plugins/sysvipc.py index 9411641b..4294978c 100644 --- a/sos/plugins/sysvipc.py +++ b/sos/plugins/sysvipc.py @@ -26,4 +26,4 @@ class sysvipc(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/proc/sysvipc/msg", "/proc/sysvipc/sem", "/proc/sysvipc/shm"]) - self.collectExtOutput("/usr/bin/ipcs") + self.addCmdOutput("/usr/bin/ipcs") diff --git a/sos/plugins/tftpserver.py b/sos/plugins/tftpserver.py index 7c70aa86..e39bf0fe 100644 --- a/sos/plugins/tftpserver.py +++ b/sos/plugins/tftpserver.py @@ -25,4 +25,4 @@ class tftpserver(Plugin, RedHatPlugin): packages = ('tftp-server',) def setup(self): - self.collectExtOutput("/bin/ls -lanR /tftpboot") + self.addCmdOutput("/bin/ls -lanR /tftpboot") diff --git a/sos/plugins/vmware.py b/sos/plugins/vmware.py index 66826443..e75b5a91 100644 --- a/sos/plugins/vmware.py +++ b/sos/plugins/vmware.py @@ -22,7 +22,7 @@ class vmware(Plugin, RedHatPlugin): files = ('/usr/bin/vmware','/usr/init.d/vmware-tools') def setup(self): - self.collectExtOutput("/usr/bin/vmware -v") + self.addCmdOutput("/usr/bin/vmware -v") self.addCopySpecs(["/etc/vmware/locations", "/etc/vmware/config", "/proc/vmmemctl"]) diff --git a/sos/plugins/xen.py b/sos/plugins/xen.py index be0f6b9c..7a168709 100644 --- a/sos/plugins/xen.py +++ b/sos/plugins/xen.py @@ -49,9 +49,9 @@ class xen(Plugin, RedHatPlugin): "/proc/xen/xsd_kva", "/proc/xen/xsd_port"]) # determine if CPU has PAE support - self.collectExtOutput("/bin/grep pae /proc/cpuinfo") + self.addCmdOutput("/bin/grep pae /proc/cpuinfo") # determine if CPU has Intel-VT or AMD-V support - self.collectExtOutput("/bin/egrep -e 'vmx|svm' /proc/cpuinfo") + self.addCmdOutput("/bin/egrep -e 'vmx|svm' /proc/cpuinfo") def setup(self): host_type = self.determineXenHost() @@ -73,15 +73,15 @@ class xen(Plugin, RedHatPlugin): "/sys/hypervisor/compilation", "/sys/hypervisor/properties", "/sys/hypervisor/type"]) - self.collectExtOutput("/usr/sbin/xm dmesg") - self.collectExtOutput("/usr/sbin/xm info") - self.collectExtOutput("/usr/sbin/xm list") - self.collectExtOutput("/usr/sbin/xm list --long") - self.collectExtOutput("/usr/sbin/brctl show") + self.addCmdOutput("/usr/sbin/xm dmesg") + self.addCmdOutput("/usr/sbin/xm info") + self.addCmdOutput("/usr/sbin/xm list") + self.addCmdOutput("/usr/sbin/xm list --long") + self.addCmdOutput("/usr/sbin/brctl show") self.domCollectProc() if self.is_running_xenstored(): self.addCopySpec("/sys/hypervisor/uuid") - self.collectExtOutput("/usr/bin/xenstore-ls") + self.addCmdOutput("/usr/bin/xenstore-ls") else: # we need tdb instead of xenstore-ls if cannot get it. self.addCopySpec("/var/lib/xenstored/tdb") diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py index 9d57eba9..4120d50b 100644 --- a/sos/plugins/yum.py +++ b/sos/plugins/yum.py @@ -35,7 +35,7 @@ class yum(Plugin, RedHatPlugin): "/var/log/yum.log"]) # Get a list of channels the machine is subscribed to. - self.collectExtOutput("/usr/bin/yum -C repolist") + self.addCmdOutput("/usr/bin/yum -C repolist") # candlepin info self.addForbiddenPath("/etc/pki/entitlements/key.pem") @@ -47,18 +47,18 @@ class yum(Plugin, RedHatPlugin): "/etc/rhsm/", "/var/log/rhsm/rhsm.log", "/var/log/rhsm/rhsmcertd.log"]) - self.collectExtOutput("subscription-manager list --installed") - self.collectExtOutput("subscription-manager list --consumed") + self.addCmdOutput("subscription-manager list --installed") + self.addCmdOutput("subscription-manager list --consumed") if self.getOption("yumlist"): # List various information about available packages - self.collectExtOutput("/usr/bin/yum list") + self.addCmdOutput("/usr/bin/yum list") if self.getOption("yumdebug") and self.isInstalled('yum-utils'): # RHEL6+ alternative for this whole function: - # self.collectExtOutput("/usr/bin/yum-debug-dump '%s'" % os.path.join(self.cInfo['dstroot'],"yum-debug-dump")) + # self.addCmdOutput("/usr/bin/yum-debug-dump '%s'" % os.path.join(self.cInfo['dstroot'],"yum-debug-dump")) ret, output, rtime = self.callExtProg("/usr/bin/yum-debug-dump") try: - self.collectExtOutput("/bin/zcat %s" % (output.split()[-1],)) + self.addCmdOutput("/bin/zcat %s" % (output.split()[-1],)) except IndexError: pass |