From 48962fed21bd773d04728e0c4e68412e71ec9b12 Mon Sep 17 00:00:00 2001 From: eugeneteo Date: Mon, 28 May 2007 02:45:12 +0000 Subject: 2007-05-25 Eugene Teo * lib/sos/plugins/xen.py, lib/sos/plugins/pam.py, lib/sos/plugins/memory.py: - Edited xen.py to determine if CPU has PAE/Intel VT/AMD-V support - Edited pam.py to gather configurations in /etc/security, and files listing of /lib/security/pam_*so - Edited memory.py to gather /proc/{vmstat,slabinfo}, and free -m output git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@138 ef72aa8b-4018-0410-8976-d6e080ef94d8 --- src/ChangeLog | 9 +++++++++ src/lib/sos/plugins/memory.py | 3 +++ src/lib/sos/plugins/pam.py | 2 ++ src/lib/sos/plugins/xen.py | 6 ++++++ 4 files changed, 20 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index b59ce737..9bb84cfb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2007-05-25 Eugene Teo + + * lib/sos/plugins/xen.py, lib/sos/plugins/pam.py, lib/sos/plugins/memory.py: + - Edited xen.py to determine if CPU has PAE/Intel VT/AMD-V support + - Edited pam.py to gather configurations in /etc/security, and files + listing of /lib/security/pam_*so + - Edited memory.py to gather /proc/{vmstat,slabinfo}, and free -m + output + 2006-06-19 Steve Conklin * ChangeLog, LICENSE, setup.py, sos.spec: diff --git a/src/lib/sos/plugins/memory.py b/src/lib/sos/plugins/memory.py index 688b7011..fa943a3c 100644 --- a/src/lib/sos/plugins/memory.py +++ b/src/lib/sos/plugins/memory.py @@ -20,8 +20,11 @@ class memory(sos.plugintools.PluginBase): def setup(self): self.addCopySpec("/proc/pci") self.addCopySpec("/proc/meminfo") + self.addCopySpec("/proc/vmstat") + self.addCopySpec("/proc/slabinfo") self.collectExtOutput("/bin/dmesg | grep -e 'e820.' -e 'aperature.'") self.collectExtOutput("/usr/bin/free") + self.collectExtOutput("/usr/bin/free -m") return diff --git a/src/lib/sos/plugins/pam.py b/src/lib/sos/plugins/pam.py index 364e81af..ee95b5a8 100644 --- a/src/lib/sos/plugins/pam.py +++ b/src/lib/sos/plugins/pam.py @@ -19,5 +19,7 @@ class pam(sos.plugintools.PluginBase): """ def setup(self): self.addCopySpec("/etc/pam.d") + self.addCopySpec("/etc/security") + self.collectExtOutput("/bin/ls -laF /lib/security/pam_*so") return diff --git a/src/lib/sos/plugins/xen.py b/src/lib/sos/plugins/xen.py index cf0d7156..d29aa17b 100644 --- a/src/lib/sos/plugins/xen.py +++ b/src/lib/sos/plugins/xen.py @@ -36,12 +36,18 @@ class xen(sos.plugintools.PluginBase): self.addCopySpec("/proc/xen/capabilities") self.addCopySpec("/proc/xen/xsd_kva") self.addCopySpec("/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 + self.collectExtOutput("/bin/egrep -e 'vmx|svm' /proc/cpuinfo") def setup(self): host_type = self.determineXenHost() if host_type == "domU": # we should collect /proc/xen and /sys/hypervisor self.domCollectProc() + # determine if hardware virtualization support is enabled + # in BIOS: /sys/hypervisor/properties/capabilities self.addCopySpec("/sys/hypervisor") elif host_type == "hvm": # what do we collect here??? -- cgit