diff options
49 files changed, 321 insertions, 297 deletions
diff --git a/sos/plugins/acpid.py b/sos/plugins/acpid.py index ab452b29..24ec432c 100644 --- a/sos/plugins/acpid.py +++ b/sos/plugins/acpid.py @@ -18,5 +18,6 @@ class acpid(sos.plugintools.PluginBase): """acpid related information """ def setup(self): - self.addCopySpec("/var/log/acpid*") - self.addCopySpec("/etc/acpi/events/power.conf") + self.addCopySpecs([ + "/var/log/acpid*", + "/etc/acpi/events/power.conf"]) diff --git a/sos/plugins/amd.py b/sos/plugins/amd.py index b0c7d346..8bfcfcc8 100644 --- a/sos/plugins/amd.py +++ b/sos/plugins/amd.py @@ -25,9 +25,10 @@ class amd(sos.plugintools.PluginBase): return self.isInstalled("am-utils") or exists("/etc/rc.d/init.d/amd") def setup(self): - self.addCopySpec("/etc/amd.*") - self.addCopySpec("/etc/rc.d/init.d/amd") - self.addCopySpec("/etc/sysconfig/amd") + self.addCopySpecs([ + "/etc/amd.*", + "/etc/rc.d/init.d/amd", + "/etc/sysconfig/amd"]) self.collectExtOutput("/bin/rpm -qV am-utils") self.collectExtOutput("/bin/egrep -e 'automount|pid.*nfs' /proc/mounts") self.collectExtOutput("/bin/mount | egrep -e 'automount|pid.*nfs'") diff --git a/sos/plugins/anaconda.py b/sos/plugins/anaconda.py index 4d4ae9c6..aa7d4d1f 100644 --- a/sos/plugins/anaconda.py +++ b/sos/plugins/anaconda.py @@ -22,9 +22,10 @@ class anaconda(sos.plugintools.PluginBase): return exists("/var/log/anaconda.log") def setup(self): - self.addCopySpec("/root/anaconda-ks.cfg") - self.addCopySpec("/root/install.log") - self.addCopySpec("/root/install.log.syslog") - self.addCopySpec("/var/log/anaconda.log") - self.addCopySpec("/var/log/anaconda.syslog") - self.addCopySpec("/var/log/anaconda.xlog") + self.addCopySpecs([ + "/root/anaconda-ks.cfg", + "/root/install.log", + "/root/install.log.syslog", + "/var/log/anaconda.log", + "/var/log/anaconda.syslog", + "/var/log/anaconda.xlog"]) diff --git a/sos/plugins/apache.py b/sos/plugins/apache.py index 4cde3f60..4a41de11 100644 --- a/sos/plugins/apache.py +++ b/sos/plugins/apache.py @@ -20,7 +20,8 @@ class apache(sos.plugintools.PluginBase): 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.addCopySpecs([ + "/etc/httpd/conf/httpd.conf", + "/etc/httpd/conf.d/*.conf"]) if self.getOption("log"): self.addCopySpec("/var/log/httpd/*") diff --git a/sos/plugins/auditd.py b/sos/plugins/auditd.py index 53b35541..c76bf5f8 100644 --- a/sos/plugins/auditd.py +++ b/sos/plugins/auditd.py @@ -21,6 +21,5 @@ class auditd(sos.plugintools.PluginBase): optionList = [("syslogsize", "max size (MiB) to collect per syslog file", "", 15)] def setup(self): - self.addCopySpec("/etc/audit/auditd.conf") - self.addCopySpec("/etc/audit/audit.rules") + self.addCopySpecs(["/etc/audit/auditd.conf", "/etc/audit/audit.rules"]) self.addCopySpecLimit("/var/log/audit*", sizelimit = self.getOption("syslogsize")) diff --git a/sos/plugins/autofs.py b/sos/plugins/autofs.py index 2026089d..9d486a1a 100644 --- a/sos/plugins/autofs.py +++ b/sos/plugins/autofs.py @@ -44,9 +44,10 @@ class autofs(sos.plugintools.PluginBase): return i[1] def setup(self): - self.addCopySpec("/etc/auto*") - self.addCopySpec("/etc/sysconfig/autofs") - self.addCopySpec("/etc/init.d/autofs") + self.addCopySpecs([ + "/etc/auto*", + "/etc/sysconfig/autofs", + "/etc/init.d/autofs"]) self.collectExtOutput("/bin/rpm -qV autofs") self.collectExtOutput("/etc/init.d/autofs status") self.collectExtOutput("ps auxwww | grep automount") diff --git a/sos/plugins/bootloader.py b/sos/plugins/bootloader.py index 40a80cb4..9576f27e 100644 --- a/sos/plugins/bootloader.py +++ b/sos/plugins/bootloader.py @@ -18,13 +18,13 @@ class bootloader(sos.plugintools.PluginBase): """Bootloader information """ def setup(self): - self.addCopySpec("/etc/lilo.conf") - self.addCopySpec("/etc/milo.conf") - self.addCopySpec("/etc/silo.conf") - self.addCopySpec("/boot/efi/efi/redhat/elilo.conf") - self.addCopySpec("/boot/grub/grub.conf") - self.addCopySpec("/boot/grub/device.map") - self.addCopySpec("/boot/yaboot.conf") - + self.addCopySpecs([ + "/etc/lilo.conf", + "/etc/milo.conf", + "/etc/silo.conf", + "/boot/efi/efi/redhat/elilo.conf", + "/boot/grub/grub.conf", + "/boot/grub/device.map", + "/boot/yaboot.conf"]) self.collectExtOutput("/sbin/lilo -q") self.collectExtOutput("/bin/ls -laR /boot") diff --git a/sos/plugins/corosync.py b/sos/plugins/corosync.py index 722f7aee..785245f6 100644 --- a/sos/plugins/corosync.py +++ b/sos/plugins/corosync.py @@ -27,14 +27,15 @@ class corosync(sos.plugintools.PluginBase): return sos.plugintools.PluginBase.checkenabled(self) def setup(self): - self.addCopySpec("/etc/corosync") + self.addCopySpecs([ + "/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.addCopySpec("/var/lib/corosync/fdata") 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.callExtProg("killall -USR2 corosync") - self.addCopySpec("/var/log/cluster/corosync.log") diff --git a/sos/plugins/cs.py b/sos/plugins/cs.py index 9b8a9569..731e7ad5 100644 --- a/sos/plugins/cs.py +++ b/sos/plugins/cs.py @@ -50,34 +50,38 @@ class cs(sos.plugintools.PluginBase): self.addAlert("Red Hat Certificate System not found.") return if csversion == 71: - self.addCopySpec("/opt/redhat-cs/slapd-*/logs/access") - self.addCopySpec("/opt/redhat-cs/slapd-*/logs/errors") - self.addCopySpec("/opt/redhat-cs/slapd-*/config/dse.ldif") - self.addCopySpec("/opt/redhat-cs/cert-*/errors") - self.addCopySpec("/opt/redhat-cs/cert-*/config/CS.cfg") - self.addCopySpec("/opt/redhat-cs/cert-*/access") - self.addCopySpec("/opt/redhat-cs/cert-*/errors") - self.addCopySpec("/opt/redhat-cs/cert-*/system") - self.addCopySpec("/opt/redhat-cs/cert-*/transactions") - self.addCopySpec("/opt/redhat-cs/cert-*/debug") - self.addCopySpec("/opt/redhat-cs/cert-*/tps-debug.log") + self.addCopySpecs([ + "/opt/redhat-cs/slapd-*/logs/access", + "/opt/redhat-cs/slapd-*/logs/errors", + "/opt/redhat-cs/slapd-*/config/dse.ldif", + "/opt/redhat-cs/cert-*/errors", + "/opt/redhat-cs/cert-*/config/CS.cfg", + "/opt/redhat-cs/cert-*/access", + "/opt/redhat-cs/cert-*/errors", + "/opt/redhat-cs/cert-*/system", + "/opt/redhat-cs/cert-*/transactions", + "/opt/redhat-cs/cert-*/debug", + "/opt/redhat-cs/cert-*/tps-debug.log"]) if csversion == 73: - self.addCopySpec("/var/lib/rhpki-*/conf/*cfg*") - self.addCopySpec("/var/lib/rhpki-*/conf/*.ldif") - self.addCopySpec("/var/lib/rhpki-*/logs/debug") - self.addCopySpec("/var/lib/rhpki-*/logs/catalina.*") - self.addCopySpec("/var/lib/rhpki-*/logs/ra-debug.log") - self.addCopySpec("/var/lib/rhpki-*/logs/transactions") - self.addCopySpec("/var/lib/rhpki-*/logs/system") + self.addCopySpecs([ + "/var/lib/rhpki-*/conf/*cfg*", + "/var/lib/rhpki-*/conf/*.ldif", + "/var/lib/rhpki-*/logs/debug", + "/var/lib/rhpki-*/logs/catalina.*", + "/var/lib/rhpki-*/logs/ra-debug.log", + "/var/lib/rhpki-*/logs/transactions", + "/var/lib/rhpki-*/logs/system"]) if csversion in (73, 8): - self.addCopySpec("/etc/dirsrv/slapd-*/dse.ldif") - self.addCopySpec("/var/log/dirsrv/slapd-*/access") - self.addCopySpec("/var/log/dirsrv/slapd-*/errors") + self.addCopySpecs([ + "/etc/dirsrv/slapd-*/dse.ldif", + "/var/log/dirsrv/slapd-*/access", + "/var/log/dirsrv/slapd-*/errors"]) if csversion == 8: - self.addCopySpec("/etc/pki-*/CS.cfg") - self.addCopySpec("/var/lib/pki-*/conf/*cfg*") - self.addCopySpec("/var/log/pki-*/debug") - self.addCopySpec("/var/log/pki-*/catalina.*") - self.addCopySpec("/var/log/pki-*/ra-debug.log") - self.addCopySpec("/var/log/pki-*/transactions") - self.addCopySpec("/var/log/pki-*/system") + self.addCopySpecs([ + "/etc/pki-*/CS.cfg", + "/var/lib/pki-*/conf/*cfg*", + "/var/log/pki-*/debug", + "/var/log/pki-*/catalina.*", + "/var/log/pki-*/ra-debug.log", + "/var/log/pki-*/transactions", + "/var/log/pki-*/system"]) diff --git a/sos/plugins/devicemapper.py b/sos/plugins/devicemapper.py index 69c82952..a04c0e6d 100644 --- a/sos/plugins/devicemapper.py +++ b/sos/plugins/devicemapper.py @@ -41,10 +41,10 @@ class devicemapper(sos.plugintools.PluginBase): self.collectExtOutput("/usr/sbin/vgs -v") self.collectExtOutput("/sbin/mdadm -D /dev/md*") - self.addCopySpec("/etc/lvm") - - self.addCopySpec("/etc/multipath.conf") - self.addCopySpec("/var/lib/multipath/bindings") + self.addCopySpecs([ + "/etc/lvm", + "/etc/multipath.conf", + "/var/lib/multipath/bindings"]) self.collectExtOutput("/sbin/multipath -v4 -ll") self.collectExtOutput("/usr/bin/systool -v -c -b scsi") diff --git a/sos/plugins/dhcp.py b/sos/plugins/dhcp.py index 336f10ea..8a109471 100644 --- a/sos/plugins/dhcp.py +++ b/sos/plugins/dhcp.py @@ -23,6 +23,7 @@ class dhcp(sos.plugintools.PluginBase): return sos.plugintools.PluginBase.checkenabled(self) def setup(self): - self.addCopySpec("/etc/sysconfig/dhcrelay") - self.addCopySpec("/etc/sysconfig/dhcpd") - self.addCopySpec("/etc/dhcpd.conf") + self.addCopySpecs([ + "/etc/sysconfig/dhcrelay", + "/etc/sysconfig/dhcpd", + "/etc/dhcpd.conf"]) diff --git a/sos/plugins/ds.py b/sos/plugins/ds.py index 979a8dd5..ca8a4b2a 100644 --- a/sos/plugins/ds.py +++ b/sos/plugins/ds.py @@ -43,8 +43,10 @@ class ds(sos.plugintools.PluginBase): if not self.check_version(): self.addAlert("Directory Server not found.") elif "ds8" in self.check_version(): - self.addCopySpec("/etc/dirsrv/slapd*") - self.addCopySpec("/var/log/dirsrv/*") + self.addCopySpecs([ + "/etc/dirsrv/slapd*", + "/var/log/dirsrv/*"]) elif "ds7" in self.check_version(): - self.addCopySpec("/opt/redhat-ds/slapd-*/config") - self.addCopySpec("/opt/redhat-ds/slapd-*/logs") + self.addCopySpecs([ + "/opt/redhat-ds/slapd-*/config", + "/opt/redhat-ds/slapd-*/logs"]) diff --git a/sos/plugins/emc.py b/sos/plugins/emc.py index 6c9fd2c4..70c27276 100644 --- a/sos/plugins/emc.py +++ b/sos/plugins/emc.py @@ -37,15 +37,16 @@ class emc(sos.plugintools.PluginBase): """ EMC PowerPath specific information - files """ self.collectExtOutput("/sbin/powermt version") - self.addCopySpec("/etc/init.d/PowerPath") - self.addCopySpec("/etc/powermt.custom") - self.addCopySpec("/etc/emcp_registration") - self.addCopySpec("/etc/emc/mpaa.excluded") - self.addCopySpec("/etc/emc/mpaa.lams") - self.addCopySpec("/etc/emcp_devicesDB.dat") - self.addCopySpec("/etc/emcp_devicesDB.idx") - self.addCopySpec("/etc/emc/powerkmd.custom") - self.addCopySpec("/etc/modprobe.conf.pp") + self.addCopySpecs([ + "/etc/init.d/PowerPath", + "/etc/powermt.custom", + "/etc/emcp_registration", + "/etc/emc/mpaa.excluded", + "/etc/emc/mpaa.lams", + "/etc/emcp_devicesDB.dat", + "/etc/emcp_devicesDB.idx", + "/etc/emc/powerkmd.custom", + "/etc/modprobe.conf.pp"]) def get_pp_config(self): """ EMC PowerPath specific information - commands @@ -61,9 +62,10 @@ class emc(sos.plugintools.PluginBase): def get_symcli_files(self): """ EMC Solutions Enabler SYMCLI specific information - files """ - self.addCopySpec("/var/symapi/db/symapi_db.bin") - self.addCopySpec("/var/symapi/config/[a-z]*") - self.addCopySpec("/var/symapi/log/[a-z]*") + self.addCopySpecs([ + "/var/symapi/db/symapi_db.bin", + "/var/symapi/config/[a-z]*", + "/var/symapi/log/[a-z]*"]) def get_symcli_config(self): """ EMC Solutions Enabler SYMCLI specific information - Symmetrix/DMX - commands @@ -117,11 +119,12 @@ class emc(sos.plugintools.PluginBase): def get_navicli_config(self): """ EMC Navisphere Host Agent NAVICLI specific information - files """ - self.addCopySpec("/etc/Navisphere/agent.config") - self.addCopySpec("/etc/Navisphere/Navimon.cfg") - self.addCopySpec("/etc/Navisphere/Quietmode.cfg") - self.addCopySpec("/etc/Navisphere/messages/[a-z]*") - self.addCopySpec("/etc/Navisphere/log/[a-z]*") + self.addCopySpecs([ + "/etc/Navisphere/agent.config", + "/etc/Navisphere/Navimon.cfg", + "/etc/Navisphere/Quietmode.cfg", + "/etc/Navisphere/messages/[a-z]*", + "/etc/Navisphere/log/[a-z]*"]) def get_navicli_SP_info(self,SP_address): """ EMC Navisphere Host Agent NAVICLI specific information - CLARiiON - commands diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py index 18e0ed59..86d5d46b 100644 --- a/sos/plugins/filesys.py +++ b/sos/plugins/filesys.py @@ -24,14 +24,15 @@ class filesys(sos.plugintools.PluginBase): optionList = [("dumpe2fs", 'dump filesystem information', 'slow', False)] def setup(self): - self.addCopySpec("/proc/filesystems") - self.addCopySpec("/etc/fstab") - self.addCopySpec("/proc/self/mounts") - self.addCopySpec("/proc/mounts") - self.addCopySpec("/proc/mdstat") - self.addCopySpec("/etc/raidtab") + self.addCopySpecs([ + "/proc/filesystems", + "/etc/fstab", + "/proc/self/mounts", + "/proc/mounts", + "/proc/mdstat", + "/etc/raidtab", + "/etc/mdadm.conf"]) mounts = self.collectOutputNow("/bin/mount -l", root_symlink = "mount") - self.addCopySpec("/etc/mdadm.conf") self.collectExtOutput("/bin/findmnt") self.collectExtOutput("/bin/df -al", root_symlink = "df") diff --git a/sos/plugins/general.py b/sos/plugins/general.py index c4661a69..79c61d83 100644 --- a/sos/plugins/general.py +++ b/sos/plugins/general.py @@ -25,30 +25,29 @@ class general(sos.plugintools.PluginBase): ("all_logs", "collect all log files defined in syslog.conf", "", False)] def setup(self): - self.addCopySpec("/etc/redhat-release") - self.addCopySpec("/etc/fedora-release") - self.addCopySpec("/etc/inittab") - self.addCopySpec("/etc/sos.conf") - self.addCopySpec("/etc/sysconfig") - self.addCopySpec("/proc/stat") - # Capture dmesg from system start - self.addCopySpec("/var/log/dmesg") - # Capture second dmesg from time of sos run + self.addCopySpecs([ + "/etc/redhat-release", + "/etc/fedora-release", + "/etc/inittab", + "/etc/sos.conf", + "/etc/sysconfig", + "/proc/stat", + "/var/log/dmesg", + "/var/log/sa", + "/var/log/pm/suspend.log", + "/var/log/up2date", + "/etc/hostid", + "/var/lib/dbus/machine-id", + "/etc/exports", + "/root/anaconda-ks.cfg"]) self.collectExtOutput("/bin/dmesg", suggest_filename="dmesg_now") self.addCopySpecLimit("/var/log/messages*", sizelimit = self.getOption("syslogsize")) self.addCopySpecLimit("/var/log/secure*", sizelimit = self.getOption("syslogsize")) - self.addCopySpec("/var/log/sa") - self.addCopySpec("/var/log/pm/suspend.log") - self.addCopySpec("/var/log/up2date") self.collectExtOutput("/usr/bin/hostid") - self.addCopySpec("/etc/hostid") - self.addCopySpec("/var/lib/dbus/machine-id") - self.addCopySpec("/etc/exports") 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.addCopySpec("/root/anaconda-ks.cfg") self.collectExtOutput("/usr/sbin/alternatives --display java", root_symlink = "java") self.collectExtOutput("/usr/bin/readlink -f /usr/bin/java") diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py index c6ecf4b1..62f0af02 100644 --- a/sos/plugins/hardware.py +++ b/sos/plugins/hardware.py @@ -18,24 +18,25 @@ class hardware(sos.plugintools.PluginBase): """hardware related information """ def setup(self): - self.addCopySpec("/proc/partitions") - self.addCopySpec("/proc/cpuinfo") - self.addCopySpec("/proc/meminfo") - self.addCopySpec("/proc/ioports") - self.addCopySpec("/proc/interrupts") - self.addCopySpec("/proc/scsi") - self.addCopySpec("/proc/dma") - self.addCopySpec("/proc/devices") - self.addCopySpec("/proc/rtc") - self.addCopySpec("/proc/ide") - self.addCopySpec("/proc/bus") - self.addCopySpec("/etc/stinit.def") - self.addCopySpec("/etc/sysconfig/hwconf") - self.addCopySpec("/proc/chandev") - self.addCopySpec("/proc/dasd") - self.addCopySpec("/proc/s390dbf/tape") - self.addCopySpec("/sys/bus/scsi") - self.addCopySpec("/sys/state") + self.addCopySpecs([ + "/proc/partitions", + "/proc/cpuinfo", + "/proc/meminfo", + "/proc/ioports", + "/proc/interrupts", + "/proc/scsi", + "/proc/dma", + "/proc/devices", + "/proc/rtc", + "/proc/ide", + "/proc/bus", + "/etc/stinit.def", + "/etc/sysconfig/hwconf", + "/proc/chandev", + "/proc/dasd", + "/proc/s390dbf/tape", + "/sys/bus/scsi", + "/sys/state"]) self.collectExtOutput("/usr/share/rhn/up2dateclient/hardware.py") 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") diff --git a/sos/plugins/i18n.py b/sos/plugins/i18n.py index a84a17ce..91b59d40 100644 --- a/sos/plugins/i18n.py +++ b/sos/plugins/i18n.py @@ -19,6 +19,7 @@ class i18n(sos.plugintools.PluginBase): """i18n related information """ def setup(self): - self.addCopySpec("/etc/sysconfig/i18n") - self.addCopySpec("/etc/X11/xinit/xinput.d/*") + self.addCopySpecs([ + "/etc/sysconfig/i18n", + "/etc/X11/xinit/xinput.d/*"]) self.collectExtOutput("/usr/bin/locale") diff --git a/sos/plugins/iscsi.py b/sos/plugins/iscsi.py index 39e3fb4a..26139c3c 100644 --- a/sos/plugins/iscsi.py +++ b/sos/plugins/iscsi.py @@ -18,6 +18,7 @@ class iscsi(sos.plugintools.PluginBase): """iscsi-initiator related information """ def setup(self): - self.addCopySpec("/etc/iscsi/iscsid.conf") - self.addCopySpec("/etc/iscsi/initiatorname.iscsi") - self.addCopySpec("/var/lib/iscsi") + self.addCopySpecs([ + "/etc/iscsi/iscsid.conf", + "/etc/iscsi/initiatorname.iscsi", + "/var/lib/iscsi"]) diff --git a/sos/plugins/kdump.py b/sos/plugins/kdump.py index 58fd142c..7a027c7a 100644 --- a/sos/plugins/kdump.py +++ b/sos/plugins/kdump.py @@ -22,7 +22,8 @@ class kdump(sos.plugintools.PluginBase): return self.isInstalled("kexec-tools") or exists("/etc/kdump.conf") def setup(self): - self.addCopySpec("/etc/kdump.conf") - self.addCopySpec("/etc/sysconfig/kdump") - self.addCopySpec("/proc/cmdline") - self.addCopySpec("/etc/udev/rules.d/*kexec.rules") + self.addCopySpecs([ + "/etc/kdump.conf", + "/etc/sysconfig/kdump", + "/proc/cmdline", + "/etc/udev/rules.d/*kexec.rules"]) diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py index 882577b5..c43dbdf4 100644 --- a/sos/plugins/kernel.py +++ b/sos/plugins/kernel.py @@ -56,22 +56,23 @@ class kernel(sos.plugintools.PluginBase): self.collectExtOutput("/sbin/sysctl -a") if os.path.isfile("/sbin/ksyms"): self.collectExtOutput("/sbin/ksyms") - self.addCopySpec("/proc/sys/kernel/random/boot_id") - self.addCopySpec("/sys/module/*/parameters") - self.addCopySpec("/proc/filesystems") - self.addCopySpec("/proc/ksyms") - self.addCopySpec("/proc/slabinfo") - self.addCopySpec("/lib/modules/%s/modules.dep" % self.policy().kernelVersion()) - self.addCopySpec("/etc/conf.modules") - self.addCopySpec("/etc/modules.conf") - self.addCopySpec("/etc/modprobe.conf") - self.addCopySpec("/etc/modprobe.d") + self.addCopySpecs([ + "/proc/sys/kernel/random/boot_id", + "/sys/module/*/parameters", + "/proc/filesystems", + "/proc/ksyms", + "/proc/slabinfo", + "/lib/modules/%s/modules.dep" % self.policy().kernelVersion(), + "/etc/conf.modules", + "/etc/modules.conf", + "/etc/modprobe.conf", + "/etc/modprobe.d", + "/proc/cmdline", + "/proc/driver", + "/proc/zoneinfo", + "/proc/sys/kernel/tainted", + "/proc/buddyinfo"]) self.collectExtOutput("/usr/sbin/dkms status") - self.addCopySpec("/proc/cmdline") - self.addCopySpec("/proc/driver") - self.addCopySpec("/proc/zoneinfo") - self.addCopySpec("/proc/sys/kernel/tainted") - self.addCopySpec("/proc/buddyinfo") def diagnose(self): diff --git a/sos/plugins/ldap.py b/sos/plugins/ldap.py index 09d7f6ba..81ec53aa 100644 --- a/sos/plugins/ldap.py +++ b/sos/plugins/ldap.py @@ -42,8 +42,7 @@ class ldap(sos.plugintools.PluginBase): self.addDiagnose("%s does not exist and can cause connection issues involving TLS" % ldapopts["TLS_CACERTDIR"]) def setup(self): - self.addCopySpec("/etc/ldap.conf") - self.addCopySpec("/etc/openldap") + self.addCopySpecs(["/etc/ldap.conf", "/etc/openldap"]) def postproc(self): self.doRegexSub("/etc/ldap.conf", r"(\s*bindpw\s*)\S+", r"\1***") diff --git a/sos/plugins/libraries.py b/sos/plugins/libraries.py index 402c9dbb..39c21467 100644 --- a/sos/plugins/libraries.py +++ b/sos/plugins/libraries.py @@ -22,8 +22,7 @@ class libraries(sos.plugintools.PluginBase): "slow", False)] def setup(self): - self.addCopySpec("/etc/ld.so.conf") - self.addCopySpec("/etc/ld.so.conf.d") + 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") diff --git a/sos/plugins/libvirt.py b/sos/plugins/libvirt.py index 07f82a18..63d62bea 100644 --- a/sos/plugins/libvirt.py +++ b/sos/plugins/libvirt.py @@ -17,5 +17,4 @@ class libvirt(sos.plugintools.PluginBase): """libvirt-related information """ def setup(self): - self.addCopySpec("/etc/libvirt/") - self.addCopySpec("/var/log/libvirt/") + self.addCopySpecs(["/etc/libvirt/", "/var/log/libvirt/"]) diff --git a/sos/plugins/memory.py b/sos/plugins/memory.py index 330fa734..8d4cf202 100644 --- a/sos/plugins/memory.py +++ b/sos/plugins/memory.py @@ -18,10 +18,11 @@ class memory(sos.plugintools.PluginBase): """memory usage information """ def setup(self): - self.addCopySpec("/proc/pci") - self.addCopySpec("/proc/meminfo") - self.addCopySpec("/proc/vmstat") - self.addCopySpec("/proc/slabinfo") + self.addCopySpecs([ + "/proc/pci", + "/proc/meminfo", + "/proc/vmstat", + "/proc/slabinfo"]) self.collectExtOutput("/bin/dmesg | grep -e 'e820.' -e 'aperature.'") self.collectExtOutput("/usr/bin/free", root_symlink = "free") diff --git a/sos/plugins/mrgmessg.py b/sos/plugins/mrgmessg.py index 9f957990..2c01fa87 100644 --- a/sos/plugins/mrgmessg.py +++ b/sos/plugins/mrgmessg.py @@ -18,6 +18,7 @@ class mrgmessg(sos.plugintools.PluginBase): """MRG Messaging related information """ def setup(self): - self.addCopySpec("/etc/qpidd.conf") - self.addCopySpec("/etc/sasl2/qpidd.conf") - self.addCopySpec("/var/rhm") + self.addCopySpecs([ + "/etc/qpidd.conf", + "/etc/sasl2/qpidd.conf", + "/var/rhm"]) diff --git a/sos/plugins/mysql.py b/sos/plugins/mysql.py index 5fd45e23..59b6bb28 100644 --- a/sos/plugins/mysql.py +++ b/sos/plugins/mysql.py @@ -25,7 +25,8 @@ class mysql(sos.plugintools.PluginBase): self.isInstalled("mysql") def setup(self): - self.addCopySpec("/etc/my.cnf") - self.addCopySpec("/etc/sysconfig/network") - self.addCopySpec("/etc/ld.so.conf.d/mysql*") - self.addCopySpec("/var/log/mysql*") + self.addCopySpecs([ + "/etc/my.cnf", + "/etc/sysconfig/network", + "/etc/ld.so.conf.d/mysql*", + "/var/log/mysql*"]) diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py index b0b92a55..fbe31f83 100644 --- a/sos/plugins/networking.py +++ b/sos/plugins/networking.py @@ -42,14 +42,15 @@ class networking(sos.plugintools.PluginBase): self.collectExtOutput(cmd) def setup(self): - self.addCopySpec("/proc/net") - self.addCopySpec("/etc/nsswitch.conf") - self.addCopySpec("/etc/yp.conf") - self.addCopySpec("/etc/inetd.conf") - self.addCopySpec("/etc/xinetd.conf") - self.addCopySpec("/etc/xinetd.d") - self.addCopySpec("/etc/host*") - self.addCopySpec("/etc/resolv.conf") + self.addCopySpecs([ + "/proc/net", + "/etc/nsswitch.conf", + "/etc/yp.conf", + "/etc/inetd.conf", + "/etc/xinetd.conf", + "/etc/xinetd.d", + "/etc/host*", + "/etc/resolv.conf"]) ifconfigFile=self.collectOutputNow("/sbin/ifconfig -a", root_symlink = "ifconfig") self.collectExtOutput("/sbin/route -n", root_symlink = "route") self.collectIPTable("filter") diff --git a/sos/plugins/nfsserver.py b/sos/plugins/nfsserver.py index 2201e41b..5dad1676 100644 --- a/sos/plugins/nfsserver.py +++ b/sos/plugins/nfsserver.py @@ -34,9 +34,10 @@ class nfsserver(sos.plugintools.PluginBase): return False def setup(self): - self.addCopySpec("/etc/exports") - self.addCopySpec("/var/lib/nfs/etab") - self.addCopySpec("/var/lib/nfs/xtab") - self.addCopySpec("/var/lib/nfs/rmtab") + self.addCopySpecs([ + "/etc/exports", + "/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") diff --git a/sos/plugins/openswan.py b/sos/plugins/openswan.py index f9c416bd..442531f2 100644 --- a/sos/plugins/openswan.py +++ b/sos/plugins/openswan.py @@ -24,7 +24,8 @@ class openswan(sos.plugintools.PluginBase): return self.isInstalled("openswan") or exists("/etc/ipsec.conf") def setup(self): - self.addCopySpec("/etc/ipsec.conf") - self.addCopySpec("/etc/ipsec.d") + self.addCopySpecs([ + "/etc/ipsec.conf", + "/etc/ipsec.d"]) self.collectExtOutput("/usr/sbin/ipsec verify") self.collectExtOutput("/usr/sbin/ipsec barf") diff --git a/sos/plugins/postfix.py b/sos/plugins/postfix.py index a8e6565c..32932468 100644 --- a/sos/plugins/postfix.py +++ b/sos/plugins/postfix.py @@ -22,7 +22,8 @@ class postfix(sos.plugintools.PluginBase): return self.isInstalled("postfix") or exists("/etc/rc.d/init.d/postfix") def setup(self): - self.addCopySpec("/etc/mail") - self.addCopySpec("/etc/postfix/main.cf") - self.addCopySpec("/etc/postfix/master.cf") + self.addCopySpecs([ + "/etc/mail", + "/etc/postfix/main.cf", + "/etc/postfix/master.cf"]) self.collectExtOutput("/usr/sbin/postconf") diff --git a/sos/plugins/ppp.py b/sos/plugins/ppp.py index f2129141..08f45585 100644 --- a/sos/plugins/ppp.py +++ b/sos/plugins/ppp.py @@ -24,7 +24,8 @@ class ppp(sos.plugintools.PluginBase): return self.isInstalled("ppp") or exists("/etc/wvdial.conf") def setup(self): - self.addCopySpec("/etc/wvdial.conf") - self.addCopySpec("/etc/ppp") - self.addCopySpec("/var/log/ppp") + self.addCopySpecs([ + "/etc/wvdial.conf", + "/etc/ppp", + "/var/log/ppp"]) self.collectExtOutput("/usr/sbin/adsl-status") diff --git a/sos/plugins/printing.py b/sos/plugins/printing.py index 3eb846ca..15353fe1 100644 --- a/sos/plugins/printing.py +++ b/sos/plugins/printing.py @@ -21,10 +21,11 @@ class printing(sos.plugintools.PluginBase): "", 50)] def setup(self): - self.addCopySpec("/etc/cups/*.conf") + self.addCopySpecs([ + "/etc/cups/*.conf", + "/etc/cups/lpoptions", + "/etc/cups/ppd/*.ppd"]) self.addCopySpecLimit("/var/log/cups", sizelimit=self.isOptionEnabled("cupslogsize")) - self.addCopySpec("/etc/cups/lpoptions") - self.addCopySpec("/etc/cups/ppd/*.ppd") self.collectExtOutput("/usr/bin/lpstat -t") self.collectExtOutput("/usr/bin/lpstat -s") self.collectExtOutput("/usr/bin/lpstat -d") diff --git a/sos/plugins/qpidd.py b/sos/plugins/qpidd.py index d5d768a7..5f9dce69 100644 --- a/sos/plugins/qpidd.py +++ b/sos/plugins/qpidd.py @@ -23,18 +23,19 @@ class qpidd(sos.plugintools.PluginBase): def setup(self): """ performs data collection for mrg """ - self.addCopySpec("/etc/qpidd.conf") self.collectExtOutput("/usr/bin/qpid-stat -q") self.collectExtOutput("/usr/bin/qpid-stat -e") self.collectExtOutput("/usr/bin/qpid-stat -b") - self.addCopySpec("/var/lib/qpid/syslog") 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.addCopySpec("/etc/ais/openais.conf") self.collectExtOutput("ls -lR /var/lib/qpidd") - self.addCopySpec("/var/log/cumin.log") - self.addCopySpec("/var/log/mint.log") + self.addCopySpecs([ + "/etc/qpidd.conf", + "/var/lib/qpid/syslog", + "/etc/ais/openais.conf", + "/var/log/cumin.log", + "/var/log/mint.log"]) diff --git a/sos/plugins/radius.py b/sos/plugins/radius.py index f0a2b7f5..8b75bf65 100644 --- a/sos/plugins/radius.py +++ b/sos/plugins/radius.py @@ -24,9 +24,7 @@ class radius(sos.plugintools.PluginBase): return self.isInstalled("freeradius") or exists("/etc/raddb") def setup(self): - self.addCopySpec("/etc/raddb") - self.addCopySpec("/etc/pam.d/radiusd") - self.addCopySpec("/var/log/radius") + self.addCopySpecs(["/etc/raddb", "/etc/pam.d/radiusd", "/var/log/radius"]) def postproc(self): self.doRegexSub("/etc/raddb/sql.conf", r"(\s*password\s*=\s*)\S+", r"\1***") diff --git a/sos/plugins/rhn.py b/sos/plugins/rhn.py index c317045e..0c409aec 100644 --- a/sos/plugins/rhn.py +++ b/sos/plugins/rhn.py @@ -36,26 +36,30 @@ class rhn(sos.plugintools.PluginBase): return self.satellite or self.proxy def setup(self): - self.addCopySpec("/etc/httpd/conf*") - self.addCopySpec("/etc/rhn") - self.addCopySpec("/etc/sysconfig/rhn") + self.addCopySpecs([ + "/etc/httpd/conf*", + "/etc/rhn", + "/etc/sysconfig/rhn" + "/var/log/rhn*"]) + if self.getOption("log"): - self.addCopySpec("/var/log/httpd") # httpd-logs - self.addCopySpec("/var/log/rhn*") # rhn-logs + self.addCopySpec("/var/log/httpd") # all these used to go in $DIR/mon-logs/ - self.addCopySpec("/opt/notification/var/*.log*") - self.addCopySpec("/var/tmp/ack_handler.log*") - self.addCopySpec("/var/tmp/enqueue.log*") + self.addCopySpecs([ + "/opt/notification/var/*.log*", + "/var/tmp/ack_handler.log*", + "/var/tmp/enqueue.log*"]) # monitoring scout logs - self.addCopySpec("/home/nocpulse/var/*.log*") - self.addCopySpec("/home/nocpulse/var/commands/*.log*") - self.addCopySpec("/var/tmp/ack_handler.log*") - self.addCopySpec("/var/tmp/enqueue.log*") - self.addCopySpec("/var/log/nocpulse/*.log*") - self.addCopySpec("/var/log/notification/*.log*") - self.addCopySpec("/var/log/nocpulse/TSDBLocalQueue/TSDBLocalQueue.log") + self.addCopySpecs([ + "/home/nocpulse/var/*.log*", + "/home/nocpulse/var/commands/*.log*", + "/var/tmp/ack_handler.log*", + "/var/tmp/enqueue.log*", + "/var/log/nocpulse/*.log*", + "/var/log/notification/*.log*", + "/var/log/nocpulse/TSDBLocalQueue/TSDBLocalQueue.log"]) self.addCopySpec("/root/ssl-build") self.collectExtOutput("rpm -qa --last", root_symlink = "rpm-manifest") @@ -63,23 +67,16 @@ class rhn(sos.plugintools.PluginBase): self.collectExtOutput("/usr/bin/rhn-charsets", root_symlink = "database-character-sets") if self.satellite: - self.addCopySpec("/etc/tnsnames.ora") - self.addCopySpec("/etc/jabberd") + self.addCopySpecs(["/etc/tnsnames.ora", "/etc/jabberd"]) # tomcat (4.x and newer satellites only) if not self.policy().pkgNVRA(satellite)[1].startswith("3."): - self.addCopySpec("/etc/tomcat5") - self.addCopySpec("/var/log/tomcat5") + self.addCopySpecs(["/etc/tomcat5", "/var/log/tomcat5"]) - self.addCopySpec("/etc/tomcat5") - self.addCopySpec("/var/log/tomcat5") + self.addCopySpecs(["/etc/tomcat5", "/var/log/tomcat5"]) if self.proxy: - # copying configuration information - self.addCopySpec("/etc/squid") - - # copying logs - self.addCopySpec("/var/log/squid") + self.addCopySpecs(["/etc/squid", "/var/log/squid"]) # def diagnose(self): # RHN Proxy: diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py index abec9107..31739e6a 100644 --- a/sos/plugins/s390.py +++ b/sos/plugins/s390.py @@ -30,27 +30,28 @@ class s390(sos.plugintools.PluginBase): ### Gather s390 specific information def setup(self): - self.addCopySpec("/proc/cio_ignore") - self.addCopySpec("/proc/crypto") - self.addCopySpec("/proc/dasd/devices") - self.addCopySpec("/proc/dasd/statistics") - self.addCopySpec("/proc/misc") - self.addCopySpec("/proc/qeth") - self.addCopySpec("/proc/qeth_perf") - self.addCopySpec("/proc/qeth_ipa_takeover") - self.addCopySpec("/proc/sys/appldata/*") - self.addCopySpec("/proc/sys/kernel/hz_timer") - self.addCopySpec("/proc/sysinfo") - self.addCopySpec("/sys/bus/ccwgroup/drivers/qeth/0.*/*") - self.addCopySpec("/sys/bus/ccw/drivers/zfcp/0.*/*") - self.addCopySpec("/sys/bus/ccw/drivers/zfcp/0.*/0x*/*") - self.addCopySpec("/sys/bus/ccw/drivers/zfcp/0.*/0x*/0x*/*") - self.addCopySpec("/etc/zipl.conf") - self.addCopySpec("/etc/zfcp.conf") - self.addCopySpec("/etc/sysconfig/dumpconf") - self.addCopySpec("/etc/src_vipa.conf") - self.addCopySpec("/etc/ccwgroup.conf") - self.addCopySpec("/etc/chandev.conf") + self.addCopySpecs([ + "/proc/cio_ignore" + "/proc/crypto", + "/proc/dasd/devices", + "/proc/dasd/statistics", + "/proc/misc", + "/proc/qeth", + "/proc/qeth_perf", + "/proc/qeth_ipa_takeover", + "/proc/sys/appldata/*", + "/proc/sys/kernel/hz_timer", + "/proc/sysinfo", + "/sys/bus/ccwgroup/drivers/qeth/0.*/*", + "/sys/bus/ccw/drivers/zfcp/0.*/*", + "/sys/bus/ccw/drivers/zfcp/0.*/0x*/*", + "/sys/bus/ccw/drivers/zfcp/0.*/0x*/0x*/*", + "/etc/zipl.conf", + "/etc/zfcp.conf", + "/etc/sysconfig/dumpconf", + "/etc/src_vipa.conf", + "/etc/ccwgroup.conf", + "/etc/chandev.conf"]) self.collectExtOutput("/sbin/lscss") self.collectExtOutput("/sbin/lsdasd") self.collectExtOutput("/sbin/lstape") diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py index 4a77decb..c88bb371 100644 --- a/sos/plugins/samba.py +++ b/sos/plugins/samba.py @@ -18,10 +18,11 @@ class samba(sos.plugintools.PluginBase): """Samba related information """ def setup(self): - self.addCopySpec("/etc/samba") - self.addCopySpec("/var/log/samba/*") - self.addCopySpec("/etc/krb5.conf") - self.addCopySpec("/etc/krb5.keytab") + self.addCopySpecs([ + "/etc/samba", + "/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") diff --git a/sos/plugins/sendmail.py b/sos/plugins/sendmail.py index 6e1b3763..0b73451b 100644 --- a/sos/plugins/sendmail.py +++ b/sos/plugins/sendmail.py @@ -24,5 +24,4 @@ class sendmail(sos.plugintools.PluginBase): return self.isInstalled("sendmail") or exists("/etc/rc.d/init.d/sendmail") def setup(self): - self.addCopySpec("/etc/mail/*") - self.addCopySpec("/var/log/maillog") + self.addCopySpecs(["/etc/mail/*", "/var/log/maillog"]) diff --git a/sos/plugins/smartcard.py b/sos/plugins/smartcard.py index f153cec9..856199b0 100644 --- a/sos/plugins/smartcard.py +++ b/sos/plugins/smartcard.py @@ -26,9 +26,10 @@ class smartcard(sos.plugintools.PluginBase): return self.isInstalled("pam_pkcs11") or os.path.exists("/etc/pam_pkcs11/pam_pkcs11.conf") def setup(self): - self.addCopySpec("/etc/reader.conf") - self.addCopySpec("/etc/reader.conf.d/") - self.addCopySpec("/etc/pam_pkcs11/") + self.addCopySpecs([ + "/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 -l /usr/lib*/pam_pkcs11/") diff --git a/sos/plugins/soundcard.py b/sos/plugins/soundcard.py index de22ecd3..33a31c1f 100644 --- a/sos/plugins/soundcard.py +++ b/sos/plugins/soundcard.py @@ -23,9 +23,10 @@ class soundcard(sos.plugintools.PluginBase): return False def setup(self): - self.addCopySpec("/proc/asound/*") - self.addCopySpec("/etc/alsa/*") - self.addCopySpec("/etc/asound.*") + self.addCopySpecs([ + "/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") diff --git a/sos/plugins/ssh.py b/sos/plugins/ssh.py index 3aeb584f..ebfb2772 100644 --- a/sos/plugins/ssh.py +++ b/sos/plugins/ssh.py @@ -20,5 +20,4 @@ class ssh(sos.plugintools.PluginBase): """ssh-related information """ def setup(self): - self.addCopySpec("/etc/ssh/ssh_config") - self.addCopySpec("/etc/ssh/sshd_config") + self.addCopySpecs(["/etc/ssh/ssh_config", "/etc/ssh/sshd_config"]) diff --git a/sos/plugins/sssd.py b/sos/plugins/sssd.py index ecd88cfb..5d30660f 100644 --- a/sos/plugins/sssd.py +++ b/sos/plugins/sssd.py @@ -35,5 +35,4 @@ class sssd(sos.plugintools.PluginBase): return self.isInstalled("sssd") def setup(self): - self.addCopySpec("/etc/sssd") - self.addCopySpec("/var/log/sssd/*") + self.addCopySpecs(["/etc/sssd", "/var/log/sssd/*"]) diff --git a/sos/plugins/system.py b/sos/plugins/system.py index b6c8dcc3..68033475 100644 --- a/sos/plugins/system.py +++ b/sos/plugins/system.py @@ -18,15 +18,16 @@ class system(sos.plugintools.PluginBase): """core system related information """ def setup(self): - self.addCopySpec("/proc/sys") - self.addCopySpec("/etc/sysctl.conf") - self.addCopySpec("/etc/cron*") - self.addCopySpec("/etc/anacrontab") - self.addCopySpec("/var/spool/cron*") - self.addCopySpec("/var/log/cron*") - self.addCopySpec("/etc/syslog.conf") - self.addCopySpec("/etc/rsyslog.conf") - self.addCopySpec("/etc/ntp.conf") - self.addCopySpec("/etc/ntp/step-tickers") - self.addCopySpec("/etc/ntp/ntpservers") + self.addCopySpecs([ + "/proc/sys", + "/etc/sysctl.conf", + "/etc/cron*", + "/etc/anacrontab", + "/var/spool/cron*", + "/var/log/cron*", + "/etc/syslog.conf", + "/etc/rsyslog.conf", + "/etc/ntp.conf", + "/etc/ntp/step-tickers", + "/etc/ntp/ntpservers"]) self.collectExtOutput("/usr/bin/crontab -l") diff --git a/sos/plugins/tomcat.py b/sos/plugins/tomcat.py index 57191357..64e0146c 100644 --- a/sos/plugins/tomcat.py +++ b/sos/plugins/tomcat.py @@ -21,5 +21,4 @@ class tomcat(sos.plugintools.PluginBase): return self.isInstalled("tomcat5") def setup(self): - self.addCopySpec("/etc/tomcat5") - self.addCopySpec("/var/log/tomcat5") + self.addCopySpecs(["/etc/tomcat5", "/var/log/tomcat5"]) diff --git a/sos/plugins/udev.py b/sos/plugins/udev.py index 3fdbbca1..7a0c4896 100644 --- a/sos/plugins/udev.py +++ b/sos/plugins/udev.py @@ -18,5 +18,4 @@ class udev(sos.plugintools.PluginBase): """udev related information """ def setup(self): - self.addCopySpec("/etc/udev/udev.conf") - self.addCopySpec("/etc/udev/rules.d/*") + self.addCopySpecs(["/etc/udev/udev.conf", "/etc/udev/rules.d/*"]) diff --git a/sos/plugins/vmware.py b/sos/plugins/vmware.py index 369f9091..074b6524 100644 --- a/sos/plugins/vmware.py +++ b/sos/plugins/vmware.py @@ -23,5 +23,4 @@ class vmware(sos.plugintools.PluginBase): def setup(self): self.collectExtOutput("/usr/bin/vmware -v") - self.addCopySpec("/etc/vmware/locations") - self.addCopySpec("/etc/vmware/config") + self.addCopySpecs(["/etc/vmware/locations", "/etc/vmware/config"]) diff --git a/sos/plugins/x11.py b/sos/plugins/x11.py index 3a5cd38e..07277dc2 100644 --- a/sos/plugins/x11.py +++ b/sos/plugins/x11.py @@ -22,12 +22,12 @@ class x11(sos.plugintools.PluginBase): return exists("/etc/X11") def setup(self): - self.addCopySpec("/etc/X11") - self.addCopySpec("/var/log/Xorg.*.log") - self.addCopySpec("/var/log/XFree86.*.log") + self.addCopySpecs([ + "/etc/X11", + "/var/log/Xorg.*.log", + "/var/log/XFree86.*.log", + "/etc/gdm"]) self.collectExtOutput("/bin/dmesg | grep -e 'agpgart.'") self.addForbiddenPath("/etc/X11/X") self.addForbiddenPath("/etc/X11/fontpath.d") - - self.addCopySpec("/etc/gdm") diff --git a/sos/plugins/xen.py b/sos/plugins/xen.py index 4bc8eef8..9eeae3a7 100644 --- a/sos/plugins/xen.py +++ b/sos/plugins/xen.py @@ -43,10 +43,11 @@ class xen(sos.plugintools.PluginBase): return xs_pidnum.isdigit() def domCollectProc(self): - self.addCopySpec("/proc/xen/balloon") - self.addCopySpec("/proc/xen/capabilities") - self.addCopySpec("/proc/xen/xsd_kva") - self.addCopySpec("/proc/xen/xsd_port") + self.addCopySpecs([ + "/proc/xen/balloon", + "/proc/xen/capabilities", + "/proc/xen/xsd_kva", + "/proc/xen/xsd_port"]) # determine if CPU has PAE support self.collectExtOutput("/bin/grep pae /proc/cpuinfo") # determine if CPU has Intel-VT or AMD-V support @@ -65,18 +66,19 @@ class xen(sos.plugintools.PluginBase): pass elif host_type == "dom0": # default of dom0, collect lots of system information - self.addCopySpec("/var/log/xen") - self.addCopySpec("/etc/xen") + self.addCopySpecs([ + "/var/log/xen", + "/etc/xen", + "/sys/hypervisor/version", + "/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.domCollectProc() - self.addCopySpec("/sys/hypervisor/version") - self.addCopySpec("/sys/hypervisor/compilation") - self.addCopySpec("/sys/hypervisor/properties") - self.addCopySpec("/sys/hypervisor/type") if self.is_running_xenstored(): self.addCopySpec("/sys/hypervisor/uuid") self.collectExtOutput("/usr/bin/xenstore-ls") diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py index d82af292..d669917a 100644 --- a/sos/plugins/yum.py +++ b/sos/plugins/yum.py @@ -38,10 +38,11 @@ class yum(sos.plugintools.PluginBase): def setup(self): # Pull all yum related information - self.addCopySpec("/etc/yum") - self.addCopySpec("/etc/yum.repos.d") - self.addCopySpec("/etc/yum.conf") - self.addCopySpec("/var/log/yum.log") + self.addCopySpecs([ + "/etc/yum", + "/etc/yum.repos.d", + "/etc/yum.conf", + "/var/log/yum.log"]) if self.getOption("yumlist"): # Get a list of channels the machine is subscribed to. |