From ykaplan at redhat.com Mon May 4 07:52:12 2015 From: ykaplan at redhat.com (Yeela Kaplan) Date: Mon, 4 May 2015 03:52:12 -0400 (EDT) Subject: [sos-devel] review vdsm sosreport patch In-Reply-To: <1037862562.8928241.1430725907597.JavaMail.zimbra@redhat.com> Message-ID: <137690594.8928837.1430725932760.JavaMail.zimbra@redhat.com> Hi, Attached is a vdsm plugin for sosreport. I'd love your review. Thanks, Yeela -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-vdsm-Introducing-vdsm-plugin-into-sosreport.patch Type: text/x-patch Size: 6408 bytes Desc: not available URL: From sbradley at redhat.com Tue May 5 20:13:13 2015 From: sbradley at redhat.com (Shane Bradley) Date: Tue, 5 May 2015 16:13:13 -0400 Subject: [sos-devel] review vdsm sosreport patch In-Reply-To: <137690594.8928837.1430725932760.JavaMail.zimbra@redhat.com> References: <137690594.8928837.1430725932760.JavaMail.zimbra@redhat.com> Message-ID: <9144685F-62C2-4CFD-8DED-E292BC99C2E3@redhat.com> Can you create a bugzilla for this? ---- Shane Bradley Senior Software Maintenance Engineer (Cluster HA, GFS, GFS2) Red Hat Global Support Services Red Hat, Inc. > On May 4, 2015, at 3:52 AM, Yeela Kaplan wrote: > > Hi, > Attached is a vdsm plugin for sosreport. > I'd love your review. > > Thanks, > Yeela<0001-vdsm-Introducing-vdsm-plugin-into-sosreport.patch>_______________________________________________ > sos-devel mailing list > sos-devel at redhat.com > https://www.redhat.com/mailman/listinfo/sos-devel From bmr at redhat.com Wed May 6 09:59:27 2015 From: bmr at redhat.com (Bryn M. Reeves) Date: Wed, 6 May 2015 10:59:27 +0100 Subject: [sos-devel] review vdsm sosreport patch In-Reply-To: <9144685F-62C2-4CFD-8DED-E292BC99C2E3@redhat.com> References: <137690594.8928837.1430725932760.JavaMail.zimbra@redhat.com> <9144685F-62C2-4CFD-8DED-E292BC99C2E3@redhat.com> Message-ID: <20150506095926.GA23765@localhost.localdomain> On Tue, May 05, 2015 at 04:13:13PM -0400, Shane Bradley wrote: > Can you create a bugzilla for this? Let's deal with the upstream submission first - then we can determine what products are affected and how to migrate from the bundled plugin to the upstream one in those downstream projects (it's a lot more than just RHEL). Regards, BRyn. > > On May 4, 2015, at 3:52 AM, Yeela Kaplan wrote: > > > > Hi, > > Attached is a vdsm plugin for sosreport. > > I'd love your review. > > > > Thanks, > > Yeela<0001-vdsm-Introducing-vdsm-plugin-into-sosreport.patch>_______________________________________________ > > sos-devel mailing list > > sos-devel at redhat.com > > https://www.redhat.com/mailman/listinfo/sos-devel > > > _______________________________________________ > sos-devel mailing list > sos-devel at redhat.com > https://www.redhat.com/mailman/listinfo/sos-devel From builds at travis-ci.org Wed May 6 20:09:01 2015 From: builds at travis-ci.org (Travis CI) Date: Wed, 06 May 2015 20:09:01 +0000 Subject: [sos-devel] Failed: sosreport/sos#889 (sbradley-cluster_scrub_passwords - f448c7d) In-Reply-To: Message-ID: <554a74dcf3a70_33b291f882835c@4e70b3f4-b960-4c27-98d6-c73280860e73.mail> Build Update for sosreport/sos ------------------------------------- Build: #889 Status: Failed Duration: 57 seconds Commit: f448c7d (sbradley-cluster_scrub_passwords) Author: Shane Bradley Message: [cluster] crm_report data is scrubbed of passwords The data collected by crm_report defaults to scrubbing passwords from the data. In addition, an option to disable scrubbing of passwords was added called: "disable_scrubbing". Signed-off-by: Shane Bradley View the changeset: https://github.com/sosreport/sos/commit/f448c7d3ae5a View the full build log and details: https://travis-ci.org/sosreport/sos/builds/61519810 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications -------------- next part -------------- An HTML attachment was scrubbed... URL: From builds at travis-ci.org Wed May 6 20:41:08 2015 From: builds at travis-ci.org (Travis CI) Date: Wed, 06 May 2015 20:41:08 +0000 Subject: [sos-devel] Passed: sosreport/sos#890 (sbradley-cluster_scrub_passwords - f910c47) In-Reply-To: Message-ID: <554a7c63f32a0_331c0eae6683fd@f26ed2de-0e0f-487c-b6e4-539a0b021d8b.mail> Build Update for sosreport/sos ------------------------------------- Build: #890 Status: Passed Duration: 16 minutes and 35 seconds Commit: f910c47 (sbradley-cluster_scrub_passwords) Author: Shane Bradley Message: [cluster] Fixed a line that was too long. A line was too long and now it has been split between multiple lines. Signed-off-by: Shane Bradley View the changeset: https://github.com/sosreport/sos/compare/f448c7d3ae5a...f910c470b40e View the full build log and details: https://travis-ci.org/sosreport/sos/builds/61520422 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications -------------- next part -------------- An HTML attachment was scrubbed... URL: From builds at travis-ci.org Thu May 7 17:05:42 2015 From: builds at travis-ci.org (Travis CI) Date: Thu, 07 May 2015 17:05:42 +0000 Subject: [sos-devel] Errored: sosreport/sos#892 (sbradley-cluster_scrub_passwords - 505ed6c) In-Reply-To: Message-ID: <554b9b6535f48_31df7b66450555@9e16d608-8aed-4ccc-99d4-718334dc38ef.mail> Build Update for sosreport/sos ------------------------------------- Build: #892 Status: Errored Duration: 3 seconds Commit: 505ed6c (sbradley-cluster_scrub_passwords) Author: Shane Bradley Message: [cluster] enable crm_report password scrubbing Default to specifying a password pattern of 'passw.*' when calling the crm_report script. This causes matching strings to be elided from the report data. Since this scrubbing can affect the use of pacemaker state machine snapshots for debugging a new option is added to disable scrubbing of passwords: cluster.noscrub Signed-off-by: Shane Bradley Signed-off-by: Bryn M. Reeves View the changeset: https://github.com/sosreport/sos/compare/f910c470b40e...505ed6cec436 View the full build log and details: https://travis-ci.org/sosreport/sos/builds/61641727 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications -------------- next part -------------- An HTML attachment was scrubbed... URL: From builds at travis-ci.org Mon May 18 15:39:25 2015 From: builds at travis-ci.org (Travis CI) Date: Mon, 18 May 2015 15:39:25 +0000 Subject: [sos-devel] Passed: sosreport/sos#905 (sbradley-networking_nmcli_options - 236d28a) In-Reply-To: Message-ID: <555a07acee868_31c671303687f7@389a3616-2a51-4d20-9105-75ee708ed716.mail> Build Update for sosreport/sos ------------------------------------- Build: #905 Status: Passed Duration: 55 seconds Commit: 236d28a (sbradley-networking_nmcli_options) Author: Shane Bradley Message: [networking] nmcli incompatiblity issues There are some incompatible changes in nmcli since the release of NetworkManager >= 0.9.9. In addition, NetworkManager >= 0.9.9 will use the long names of "nmcli" objects. This is documented in the following article: https://wiki.gnome.org/Projects/NetworkManager/nmcli Signed-off-by: Shane Bradley View the changeset: https://github.com/sosreport/sos/commit/236d28aa3097 View the full build log and details: https://travis-ci.org/sosreport/sos/builds/63035041 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications -------------- next part -------------- An HTML attachment was scrubbed... URL: From builds at travis-ci.org Thu May 21 16:36:52 2015 From: builds at travis-ci.org (Travis CI) Date: Thu, 21 May 2015 16:36:52 +0000 Subject: [sos-devel] Errored: sosreport/sos#913 (sbradley-networking_nmcli_options - 51a02ae) In-Reply-To: Message-ID: <555e09a236b0_322db3644845aa@d7a12bc1-cc7f-495c-9fb1-70119ffd8283.mail> Build Update for sosreport/sos ------------------------------------- Build: #913 Status: Errored Duration: 11 minutes and 50 seconds Commit: 51a02ae (sbradley-networking_nmcli_options) Author: Shane Bradley Message: [networking] Simplified the collecting of nmcli output Simplified the collecting of nmcli output and used same name for nmcli's objects when possible. Signed-off-by: Shane Bradley View the changeset: https://github.com/sosreport/sos/compare/f1148ae5648b...51a02ae61621 View the full build log and details: https://travis-ci.org/sosreport/sos/builds/63515296 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications -------------- next part -------------- An HTML attachment was scrubbed... URL: From kamalesh at linux.vnet.ibm.com Tue May 26 07:57:43 2015 From: kamalesh at linux.vnet.ibm.com (Kamalesh Babulal) Date: Tue, 26 May 2015 13:27:43 +0530 Subject: [sos-devel] [PATCH] plugins/__init__.py: Skip copying of broken symlink Message-ID: <1432627063-22429-1-git-send-email-kamalesh@linux.vnet.ibm.com> Check if the srcpath exist before creating the symlink in __copy_symlink(), so we could avoid trying to link from broken (not existing) source. This patch fixes the following issue: File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 1172, in collect plug.collect() File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 630, in collect self._collect_copy_specs() File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 600, in _collect_copy_specs self._do_copy_path(path) File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 319, in _do_copy_path self._copy_symlink(srcpath) File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 271, in _copy_symlink self._do_copy_path(absdest) File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 319, in _do_copy_path self._copy_symlink(srcpath) File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 261, in _copy_symlink self.archive.add_link(reldest, srcpath) File "/usr/lib/python2.7/site-packages/sos/archive.py", line 198, in add_link os.symlink(source, dest) OSError: [Errno 17] Signed-off-by: Kamalesh Babulal --- sos/plugins/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py index 2a944ed..0495a23 100644 --- a/sos/plugins/__init__.py +++ b/sos/plugins/__init__.py @@ -257,6 +257,10 @@ class Plugin(object): self._log_debug("copying link '%s' pointing to '%s' with isdir=%s" % (srcpath, linkdest, os.path.isdir(absdest))) + # check for broken symlink + if not os.path.exists(srcpath): + self._log_debug("link '%s' is broken, skipping..." % srcpath) + return # use the relative target path in the tarball self.archive.add_link(reldest, srcpath) -- 2.1.2 From kamalesh at linux.vnet.ibm.com Tue May 26 09:51:20 2015 From: kamalesh at linux.vnet.ibm.com (Kamalesh Babulal) Date: Tue, 26 May 2015 15:21:20 +0530 Subject: [sos-devel] [RFC PATCH] Add IBM PowerKVM policy Message-ID: <1432633880-26010-1-git-send-email-kamalesh@linux.vnet.ibm.com> Add support for IBM PowerKVM/ZKVM platform, by introducing PowerKVM/ZKVM policy. It defines PowerKVM/ZKVM specific details/environment, for sos to validate the environment and enable plugins to collect information while running over PowerKVM/ZKVM. Patch also introduces PowerKVM/ZKVM plugin classes which could be used by plugins, when we add support for them individually later. Signed-off-by: Kamalesh Babulal Cc: Bryn M. Reeves --- sos/plugins/__init__.py | 10 +++++++ sos/policies/ibmkvm.py | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 sos/policies/ibmkvm.py diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py index 2a944ed..4d3a0ea 100644 --- a/sos/plugins/__init__.py +++ b/sos/plugins/__init__.py @@ -745,6 +745,16 @@ class RedHatPlugin(object): pass +class PowerKVMPlugin(RedHatPlugin): + """Tagging class to indicate that this plugin works with IBM PowerKVM Linux""" + pass + + +class ZKVMPlugin(RedHatPlugin): + """Tagging class to indicate that this plugin works with IBM ZKVM Linux""" + pass + + class UbuntuPlugin(object): """Tagging class to indicate that this plugin works with Ubuntu Linux""" pass diff --git a/sos/policies/ibmkvm.py b/sos/policies/ibmkvm.py new file mode 100644 index 0000000..573afc6 --- /dev/null +++ b/sos/policies/ibmkvm.py @@ -0,0 +1,76 @@ +# Copyright (C) IBM Corporation, 2015 +# +# Authors: +# Kamalesh Babulal +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +from __future__ import print_function + +from sos.plugins import PowerKVMPlugin, ZKVMPlugin, RedHatPlugin +from sos.policies.redhat import RedHatPolicy + +import os + +class PowerKVMPolicy(RedHatPolicy): + distro = "PowerKVM" + vendor = "IBM" + vendor_url = "http://www-03.ibm.com/systems/power/software/linux/powerkvm" + + def __init__(self): + super(PowerKVMPolicy, self).__init__() + self.valid_subclasses = [PowerKVMPlugin, RedHatPlugin] + + @classmethod + def check(self): + """This method checks to see if we are running on PowerKVM. + It returns True or False.""" + return os.path.isfile('/etc/ibm_powerkvm-release') + + def dist_version(self): + try: + with open('/etc/ibm_powerkvm-release', 'r') as fp: + version_string = fp.read(); + return version_string[2][0] + return False + except: + return False + +class ZKVMPolicy(RedHatPolicy): + distro = "IBM Hypervisor" + vendor = "IBM Hypervisor" + vendor_url = "http://www.ibm.com/systems/z/linux/IBMHypervisor/support/" + + def __init__(self): + super(ZKVMPolicy, self).__init__() + self.valid_subclasses = [ZKVMPlugin, RedHatPlugin] + + @classmethod + def check(self): + """This method checks to see if we are running on IBM Z KVM. It returns True + or False.""" + return os.path.isfile('/etc/base-release') + + def dist_version(self): + try: + with open('/etc/base-release', 'r') as fp: + version_string = fp.read(); + return version_string.split(' ',4)[3][0] + return False + except: + return False + + +# vim: set ts=4 sw=4 -- 2.1.2 From bmr at redhat.com Tue May 26 09:56:34 2015 From: bmr at redhat.com (Bryn M. Reeves) Date: Tue, 26 May 2015 10:56:34 +0100 Subject: [sos-devel] [PATCH] plugins/__init__.py: Skip copying of broken symlink In-Reply-To: <1432627063-22429-1-git-send-email-kamalesh@linux.vnet.ibm.com> References: <1432627063-22429-1-git-send-email-kamalesh@linux.vnet.ibm.com> Message-ID: <20150526095634.GA19008@localhost.localdomain> On Tue, May 26, 2015 at 01:27:43PM +0530, Kamalesh Babulal wrote: > Check if the srcpath exist before creating the symlink in > __copy_symlink(), so we could avoid trying to link from broken > (not existing) source. Please make sure to explain problems in enough detail that another user can re-create the problem and test your fix. The symlink code is designed to work correctly with broken symlinks (we want to include them in the report as they carry diagnostic value - i.e. a symlink is broken on the target system). The patch breaks this as it skips all symlinks where the link target is non-existent. > This patch fixes the following issue: > File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 1172, in collect plug.collect() > File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 630, in collect > self._collect_copy_specs() > File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 600, in _collect_copy_specs > self._do_copy_path(path) > File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 319, in _do_copy_path > self._copy_symlink(srcpath) > File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 271, in _copy_symlink > self._do_copy_path(absdest) > File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 319, in _do_copy_path > self._copy_symlink(srcpath) > File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 261, in _copy_symlink > self.archive.add_link(reldest, srcpath) > File "/usr/lib/python2.7/site-packages/sos/archive.py", line 198, in add_link > os.symlink(source, dest) > OSError: [Errno 17] Are you sure you don't have a symlink that points to itself here? That should be the only explanation for: _copy_symlink() -> _do_copy_path() -> _copy_symlink() The patch should test that linkdest == srcpath (using canonical paths as appropriate), create the link appropriately (it should anyway) and then skip collection of the target since it is already present. Regards, Bryn. From kamalesh at linux.vnet.ibm.com Wed May 27 07:42:33 2015 From: kamalesh at linux.vnet.ibm.com (Kamalesh Babulal) Date: Wed, 27 May 2015 13:12:33 +0530 Subject: [sos-devel] [PATCH] plugins/__init__.py: Skip copying of broken symlink In-Reply-To: <20150526095634.GA19008@localhost.localdomain> References: <1432627063-22429-1-git-send-email-kamalesh@linux.vnet.ibm.com> <20150526095634.GA19008@localhost.localdomain> Message-ID: <55657569.2010801@linux.vnet.ibm.com> On 05/26/2015 03:26 PM, Bryn M. Reeves wrote: > On Tue, May 26, 2015 at 01:27:43PM +0530, Kamalesh Babulal wrote: >> Check if the srcpath exist before creating the symlink in >> __copy_symlink(), so we could avoid trying to link from broken >> (not existing) source. > Please make sure to explain problems in enough detail that another > user can re-create the problem and test your fix. The symlink code > is designed to work correctly with broken symlinks (we want to > include them in the report as they carry diagnostic value - i.e. a > symlink is broken on the target system). > > The patch breaks this as it skips all symlinks where the link > target is non-existent. Thank you for the review. Will follow it from next posting and append the bug reporting style to patch. >> This patch fixes the following issue: >> File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 1172, in collect plug.collect() >> File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 630, in collect >> self._collect_copy_specs() >> File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 600, in _collect_copy_specs >> self._do_copy_path(path) >> File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 319, in _do_copy_path >> self._copy_symlink(srcpath) >> File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 271, in _copy_symlink >> self._do_copy_path(absdest) >> File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 319, in _do_copy_path >> self._copy_symlink(srcpath) >> File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 261, in _copy_symlink >> self.archive.add_link(reldest, srcpath) >> File "/usr/lib/python2.7/site-packages/sos/archive.py", line 198, in add_link >> os.symlink(source, dest) >> OSError: [Errno 17] > Are you sure you don't have a symlink that points to itself here? > > That should be the only explanation for: > > _copy_symlink() -> _do_copy_path() -> _copy_symlink() > > The patch should test that linkdest == srcpath (using canonical paths as > appropriate), create the link appropriately (it should anyway) and then > skip collection of the target since it is already present. > Agree, can we can compare the absolute path of both srcpath/destination before copying and skip if they are same, like in the updated patch below. The symlink is created before, so we do not skip creating the link, like what I did in the previous patch (I will post the second version with right formating and explanation) diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py index 2a944ed..6bb6016 100644 --- a/sos/plugins/__init__.py +++ b/sos/plugins/__init__.py @@ -268,12 +268,17 @@ class Plugin(object): # to absolute paths to pass to _do_copy_path. self._log_debug("normalized link target '%s' as '%s'" % (linkdest, absdest)) - self._do_copy_path(absdest) - self.copied_files.append({'srcpath': srcpath, - 'dstpath': srcpath, - 'symlink': "yes", - 'pointsto': linkdest}) + # skip the symlink pointing to itself + if (absdest != srcpath): + self._do_copy_path(absdest) + + self.copied_files.append({'srcpath': srcpath, + 'dstpath': srcpath, + 'symlink': "yes", + 'pointsto': linkdest}) + else: + self._log_debug("link '%s' is a self link, skipping..." % linkdest) Thanks, Kamalesh. From kamalesh at linux.vnet.ibm.com Wed May 27 07:59:26 2015 From: kamalesh at linux.vnet.ibm.com (Kamalesh Babulal) Date: Wed, 27 May 2015 13:29:26 +0530 Subject: [sos-devel] [RESEND PATCH] Fix vim tags typo in all python source files Message-ID: <1432713566-32546-1-git-send-email-kamalesh@linux.vnet.ibm.com> Fix the spelling of 'set' in vim tags, in all of the python sources files. Signed-off-by: Kamalesh Babulal cc: Bryn M. Reeves --- __run__.py | 2 +- example_plugins/example.py | 2 +- setup.py | 2 +- sos/archive.py | 2 +- sos/plugins/__init__.py | 2 +- sos/plugins/abrt.py | 2 +- sos/plugins/acpid.py | 2 +- sos/plugins/anaconda.py | 2 +- sos/plugins/anacron.py | 2 +- sos/plugins/apache.py | 2 +- sos/plugins/apparmor.py | 2 +- sos/plugins/apport.py | 2 +- sos/plugins/apt.py | 2 +- sos/plugins/ata.py | 2 +- sos/plugins/auditd.py | 2 +- sos/plugins/autofs.py | 2 +- sos/plugins/azure.py | 2 +- sos/plugins/block.py | 2 +- sos/plugins/boot.py | 2 +- sos/plugins/ceph.py | 2 +- sos/plugins/cgroups.py | 2 +- sos/plugins/cluster.py | 2 +- sos/plugins/cobbler.py | 2 +- sos/plugins/corosync.py | 2 +- sos/plugins/cron.py | 2 +- sos/plugins/cs.py | 2 +- sos/plugins/ctdb.py | 2 +- sos/plugins/cups.py | 2 +- sos/plugins/dbus.py | 2 +- sos/plugins/devicemapper.py | 2 +- sos/plugins/dhcp.py | 2 +- sos/plugins/distupgrade.py | 2 +- sos/plugins/dmraid.py | 2 +- sos/plugins/docker.py | 2 +- sos/plugins/dovecot.py | 2 +- sos/plugins/dpkg.py | 2 +- sos/plugins/ds.py | 2 +- sos/plugins/fcoe.py | 2 +- sos/plugins/filesys.py | 2 +- sos/plugins/firewalld.py | 2 +- sos/plugins/foreman.py | 2 +- sos/plugins/gdm.py | 2 +- sos/plugins/general.py | 2 +- sos/plugins/gluster.py | 2 +- sos/plugins/grub.py | 2 +- sos/plugins/grub2.py | 2 +- sos/plugins/haproxy.py | 2 +- sos/plugins/hardware.py | 2 +- sos/plugins/hpasm.py | 2 +- sos/plugins/hts.py | 2 +- sos/plugins/i18n.py | 2 +- sos/plugins/infiniband.py | 2 +- sos/plugins/ipa.py | 2 +- sos/plugins/ipsec.py | 2 +- sos/plugins/ipvs.py | 2 +- sos/plugins/iscsi.py | 2 +- sos/plugins/iscsitarget.py | 2 +- sos/plugins/java.py | 2 +- sos/plugins/juju.py | 2 +- sos/plugins/kdump.py | 2 +- sos/plugins/keepalived.py | 2 +- sos/plugins/kernel.py | 2 +- sos/plugins/kernelrt.py | 2 +- sos/plugins/keyutils.py | 2 +- sos/plugins/kpatch.py | 2 +- sos/plugins/krb5.py | 2 +- sos/plugins/kvm.py | 2 +- sos/plugins/landscape.py | 2 +- sos/plugins/ldap.py | 2 +- sos/plugins/libraries.py | 2 +- sos/plugins/libvirt.py | 2 +- sos/plugins/lightdm.py | 2 +- sos/plugins/lilo.py | 2 +- sos/plugins/logrotate.py | 2 +- sos/plugins/logs.py | 2 +- sos/plugins/lsbrelease.py | 2 +- sos/plugins/lvm2.py | 2 +- sos/plugins/maas.py | 2 +- sos/plugins/manageiq.py | 2 +- sos/plugins/md.py | 2 +- sos/plugins/megacli.py | 2 +- sos/plugins/memory.py | 2 +- sos/plugins/mongodb.py | 2 +- sos/plugins/mpt.py | 2 +- sos/plugins/mrggrid.py | 2 +- sos/plugins/mrgmessg.py | 2 +- sos/plugins/multipath.py | 2 +- sos/plugins/mysql.py | 2 +- sos/plugins/named.py | 2 +- sos/plugins/navicli.py | 2 +- sos/plugins/networking.py | 2 +- sos/plugins/nfs.py | 2 +- sos/plugins/nfsserver.py | 2 +- sos/plugins/nis.py | 2 +- sos/plugins/nscd.py | 2 +- sos/plugins/ntp.py | 2 +- sos/plugins/numa.py | 2 +- sos/plugins/oddjob.py | 2 +- sos/plugins/openhpi.py | 2 +- sos/plugins/openshift.py | 2 +- sos/plugins/openssl.py | 2 +- sos/plugins/openstack_ceilometer.py | 2 +- sos/plugins/openstack_cinder.py | 2 +- sos/plugins/openstack_glance.py | 2 +- sos/plugins/openstack_heat.py | 2 +- sos/plugins/openstack_horizon.py | 2 +- sos/plugins/openstack_keystone.py | 2 +- sos/plugins/openstack_neutron.py | 2 +- sos/plugins/openstack_nova.py | 2 +- sos/plugins/openstack_swift.py | 2 +- sos/plugins/openstack_trove.py | 2 +- sos/plugins/openswan.py | 2 +- sos/plugins/openvswitch.py | 2 +- sos/plugins/pam.py | 2 +- sos/plugins/pci.py | 2 +- sos/plugins/pcp.py | 2 +- sos/plugins/postfix.py | 2 +- sos/plugins/postgresql.py | 2 +- sos/plugins/powerpath.py | 2 +- sos/plugins/powerpc.py | 2 +- sos/plugins/ppp.py | 2 +- sos/plugins/procenv.py | 2 +- sos/plugins/process.py | 2 +- sos/plugins/processor.py | 2 +- sos/plugins/psacct.py | 2 +- sos/plugins/pxe.py | 2 +- sos/plugins/python.py | 2 +- sos/plugins/qpid.py | 2 +- sos/plugins/quagga.py | 2 +- sos/plugins/rabbitmq.py | 2 +- sos/plugins/radius.py | 2 +- sos/plugins/rhui.py | 2 +- sos/plugins/rpm.py | 2 +- sos/plugins/s390.py | 2 +- sos/plugins/samba.py | 2 +- sos/plugins/sanlock.py | 2 +- sos/plugins/sar.py | 2 +- sos/plugins/satellite.py | 2 +- sos/plugins/scsi.py | 2 +- sos/plugins/selinux.py | 2 +- sos/plugins/sendmail.py | 2 +- sos/plugins/smartcard.py | 2 +- sos/plugins/snmp.py | 2 +- sos/plugins/soundcard.py | 2 +- sos/plugins/squid.py | 2 +- sos/plugins/ssh.py | 2 +- sos/plugins/ssmtp.py | 2 +- sos/plugins/sssd.py | 2 +- sos/plugins/startup.py | 2 +- sos/plugins/sunrpc.py | 2 +- sos/plugins/symcli.py | 2 +- sos/plugins/system.py | 2 +- sos/plugins/systemd.py | 2 +- sos/plugins/systemtap.py | 2 +- sos/plugins/sysvipc.py | 2 +- sos/plugins/targetcli.py | 2 +- sos/plugins/teamd.py | 2 +- sos/plugins/tftpserver.py | 2 +- sos/plugins/tomcat.py | 2 +- sos/plugins/tuned.py | 2 +- sos/plugins/udev.py | 2 +- sos/plugins/unity.py | 2 +- sos/plugins/upstart.py | 2 +- sos/plugins/usb.py | 2 +- sos/plugins/veritas.py | 2 +- sos/plugins/vmware.py | 2 +- sos/plugins/vsftpd.py | 2 +- sos/plugins/x11.py | 2 +- sos/plugins/xen.py | 2 +- sos/plugins/xfs.py | 2 +- sos/plugins/xinetd.py | 2 +- sos/plugins/yum.py | 2 +- sos/policies/__init__.py | 2 +- sos/policies/debian.py | 2 +- sos/policies/osx.py | 2 +- sos/policies/redhat.py | 2 +- sos/policies/ubuntu.py | 2 +- sos/reporting.py | 2 +- sos/sosreport.py | 2 +- sos/utilities.py | 2 +- tests/archive_tests.py | 2 +- tests/importer_tests.py | 2 +- tests/option_tests.py | 2 +- tests/plugin_tests.py | 2 +- tests/policy_tests.py | 2 +- tests/report_tests.py | 2 +- tests/sosreport_pexpect.py | 2 +- tests/test_exe.py | 2 +- tests/utilities_tests.py | 2 +- 189 files changed, 189 insertions(+), 189 deletions(-) diff --git a/__run__.py b/__run__.py index 0f46807..aa48d82 100755 --- a/__run__.py +++ b/__run__.py @@ -16,4 +16,4 @@ import sys main(sys.argv[1:]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/example_plugins/example.py b/example_plugins/example.py index 31e8c78..0f55698 100755 --- a/example_plugins/example.py +++ b/example_plugins/example.py @@ -56,4 +56,4 @@ class example(Plugin, RedHatPlugin): self.collectExtOutput("/bin/ps -ef") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/setup.py b/setup.py index 2064db3..2e74384 100644 --- a/setup.py +++ b/setup.py @@ -71,4 +71,4 @@ setup(name='sosreport', ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/archive.py b/sos/archive.py index 6ef46a9..617691f 100644 --- a/sos/archive.py +++ b/sos/archive.py @@ -414,4 +414,4 @@ class TarFileArchive(FileCacheArchive): last_error = e raise last_error -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py index 2a944ed..d8ff2df 100644 --- a/sos/plugins/__init__.py +++ b/sos/plugins/__init__.py @@ -775,4 +775,4 @@ def import_plugin(name, superclasses=None): superclasses = (Plugin,) return import_module(plugin_fqname, superclasses) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/abrt.py b/sos/plugins/abrt.py index c3aa2d8..3a10b30 100644 --- a/sos/plugins/abrt.py +++ b/sos/plugins/abrt.py @@ -46,4 +46,4 @@ class Abrt(Plugin, RedHatPlugin): if self.get_option('backtraces'): self.do_backtraces() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/acpid.py b/sos/plugins/acpid.py index 7808b39..662f27a 100644 --- a/sos/plugins/acpid.py +++ b/sos/plugins/acpid.py @@ -33,4 +33,4 @@ class DebianAcpid(Acpid, DebianPlugin, UbuntuPlugin): self.add_copy_spec([ "/etc/acpi/events/powerbtn*"]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/anaconda.py b/sos/plugins/anaconda.py index aea3300..674635e 100644 --- a/sos/plugins/anaconda.py +++ b/sos/plugins/anaconda.py @@ -58,4 +58,4 @@ class Anaconda(Plugin, RedHatPlugin): r"\1********" ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/anacron.py b/sos/plugins/anacron.py index 92ae1c5..4d52c1a 100644 --- a/sos/plugins/anacron.py +++ b/sos/plugins/anacron.py @@ -25,4 +25,4 @@ class Anacron(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): # just look for the configuration file which is common files = ('/etc/anacrontab',) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/apache.py b/sos/plugins/apache.py index dc700cb..0ed5583 100644 --- a/sos/plugins/apache.py +++ b/sos/plugins/apache.py @@ -64,4 +64,4 @@ class DebianApache(Apache, DebianPlugin, UbuntuPlugin): if self.get_option("log"): self.add_copy_spec("/var/log/apache2/*") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/apparmor.py b/sos/plugins/apparmor.py index 360f58b..3ebebb3 100644 --- a/sos/plugins/apparmor.py +++ b/sos/plugins/apparmor.py @@ -36,4 +36,4 @@ class Apparmor(Plugin, UbuntuPlugin): "ls -alh /etc/apparmor.d/libvirt", ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/apport.py b/sos/plugins/apport.py index 47f6595..231a7ba 100644 --- a/sos/plugins/apport.py +++ b/sos/plugins/apport.py @@ -41,4 +41,4 @@ class Apport(Plugin, DebianPlugin, UbuntuPlugin): self.add_cmd_output("ls -alh /var/crash/") self.add_cmd_output("bash -c 'grep -B 50 -m 1 ProcMaps /var/crash/*'") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/apt.py b/sos/plugins/apt.py index bd0b336..f2962fc 100644 --- a/sos/plugins/apt.py +++ b/sos/plugins/apt.py @@ -45,4 +45,4 @@ class Apt(Plugin, DebianPlugin, UbuntuPlugin): suggest_filename="apt-cache_policy_details" ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/ata.py b/sos/plugins/ata.py index 454969f..c4a9785 100644 --- a/sos/plugins/ata.py +++ b/sos/plugins/ata.py @@ -39,4 +39,4 @@ class Ata(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/auditd.py b/sos/plugins/auditd.py index 7173f6a..916fcc8 100644 --- a/sos/plugins/auditd.py +++ b/sos/plugins/auditd.py @@ -38,4 +38,4 @@ class Auditd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): else: self.add_copy_spec("/var/log/audit") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/autofs.py b/sos/plugins/autofs.py index 3b67867..1262293 100644 --- a/sos/plugins/autofs.py +++ b/sos/plugins/autofs.py @@ -68,4 +68,4 @@ class DebianAutofs(Autofs, DebianPlugin, UbuntuPlugin): super(DebianAutofs, self).setup() self.add_cmd_output("dpkg-query -s autofs") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/azure.py b/sos/plugins/azure.py index bcf4f19..810b913 100644 --- a/sos/plugins/azure.py +++ b/sos/plugins/azure.py @@ -34,4 +34,4 @@ class Azure(Plugin, UbuntuPlugin): "/sys/module/hv_storvsc/parameters/storvsc_ringbuffer_size" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/block.py b/sos/plugins/block.py index e02304c..7bc40a0 100644 --- a/sos/plugins/block.py +++ b/sos/plugins/block.py @@ -50,4 +50,4 @@ class Block(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "fdisk -l %s" % disk_path ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/boot.py b/sos/plugins/boot.py index 7173742..9a17899 100644 --- a/sos/plugins/boot.py +++ b/sos/plugins/boot.py @@ -47,4 +47,4 @@ class Boot(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): self.add_cmd_output("lsinitrd %s" % image) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py index 52b8fff..3e427d3 100644 --- a/sos/plugins/ceph.py +++ b/sos/plugins/ceph.py @@ -54,4 +54,4 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): self.add_forbidden_path("/var/lib/ceph/*/*keyring") self.add_forbidden_path("/var/lib/ceph/*keyring") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/cgroups.py b/sos/plugins/cgroups.py index 25d8950..ae69f9f 100644 --- a/sos/plugins/cgroups.py +++ b/sos/plugins/cgroups.py @@ -43,4 +43,4 @@ class RedHatCgroups(Cgroups, RedHatPlugin): "/etc/cgrules.conf" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py index 084c030..716289d 100644 --- a/sos/plugins/cluster.py +++ b/sos/plugins/cluster.py @@ -174,4 +174,4 @@ class Cluster(Plugin, RedHatPlugin): return -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/cobbler.py b/sos/plugins/cobbler.py index 90d3150..25e7811 100644 --- a/sos/plugins/cobbler.py +++ b/sos/plugins/cobbler.py @@ -47,4 +47,4 @@ class DebianCobbler(Cobbler, DebianPlugin, UbuntuPlugin): ]) self.add_forbidden_path("/var/lib/cobbler/isos") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/corosync.py b/sos/plugins/corosync.py index 27642a0..1269f21 100644 --- a/sos/plugins/corosync.py +++ b/sos/plugins/corosync.py @@ -62,4 +62,4 @@ class DebianCorosync(Corosync, DebianPlugin, UbuntuPlugin): files = ('/usr/sbin/corosync',) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/cron.py b/sos/plugins/cron.py index 337c625..391659e 100644 --- a/sos/plugins/cron.py +++ b/sos/plugins/cron.py @@ -37,4 +37,4 @@ class Cron(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): self.add_cmd_output("crontab -l -u root", suggest_filename="root_crontab") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/cs.py b/sos/plugins/cs.py index 2ca4e5b..740c640 100644 --- a/sos/plugins/cs.py +++ b/sos/plugins/cs.py @@ -97,4 +97,4 @@ class CertificateSystem(Plugin, RedHatPlugin): "/var/log/pki-*/system" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/ctdb.py b/sos/plugins/ctdb.py index e1bd78e..09388d2 100644 --- a/sos/plugins/ctdb.py +++ b/sos/plugins/ctdb.py @@ -48,4 +48,4 @@ class RedHatCtdb(Ctdb, RedHatPlugin): super(RedHatCtdb, self).setup() self.add_copy_spec("/etc/sysconfig/ctdb") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/cups.py b/sos/plugins/cups.py index deae3b4..915a2d8 100644 --- a/sos/plugins/cups.py +++ b/sos/plugins/cups.py @@ -48,4 +48,4 @@ class Cups(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "lpstat -d" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/dbus.py b/sos/plugins/dbus.py index 2e6a99e..33783f7 100644 --- a/sos/plugins/dbus.py +++ b/sos/plugins/dbus.py @@ -28,4 +28,4 @@ class Dbus(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/devicemapper.py b/sos/plugins/devicemapper.py index ba99525..b9a03ee 100644 --- a/sos/plugins/devicemapper.py +++ b/sos/plugins/devicemapper.py @@ -30,4 +30,4 @@ class DeviceMapper(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "dmsetup ls --tree" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/dhcp.py b/sos/plugins/dhcp.py index 84e96d2..b143864 100644 --- a/sos/plugins/dhcp.py +++ b/sos/plugins/dhcp.py @@ -48,4 +48,4 @@ class UbuntuDhcp(Dhcp, UbuntuPlugin): "/etc/udhcpd.conf" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/distupgrade.py b/sos/plugins/distupgrade.py index 09c7780..9fda95c 100644 --- a/sos/plugins/distupgrade.py +++ b/sos/plugins/distupgrade.py @@ -54,4 +54,4 @@ class RedHatDistUpgrade(DistUpgrade, RedHatPlugin): r"/home/******** path redacted ********" ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/dmraid.py b/sos/plugins/dmraid.py index b7e2d0d..aa3d5a2 100644 --- a/sos/plugins/dmraid.py +++ b/sos/plugins/dmraid.py @@ -41,4 +41,4 @@ class Dmraid(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): metadata_path = self.get_cmd_output_path("metadata") self.add_cmd_output("dmraid -rD", runat=metadata_path) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py index ef4ede0..7a2bf06 100644 --- a/sos/plugins/docker.py +++ b/sos/plugins/docker.py @@ -77,4 +77,4 @@ class UbuntuDocker(Docker, UbuntuPlugin): "/etc/default/docker.io" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/dovecot.py b/sos/plugins/dovecot.py index b7e9772..d8ec424 100644 --- a/sos/plugins/dovecot.py +++ b/sos/plugins/dovecot.py @@ -45,4 +45,4 @@ class DebianDovecot(Dovecot, DebianPlugin, UbuntuPlugin): files = ('/etc/dovecot/README',) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/dpkg.py b/sos/plugins/dpkg.py index 5327dbf..d5c866f 100644 --- a/sos/plugins/dpkg.py +++ b/sos/plugins/dpkg.py @@ -39,4 +39,4 @@ class Dpkg(Plugin, DebianPlugin, UbuntuPlugin): else: self.add_copy_spec("/var/log/dpkg.log*") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/ds.py b/sos/plugins/ds.py index 2413e43..297bc6f 100644 --- a/sos/plugins/ds.py +++ b/sos/plugins/ds.py @@ -72,4 +72,4 @@ class DirectoryServer(Plugin, RedHatPlugin): "/opt/redhat-ds/slapd-*/logs" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/fcoe.py b/sos/plugins/fcoe.py index 6b847b4..74eac20 100644 --- a/sos/plugins/fcoe.py +++ b/sos/plugins/fcoe.py @@ -36,4 +36,4 @@ class fcoe(Plugin, RedHatPlugin): # interfaces's config files self.add_copy_spec("/etc/fcoe") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py index fab9dd3..dcdaee2 100644 --- a/sos/plugins/filesys.py +++ b/sos/plugins/filesys.py @@ -60,4 +60,4 @@ class Filesys(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): r"\1********" ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/firewalld.py b/sos/plugins/firewalld.py index 31e8337..cd35d00 100644 --- a/sos/plugins/firewalld.py +++ b/sos/plugins/firewalld.py @@ -40,4 +40,4 @@ class FirewallD(Plugin, RedHatPlugin): "firewall-cmd --permanent --list-all-zones" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/foreman.py b/sos/plugins/foreman.py index e50cbdf..6380bd2 100644 --- a/sos/plugins/foreman.py +++ b/sos/plugins/foreman.py @@ -30,4 +30,4 @@ class Foreman(Plugin, RedHatPlugin): path = self.get_cmd_output_path(name="foreman-debug") self.add_cmd_output("%s -g -q -a -d %s" % (cmd, path)) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/gdm.py b/sos/plugins/gdm.py index 6222cea..29f2783 100644 --- a/sos/plugins/gdm.py +++ b/sos/plugins/gdm.py @@ -29,4 +29,4 @@ class Gdm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "systemctl status gdm.service" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/general.py b/sos/plugins/general.py index 341d268..861a86c 100644 --- a/sos/plugins/general.py +++ b/sos/plugins/general.py @@ -65,4 +65,4 @@ class DebianGeneral(General, DebianPlugin): "/etc/debian_version" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/gluster.py b/sos/plugins/gluster.py index 1a31395..d12d0ea 100644 --- a/sos/plugins/gluster.py +++ b/sos/plugins/gluster.py @@ -113,4 +113,4 @@ class Gluster(Plugin, RedHatPlugin): self.add_cmd_output("gluster volume status") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/grub.py b/sos/plugins/grub.py index 18e7b4d..ed1c71a 100644 --- a/sos/plugins/grub.py +++ b/sos/plugins/grub.py @@ -39,4 +39,4 @@ class Grub(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): r"\1\2********" ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/grub2.py b/sos/plugins/grub2.py index 08700dd..223b7c6 100644 --- a/sos/plugins/grub2.py +++ b/sos/plugins/grub2.py @@ -69,4 +69,4 @@ class Grub2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): passwd_pbkdf2_sub ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/haproxy.py b/sos/plugins/haproxy.py index f2975a5..a62b9b0 100644 --- a/sos/plugins/haproxy.py +++ b/sos/plugins/haproxy.py @@ -31,4 +31,4 @@ class HAProxy(Plugin, RedHatPlugin, DebianPlugin): self.add_copy_spec("/var/log/haproxy.log") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py index 92c347b..ae06574 100644 --- a/sos/plugins/hardware.py +++ b/sos/plugins/hardware.py @@ -35,4 +35,4 @@ class Hardware(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): self.add_cmd_output("dmidecode", root_symlink="dmidecode") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/hpasm.py b/sos/plugins/hpasm.py index 4d5d158..7fcc9be 100644 --- a/sos/plugins/hpasm.py +++ b/sos/plugins/hpasm.py @@ -32,4 +32,4 @@ class Hpasm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "hpasmcli -s 'show server'" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/hts.py b/sos/plugins/hts.py index b8e4d41..81ca03b 100644 --- a/sos/plugins/hts.py +++ b/sos/plugins/hts.py @@ -28,4 +28,4 @@ class HardwareTestSuite(Plugin, RedHatPlugin): "/var/hts" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/i18n.py b/sos/plugins/i18n.py index 5326e2c..0cedfa0 100644 --- a/sos/plugins/i18n.py +++ b/sos/plugins/i18n.py @@ -29,4 +29,4 @@ class I18n(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ]) self.add_cmd_output("locale") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/infiniband.py b/sos/plugins/infiniband.py index 687b8d6..c7269ea 100644 --- a/sos/plugins/infiniband.py +++ b/sos/plugins/infiniband.py @@ -48,4 +48,4 @@ class Infiniband(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): return -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py index d563665..061d296 100644 --- a/sos/plugins/ipa.py +++ b/sos/plugins/ipa.py @@ -92,4 +92,4 @@ class Ipa(Plugin, RedHatPlugin): self.do_file_sub("/etc/named.conf", match, subst) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/ipsec.py b/sos/plugins/ipsec.py index 644109d..ded248a 100644 --- a/sos/plugins/ipsec.py +++ b/sos/plugins/ipsec.py @@ -45,4 +45,4 @@ class DebianIPSec(IPSec, DebianPlugin, UbuntuPlugin): "/etc/default/setkey" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/ipvs.py b/sos/plugins/ipvs.py index 2a4c57f..33a2043 100644 --- a/sos/plugins/ipvs.py +++ b/sos/plugins/ipvs.py @@ -31,4 +31,4 @@ class Ipvs(Plugin, RedHatPlugin, DebianPlugin): "ipvsadm -Lc" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/iscsi.py b/sos/plugins/iscsi.py index 064b2f4..5928a01 100644 --- a/sos/plugins/iscsi.py +++ b/sos/plugins/iscsi.py @@ -42,4 +42,4 @@ class RedHatIscsi(Iscsi, RedHatPlugin): "iscsiadm -m node --op=show" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/iscsitarget.py b/sos/plugins/iscsitarget.py index f9cf223..ae85217 100644 --- a/sos/plugins/iscsitarget.py +++ b/sos/plugins/iscsitarget.py @@ -48,4 +48,4 @@ class DebianIscsiTarget(IscsiTarget, DebianPlugin, UbuntuPlugin): "/etc/default/iscsitarget" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/java.py b/sos/plugins/java.py index fe45d94..3f5042b 100644 --- a/sos/plugins/java.py +++ b/sos/plugins/java.py @@ -29,4 +29,4 @@ class Java(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): self.add_cmd_output("readlink -f /usr/bin/java") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/juju.py b/sos/plugins/juju.py index b9e052f..7bc73a4 100644 --- a/sos/plugins/juju.py +++ b/sos/plugins/juju.py @@ -96,4 +96,4 @@ class Juju(Plugin, UbuntuPlugin): suggest_filename="juju-env-bundle.yaml") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/kdump.py b/sos/plugins/kdump.py index 6e64ba0..1d55da5 100644 --- a/sos/plugins/kdump.py +++ b/sos/plugins/kdump.py @@ -51,4 +51,4 @@ class DebianKDump(KDump, DebianPlugin, UbuntuPlugin): "/etc/default/kdump-tools" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/keepalived.py b/sos/plugins/keepalived.py index 20e89ba..04a0a3b 100644 --- a/sos/plugins/keepalived.py +++ b/sos/plugins/keepalived.py @@ -31,4 +31,4 @@ class Keepalived(Plugin, RedHatPlugin): "/etc/sysconfig/keepalived" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py index 97300e2..7bd98af 100644 --- a/sos/plugins/kernel.py +++ b/sos/plugins/kernel.py @@ -84,4 +84,4 @@ class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/var/log/dmesg" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/kernelrt.py b/sos/plugins/kernelrt.py index 7358ead..14fa0d2 100644 --- a/sos/plugins/kernelrt.py +++ b/sos/plugins/kernelrt.py @@ -43,4 +43,4 @@ class KernelRT(Plugin, RedHatPlugin): # 0.10.4-5. self.add_cmd_output('tuna -CP') -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/keyutils.py b/sos/plugins/keyutils.py index 3562555..82fe8f5 100644 --- a/sos/plugins/keyutils.py +++ b/sos/plugins/keyutils.py @@ -32,4 +32,4 @@ class Keyutils(Plugin, RedHatPlugin): ]) self.add_cmd_output("keyctl show") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/kpatch.py b/sos/plugins/kpatch.py index 6ef557e..0c7a21e 100644 --- a/sos/plugins/kpatch.py +++ b/sos/plugins/kpatch.py @@ -37,4 +37,4 @@ class Kpatch(Plugin, RedHatPlugin): self.add_cmd_output("kpatch info " + module) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/krb5.py b/sos/plugins/krb5.py index d9c0c23..21ab01e 100644 --- a/sos/plugins/krb5.py +++ b/sos/plugins/krb5.py @@ -29,4 +29,4 @@ class Krb5(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): self.add_cmd_output("klist -ket /etc/krb5.keytab") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/kvm.py b/sos/plugins/kvm.py index cb2b85f..8276886 100644 --- a/sos/plugins/kvm.py +++ b/sos/plugins/kvm.py @@ -54,4 +54,4 @@ class Kvm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): self.call_ext_prog("umount %s" % self.debugfs_path) self._log_error("could not unmount %s" % self.debugfs_path) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/landscape.py b/sos/plugins/landscape.py index 9c74c8c..ae2d323 100644 --- a/sos/plugins/landscape.py +++ b/sos/plugins/landscape.py @@ -79,4 +79,4 @@ class Landscape(Plugin, UbuntuPlugin): r"secret-token = [********]" ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/ldap.py b/sos/plugins/ldap.py index 1fb62bb..c180a4b 100644 --- a/sos/plugins/ldap.py +++ b/sos/plugins/ldap.py @@ -101,4 +101,4 @@ class DebianLdap(Ldap, DebianPlugin, UbuntuPlugin): r"\1********" ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/libraries.py b/sos/plugins/libraries.py index 2d0f433..8b86800 100644 --- a/sos/plugins/libraries.py +++ b/sos/plugins/libraries.py @@ -32,4 +32,4 @@ class Libraries(Plugin, RedHatPlugin, UbuntuPlugin): self.add_cmd_output("ldconfig -v -N -X") self.add_cmd_output("ldconfig -p -N -X") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/libvirt.py b/sos/plugins/libvirt.py index 8d5dcfc..2b4f21e 100644 --- a/sos/plugins/libvirt.py +++ b/sos/plugins/libvirt.py @@ -68,4 +68,4 @@ class Libvirt(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): r"\1******\3" ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/lightdm.py b/sos/plugins/lightdm.py index 191e4e7..4402ccd 100644 --- a/sos/plugins/lightdm.py +++ b/sos/plugins/lightdm.py @@ -44,4 +44,4 @@ class LightDm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): else: self.add_copy_spec("/var/log/lightdm") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/lilo.py b/sos/plugins/lilo.py index 3c4e37c..caa1018 100644 --- a/sos/plugins/lilo.py +++ b/sos/plugins/lilo.py @@ -27,4 +27,4 @@ class Lilo(Plugin, RedHatPlugin, UbuntuPlugin): self.add_copy_spec("/etc/lilo.conf") self.add_cmd_output("lilo -q") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/logrotate.py b/sos/plugins/logrotate.py index 3777026..3be5520 100644 --- a/sos/plugins/logrotate.py +++ b/sos/plugins/logrotate.py @@ -30,4 +30,4 @@ class LogRotate(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/var/lib/logrotate.status" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/logs.py b/sos/plugins/logs.py index e423b63..456011d 100644 --- a/sos/plugins/logs.py +++ b/sos/plugins/logs.py @@ -107,4 +107,4 @@ class DebianLogs(Logs, DebianPlugin, UbuntuPlugin): else: self.add_copy_spec("/var/log/") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/lsbrelease.py b/sos/plugins/lsbrelease.py index 3f3bf40..b97425f 100644 --- a/sos/plugins/lsbrelease.py +++ b/sos/plugins/lsbrelease.py @@ -30,4 +30,4 @@ class LsbRelease(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): root_symlink="lsb-release") self.add_copy_spec("/etc/lsb-release*") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/lvm2.py b/sos/plugins/lvm2.py index f215cfb..23890e4 100644 --- a/sos/plugins/lvm2.py +++ b/sos/plugins/lvm2.py @@ -74,4 +74,4 @@ class Lvm2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): elif self.get_option('lvmdump-am'): self.do_lvmdump(metadata=True) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/maas.py b/sos/plugins/maas.py index 051f411..fff5f7b 100644 --- a/sos/plugins/maas.py +++ b/sos/plugins/maas.py @@ -71,4 +71,4 @@ class Maas(Plugin, UbuntuPlugin): self._log_error( "Cannot login into MAAS remote API with provided creds.") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/manageiq.py b/sos/plugins/manageiq.py index 0fca8e1..50e123c 100644 --- a/sos/plugins/manageiq.py +++ b/sos/plugins/manageiq.py @@ -113,4 +113,4 @@ class ManageIQ(Plugin, RedHatPlugin): os.path.join(self.miq_log_dir, x) for x in self.miq_log_files ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/md.py b/sos/plugins/md.py index 6c2ba4a..ad8f080 100644 --- a/sos/plugins/md.py +++ b/sos/plugins/md.py @@ -31,4 +31,4 @@ class Md(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/megacli.py b/sos/plugins/megacli.py index 37a72fe..065a36c 100644 --- a/sos/plugins/megacli.py +++ b/sos/plugins/megacli.py @@ -43,4 +43,4 @@ class MegaCLI(Plugin, RedHatPlugin): "MegaCli64 -ShowSummary -a0" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/memory.py b/sos/plugins/memory.py index 1b27eba..69a3cd0 100644 --- a/sos/plugins/memory.py +++ b/sos/plugins/memory.py @@ -39,4 +39,4 @@ class Memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "swapon --show" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/mongodb.py b/sos/plugins/mongodb.py index 9566197..14c51b9 100644 --- a/sos/plugins/mongodb.py +++ b/sos/plugins/mongodb.py @@ -47,4 +47,4 @@ class RedHatMongoDb(MongoDb, RedHatPlugin): super(RedHatMongoDb, self).setup() self.add_copy_spec("/etc/sysconfig/mongodb") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/mpt.py b/sos/plugins/mpt.py index bb158cc..05ff46b 100644 --- a/sos/plugins/mpt.py +++ b/sos/plugins/mpt.py @@ -27,4 +27,4 @@ class Mpt(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): def setup(self): self.add_copy_spec("/proc/mpt") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/mrggrid.py b/sos/plugins/mrggrid.py index a5e535d..dd82366 100644 --- a/sos/plugins/mrggrid.py +++ b/sos/plugins/mrggrid.py @@ -28,4 +28,4 @@ class MrgGrid(Plugin, RedHatPlugin): "condor_status" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/mrgmessg.py b/sos/plugins/mrgmessg.py index 3e77bbe..bc0dd04 100644 --- a/sos/plugins/mrgmessg.py +++ b/sos/plugins/mrgmessg.py @@ -29,4 +29,4 @@ class MrgMessg(Plugin, RedHatPlugin): "/var/rhm" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/multipath.py b/sos/plugins/multipath.py index e6b8802..74012a8 100644 --- a/sos/plugins/multipath.py +++ b/sos/plugins/multipath.py @@ -33,4 +33,4 @@ class Multipath(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/mysql.py b/sos/plugins/mysql.py index aa8e9b9..99862b8 100644 --- a/sos/plugins/mysql.py +++ b/sos/plugins/mysql.py @@ -109,4 +109,4 @@ class DebianMysql(Mysql, DebianPlugin, UbuntuPlugin): super(DebianMysql, self).setup() self.add_copy_spec("/etc/mysql/conf.d/mysql*") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/named.py b/sos/plugins/named.py index 2360db4..ec23ea8 100644 --- a/sos/plugins/named.py +++ b/sos/plugins/named.py @@ -85,4 +85,4 @@ class DebianNamed(Named, DebianPlugin, UbuntuPlugin): return -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/navicli.py b/sos/plugins/navicli.py index 3ee7d50..41757e8 100644 --- a/sos/plugins/navicli.py +++ b/sos/plugins/navicli.py @@ -92,4 +92,4 @@ class Navicli(Plugin, RedHatPlugin): SP_address) self.get_navicli_SP_info(SP_address) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py index 59f38ce..ee10382 100644 --- a/sos/plugins/networking.py +++ b/sos/plugins/networking.py @@ -219,4 +219,4 @@ class UbuntuNetworking(Networking, UbuntuPlugin, DebianPlugin): self.add_cmd_output("/usr/sbin/traceroute -n %s" % self.trace_host) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/nfs.py b/sos/plugins/nfs.py index 94eef65..c39d475 100644 --- a/sos/plugins/nfs.py +++ b/sos/plugins/nfs.py @@ -32,4 +32,4 @@ class Nfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): return -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/nfsserver.py b/sos/plugins/nfsserver.py index 0aef76f..76ac40a 100644 --- a/sos/plugins/nfsserver.py +++ b/sos/plugins/nfsserver.py @@ -58,4 +58,4 @@ class NfsServer(Plugin, RedHatPlugin): ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/nis.py b/sos/plugins/nis.py index e22770c..4505f13 100644 --- a/sos/plugins/nis.py +++ b/sos/plugins/nis.py @@ -31,4 +31,4 @@ class Nis(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ]) self.add_cmd_output("domainname") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/nscd.py b/sos/plugins/nscd.py index e35d372..2acfff9 100644 --- a/sos/plugins/nscd.py +++ b/sos/plugins/nscd.py @@ -37,4 +37,4 @@ class Nscd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): self.add_copy_spec_limit(f[1], sizelimit=self.get_option("log_size")) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/ntp.py b/sos/plugins/ntp.py index 401b5df..92c324e 100644 --- a/sos/plugins/ntp.py +++ b/sos/plugins/ntp.py @@ -48,4 +48,4 @@ class DebianNtp(Ntp, DebianPlugin, UbuntuPlugin): self.add_copy_spec('/etc/default/ntp') -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/numa.py b/sos/plugins/numa.py index 00cf042..a72143b 100644 --- a/sos/plugins/numa.py +++ b/sos/plugins/numa.py @@ -42,4 +42,4 @@ class Numa(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "numactl --hardware", ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/oddjob.py b/sos/plugins/oddjob.py index ae48b4b..9e76a2e 100644 --- a/sos/plugins/oddjob.py +++ b/sos/plugins/oddjob.py @@ -34,4 +34,4 @@ class Oddjob(Plugin, RedHatPlugin): "/etc/dbus-1/system.d/oddjob.conf" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openhpi.py b/sos/plugins/openhpi.py index 48740af..3f9b2ca 100644 --- a/sos/plugins/openhpi.py +++ b/sos/plugins/openhpi.py @@ -33,4 +33,4 @@ class OpenHPI(Plugin, RedHatPlugin): r'(\s*[Pp]ass.*\s*=\s*).*', r'\1********') -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openshift.py b/sos/plugins/openshift.py index f557de7..2a708fb 100644 --- a/sos/plugins/openshift.py +++ b/sos/plugins/openshift.py @@ -148,4 +148,4 @@ class Openshift(Plugin, RedHatPlugin): r"(BIND_KEYVALUE\s*=\s*)(.*)", r"\1********") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openssl.py b/sos/plugins/openssl.py index 30bf3a5..f7a458b 100644 --- a/sos/plugins/openssl.py +++ b/sos/plugins/openssl.py @@ -62,4 +62,4 @@ class DebianOpenSSL(OpenSSL, DebianPlugin, UbuntuPlugin): super(DebianOpenSSL, self).setup() self.add_copy_spec("/etc/ssl/openssl.cnf") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py index d9d66a5..0d6ebe2 100644 --- a/sos/plugins/openstack_ceilometer.py +++ b/sos/plugins/openstack_ceilometer.py @@ -62,4 +62,4 @@ class RedHatOpenStackCeilometer(OpenStackCeilometer, RedHatPlugin): 'python-ceilometerclient' ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py index 356480c..b8df2ed 100644 --- a/sos/plugins/openstack_cinder.py +++ b/sos/plugins/openstack_cinder.py @@ -80,4 +80,4 @@ class RedHatOpenStackCinder(OpenStackCinder, RedHatPlugin): self.add_copy_spec(["/etc/sudoers.d/cinder"]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py index 31cc228..b9f1d1a 100644 --- a/sos/plugins/openstack_glance.py +++ b/sos/plugins/openstack_glance.py @@ -60,4 +60,4 @@ class RedHatOpenStackGlance(OpenStackGlance, plugins.RedHatPlugin): 'python-glanceclient' ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py index e3a83ed..fe7ec64 100644 --- a/sos/plugins/openstack_heat.py +++ b/sos/plugins/openstack_heat.py @@ -64,4 +64,4 @@ class RedHatOpenStack(OpenStackHeat, plugins.RedHatPlugin): 'python-heatclient' ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py index 46f0031..88aff4e 100644 --- a/sos/plugins/openstack_horizon.py +++ b/sos/plugins/openstack_horizon.py @@ -73,4 +73,4 @@ class RedHatOpenStackHorizon(OpenStackHorizon, RedHatPlugin): if self.get_option("log"): self.add_copy_spec("/var/log/httpd/") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py index 7df7296..2b5d6fe 100644 --- a/sos/plugins/openstack_keystone.py +++ b/sos/plugins/openstack_keystone.py @@ -73,4 +73,4 @@ class RedHatOpenStackKeystone(OpenStackKeystone, RedHatPlugin): 'python-keystoneclient' ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py index d37430e..780678e 100644 --- a/sos/plugins/openstack_neutron.py +++ b/sos/plugins/openstack_neutron.py @@ -168,4 +168,4 @@ class RedHatNeutron(Neutron, RedHatPlugin): self.packages = self.gen_pkg_tuple(self.package_list_template) self.add_copy_spec("/etc/sudoers.d/%s-rootwrap" % self.component_name) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openstack_nova.py b/sos/plugins/openstack_nova.py index d6dbd83..8f00436 100644 --- a/sos/plugins/openstack_nova.py +++ b/sos/plugins/openstack_nova.py @@ -146,4 +146,4 @@ class RedHatOpenStackNova(OpenStackNova, RedHatPlugin): "/etc/sysconfig/openstack-nova-novncproxy" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openstack_swift.py b/sos/plugins/openstack_swift.py index 588fcd0..c09066e 100644 --- a/sos/plugins/openstack_swift.py +++ b/sos/plugins/openstack_swift.py @@ -60,4 +60,4 @@ class RedHatOpenStackSwift(OpenStackSwift, RedHatPlugin): 'python-swiftclient' ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openstack_trove.py b/sos/plugins/openstack_trove.py index 7c8b661..43c8460 100644 --- a/sos/plugins/openstack_trove.py +++ b/sos/plugins/openstack_trove.py @@ -71,4 +71,4 @@ class RedHatOpenStackTrove(OpenStackTrove, RedHatPlugin): def setup(self): super(RedHatOpenStackTrove, self).setup() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openswan.py b/sos/plugins/openswan.py index 0e2d3f2..c1b2819 100644 --- a/sos/plugins/openswan.py +++ b/sos/plugins/openswan.py @@ -42,4 +42,4 @@ class Openswan(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): if self.get_option("ipsec-barf"): self.add_cmd_output("ipsec barf") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/openvswitch.py b/sos/plugins/openvswitch.py index 5200563..1814896 100644 --- a/sos/plugins/openvswitch.py +++ b/sos/plugins/openvswitch.py @@ -51,4 +51,4 @@ class DebianOpenVSwitch(OpenVSwitch, DebianPlugin, UbuntuPlugin): packages = ('openvswitch-switch',) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/pam.py b/sos/plugins/pam.py index 28b6a24..f548b7f 100644 --- a/sos/plugins/pam.py +++ b/sos/plugins/pam.py @@ -49,4 +49,4 @@ class DebianPam(Pam, DebianPlugin, UbuntuPlugin): super(DebianPam, self).setup() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/pci.py b/sos/plugins/pci.py index 304b3e9..abfd4f6 100644 --- a/sos/plugins/pci.py +++ b/sos/plugins/pci.py @@ -32,4 +32,4 @@ class Pci(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): self.add_cmd_output("lspci -nnvv", root_symlink="lspci") self.add_cmd_output("lspci -tv") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/pcp.py b/sos/plugins/pcp.py index 69872a3..ae4871b 100644 --- a/sos/plugins/pcp.py +++ b/sos/plugins/pcp.py @@ -156,4 +156,4 @@ class Pcp(Plugin, RedHatPlugin, DebianPlugin): self.add_cmd_output("pcp") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/postfix.py b/sos/plugins/postfix.py index efb9558..83f818a 100644 --- a/sos/plugins/postfix.py +++ b/sos/plugins/postfix.py @@ -49,4 +49,4 @@ class DebianPostfix(Postfix, DebianPlugin, UbuntuPlugin): super(DebianPostfix, self).setup() self.add_copy_spec("/etc/postfix/dynamicmaps.cf") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/postgresql.py b/sos/plugins/postgresql.py index 0718739..e6e3711 100644 --- a/sos/plugins/postgresql.py +++ b/sos/plugins/postgresql.py @@ -146,4 +146,4 @@ class DebianPostgreSQL(PostgreSQL, DebianPlugin, UbuntuPlugin): ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/powerpath.py b/sos/plugins/powerpath.py index 5369280..bc54849 100644 --- a/sos/plugins/powerpath.py +++ b/sos/plugins/powerpath.py @@ -60,4 +60,4 @@ class PowerPath(Plugin, RedHatPlugin): if os.path.isdir("/proc/emcp"): self.get_pp_config() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/powerpc.py b/sos/plugins/powerpc.py index 39b52f6..e752e94 100644 --- a/sos/plugins/powerpc.py +++ b/sos/plugins/powerpc.py @@ -92,4 +92,4 @@ class PowerPC(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): self.add_cmd_output("ls -l /var/log/dump") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/ppp.py b/sos/plugins/ppp.py index 705e386..dc43054 100644 --- a/sos/plugins/ppp.py +++ b/sos/plugins/ppp.py @@ -34,4 +34,4 @@ class Ppp(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ]) self.add_cmd_output("adsl-status") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/procenv.py b/sos/plugins/procenv.py index 57f45a6..be43970 100644 --- a/sos/plugins/procenv.py +++ b/sos/plugins/procenv.py @@ -26,4 +26,4 @@ class Procenv(Plugin, DebianPlugin, UbuntuPlugin): def setup(self): self.add_cmd_output('procenv') -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/process.py b/sos/plugins/process.py index cae8443..bca6bdc 100644 --- a/sos/plugins/process.py +++ b/sos/plugins/process.py @@ -32,4 +32,4 @@ class Process(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "ps alxwww" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/processor.py b/sos/plugins/processor.py index 19aca46..768f1b5 100644 --- a/sos/plugins/processor.py +++ b/sos/plugins/processor.py @@ -42,4 +42,4 @@ class Processor(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): self.add_cmd_output("x86info -a") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/psacct.py b/sos/plugins/psacct.py index 026f665..f144e96 100644 --- a/sos/plugins/psacct.py +++ b/sos/plugins/psacct.py @@ -49,4 +49,4 @@ class DebianPsacct(Psacct, DebianPlugin, UbuntuPlugin): if self.get_option("all"): self.add_copy_spec("/var/log/account/pacct*.gz") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/pxe.py b/sos/plugins/pxe.py index b7f1cfa..f2ae576 100644 --- a/sos/plugins/pxe.py +++ b/sos/plugins/pxe.py @@ -50,4 +50,4 @@ class DebianPxe(Pxe, DebianPlugin, UbuntuPlugin): if self.get_option("tftpboot"): self.add_copy_spec("/var/lib/tftpboot") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/python.py b/sos/plugins/python.py index e143d1e..83009bc 100644 --- a/sos/plugins/python.py +++ b/sos/plugins/python.py @@ -29,4 +29,4 @@ class Python(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): def setup(self): self.add_cmd_output("python -V", suggest_filename="python-version") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/qpid.py b/sos/plugins/qpid.py index 5493106..1d7bead 100644 --- a/sos/plugins/qpid.py +++ b/sos/plugins/qpid.py @@ -65,4 +65,4 @@ class Qpid(Plugin, RedHatPlugin): "/var/log/cumin" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/quagga.py b/sos/plugins/quagga.py index 9ed00cd..a7a5d74 100644 --- a/sos/plugins/quagga.py +++ b/sos/plugins/quagga.py @@ -30,4 +30,4 @@ class Quagga(Plugin, RedHatPlugin): def setup(self): self.add_copy_spec("/etc/quagga/") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/rabbitmq.py b/sos/plugins/rabbitmq.py index d5f1917..283746c 100644 --- a/sos/plugins/rabbitmq.py +++ b/sos/plugins/rabbitmq.py @@ -31,4 +31,4 @@ class RabbitMQ(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): self.add_copy_spec("/etc/rabbitmq/*") self.add_copy_spec_limit("/var/log/rabbitmq/*", sizelimit=self.get_option('log_size')) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/radius.py b/sos/plugins/radius.py index d8a56b4..34f465c 100644 --- a/sos/plugins/radius.py +++ b/sos/plugins/radius.py @@ -56,4 +56,4 @@ class DebianRadius(Radius, DebianPlugin, UbuntuPlugin): "/var/log/freeradius" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/rhui.py b/sos/plugins/rhui.py index c8ae0b7..d569f09 100644 --- a/sos/plugins/rhui.py +++ b/sos/plugins/rhui.py @@ -40,4 +40,4 @@ class Rhui(Plugin, RedHatPlugin): suggest_filename="rhui-debug") return -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py index ee9d4d5..5e245bc 100644 --- a/sos/plugins/rpm.py +++ b/sos/plugins/rpm.py @@ -65,4 +65,4 @@ class Rpm(Plugin, RedHatPlugin): self.add_cmd_output("rpm -V %s" % verify_pkgs) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py index 9ffc2af..f9d32e9 100644 --- a/sos/plugins/s390.py +++ b/sos/plugins/s390.py @@ -71,4 +71,4 @@ class S390(Plugin, RedHatPlugin): ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py index e33876c..53b5bb9 100644 --- a/sos/plugins/samba.py +++ b/sos/plugins/samba.py @@ -42,4 +42,4 @@ class RedHatSamba(Samba, RedHatPlugin): super(RedHatSamba, self).setup() self.add_copy_spec("/etc/sysconfig/samba") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/sanlock.py b/sos/plugins/sanlock.py index cc14449..eef9fcf 100644 --- a/sos/plugins/sanlock.py +++ b/sos/plugins/sanlock.py @@ -40,4 +40,4 @@ class RedHatSANLock(SANLock, RedHatPlugin): super(RedHatSANLock, self).setup() self.add_copy_spec("/etc/sysconfig/sanlock") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/sar.py b/sos/plugins/sar.py index 16cafe5..237555f 100644 --- a/sos/plugins/sar.py +++ b/sos/plugins/sar.py @@ -83,4 +83,4 @@ class DebianSar(Sar, DebianPlugin, UbuntuPlugin): sa_path = '/var/log/sysstat' -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/satellite.py b/sos/plugins/satellite.py index fef2f14..fe1c675 100644 --- a/sos/plugins/satellite.py +++ b/sos/plugins/satellite.py @@ -86,4 +86,4 @@ class Satellite(Plugin, RedHatPlugin): if self.proxy: self.add_copy_spec(["/etc/squid", "/var/log/squid"]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/scsi.py b/sos/plugins/scsi.py index 9452054..b204d98 100644 --- a/sos/plugins/scsi.py +++ b/sos/plugins/scsi.py @@ -38,4 +38,4 @@ class Scsi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): "sg_map" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/selinux.py b/sos/plugins/selinux.py index 9647b06..74d547d 100644 --- a/sos/plugins/selinux.py +++ b/sos/plugins/selinux.py @@ -49,4 +49,4 @@ class SELinux(Plugin, RedHatPlugin): ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/sendmail.py b/sos/plugins/sendmail.py index e88d978..410421e 100644 --- a/sos/plugins/sendmail.py +++ b/sos/plugins/sendmail.py @@ -52,4 +52,4 @@ class DebianSendmail(Sendmail, DebianPlugin, UbuntuPlugin): "/var/log/mail.*" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/smartcard.py b/sos/plugins/smartcard.py index e92f188..40aa4b2 100644 --- a/sos/plugins/smartcard.py +++ b/sos/plugins/smartcard.py @@ -38,4 +38,4 @@ class Smartcard(Plugin, RedHatPlugin): "ls -nl /usr/lib*/pam_pkcs11/" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/snmp.py b/sos/plugins/snmp.py index 5d470b5..9d582cc 100644 --- a/sos/plugins/snmp.py +++ b/sos/plugins/snmp.py @@ -44,4 +44,4 @@ class DebianSnmp(Snmp, DebianPlugin, UbuntuPlugin): def setup(self): super(DebianSnmp, self).setup() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/soundcard.py b/sos/plugins/soundcard.py index 1ebde60..50dad47 100644 --- a/sos/plugins/soundcard.py +++ b/sos/plugins/soundcard.py @@ -49,4 +49,4 @@ class DebianSoundcard(Soundcard, DebianPlugin, UbuntuPlugin): self.add_copy_spec("/etc/pulse/*") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/squid.py b/sos/plugins/squid.py index a995158..57df100 100644 --- a/sos/plugins/squid.py +++ b/sos/plugins/squid.py @@ -51,4 +51,4 @@ class DebianSquid(Squid, DebianPlugin, UbuntuPlugin): self.add_copy_spec(['/etc/squid-deb-proxy']) self.add_copy_spec_limit("/var/log/squid-deb-proxy/*", sizelimit=self.get_option('log_size')) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/ssh.py b/sos/plugins/ssh.py index f5cd625..eec2672 100644 --- a/sos/plugins/ssh.py +++ b/sos/plugins/ssh.py @@ -30,4 +30,4 @@ class Ssh(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/etc/ssh/sshd_config" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/ssmtp.py b/sos/plugins/ssmtp.py index 14653e6..e25e892 100644 --- a/sos/plugins/ssmtp.py +++ b/sos/plugins/ssmtp.py @@ -39,4 +39,4 @@ class Ssmtp(Plugin, RedHatPlugin): r'AuthPass=********' ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/sssd.py b/sos/plugins/sssd.py index 25fe61d..ec9ba95 100644 --- a/sos/plugins/sssd.py +++ b/sos/plugins/sssd.py @@ -49,4 +49,4 @@ class DebianSssd(Sssd, DebianPlugin, UbuntuPlugin): super(DebianSssd, self).setup() self.add_copy_spec("/etc/default/sssd") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/startup.py b/sos/plugins/startup.py index 4bf4511..cd66a02 100644 --- a/sos/plugins/startup.py +++ b/sos/plugins/startup.py @@ -53,4 +53,4 @@ class DebianStartup(Startup, DebianPlugin, UbuntuPlugin): if self.get_option('servicestatus'): self.add_cmd_output("/sbin/initctl list") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/sunrpc.py b/sos/plugins/sunrpc.py index 6c97fab..9d38fe5 100644 --- a/sos/plugins/sunrpc.py +++ b/sos/plugins/sunrpc.py @@ -52,4 +52,4 @@ class RedHatSunRPC(SunRPC, RedHatPlugin): # self.add_cmd_output("rpcinfo -p localhost") # return -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/symcli.py b/sos/plugins/symcli.py index fd9c896..875ad5b 100644 --- a/sos/plugins/symcli.py +++ b/sos/plugins/symcli.py @@ -93,4 +93,4 @@ class Symcli(Plugin, RedHatPlugin): self.get_symcli_files() self.get_symcli_config() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/system.py b/sos/plugins/system.py index e25aed7..22aa83c 100644 --- a/sos/plugins/system.py +++ b/sos/plugins/system.py @@ -30,4 +30,4 @@ class System(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/proc/sys/net/ipv6/neigh/*/base_reachable_time") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/systemd.py b/sos/plugins/systemd.py index a211fd2..d4ddee6 100644 --- a/sos/plugins/systemd.py +++ b/sos/plugins/systemd.py @@ -54,4 +54,4 @@ class Systemd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/etc/yum/protected.d/systemd.conf" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/systemtap.py b/sos/plugins/systemtap.py index 58e1f68..fe86ede 100644 --- a/sos/plugins/systemtap.py +++ b/sos/plugins/systemtap.py @@ -34,4 +34,4 @@ class SystemTap(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "stap-report" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/sysvipc.py b/sos/plugins/sysvipc.py index 75b79b5..79903d5 100644 --- a/sos/plugins/sysvipc.py +++ b/sos/plugins/sysvipc.py @@ -31,4 +31,4 @@ class SysVIPC(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ]) self.add_cmd_output("ipcs") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/targetcli.py b/sos/plugins/targetcli.py index 823904d..c160603 100644 --- a/sos/plugins/targetcli.py +++ b/sos/plugins/targetcli.py @@ -33,4 +33,4 @@ class TargetCli(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ]) self.add_copy_spec("/etc/target") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/teamd.py b/sos/plugins/teamd.py index 284d23e..6295c2f 100644 --- a/sos/plugins/teamd.py +++ b/sos/plugins/teamd.py @@ -51,4 +51,4 @@ class Teamd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "teamnl %s ports" % team ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/tftpserver.py b/sos/plugins/tftpserver.py index 9c98447..437a1ff 100644 --- a/sos/plugins/tftpserver.py +++ b/sos/plugins/tftpserver.py @@ -30,4 +30,4 @@ class TftpServer(Plugin, RedHatPlugin): def setup(self): self.add_cmd_output("ls -lanR /tftpboot") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/tomcat.py b/sos/plugins/tomcat.py index 10a634e..85b5d65 100644 --- a/sos/plugins/tomcat.py +++ b/sos/plugins/tomcat.py @@ -41,4 +41,4 @@ class Tomcat(Plugin, RedHatPlugin): r'password="********"' ) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/tuned.py b/sos/plugins/tuned.py index db3639c..28e56f6 100644 --- a/sos/plugins/tuned.py +++ b/sos/plugins/tuned.py @@ -40,4 +40,4 @@ class Tuned(Plugin, RedHatPlugin): "/var/log/tuned/tuned.log" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/udev.py b/sos/plugins/udev.py index 706c671..a45ee3c 100644 --- a/sos/plugins/udev.py +++ b/sos/plugins/udev.py @@ -29,4 +29,4 @@ class Udev(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/etc/udev/rules.d/*" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/unity.py b/sos/plugins/unity.py index 26aee01..3b5a8f7 100644 --- a/sos/plugins/unity.py +++ b/sos/plugins/unity.py @@ -30,4 +30,4 @@ class unity(Plugin, UbuntuPlugin): def setup(self): self.add_cmd_output("/usr/lib/nux/unity_support_test -p") -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/upstart.py b/sos/plugins/upstart.py index 7b8b5c0..fc167b9 100644 --- a/sos/plugins/upstart.py +++ b/sos/plugins/upstart.py @@ -50,4 +50,4 @@ class Upstart(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): self.add_copy_spec('/usr/share/upstart/') -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/usb.py b/sos/plugins/usb.py index c34e4bc..d89fa88 100644 --- a/sos/plugins/usb.py +++ b/sos/plugins/usb.py @@ -31,4 +31,4 @@ class Usb(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "lsusb -t" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/veritas.py b/sos/plugins/veritas.py index 5bbb723..fad4abf 100644 --- a/sos/plugins/veritas.py +++ b/sos/plugins/veritas.py @@ -42,4 +42,4 @@ class Veritas(Plugin, RedHatPlugin): if len(tarfile) == 1: self.add_copy_spec(tarfile[0]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/vmware.py b/sos/plugins/vmware.py index 02c7c1e..e6f83c8 100644 --- a/sos/plugins/vmware.py +++ b/sos/plugins/vmware.py @@ -32,4 +32,4 @@ class VMWare(Plugin, RedHatPlugin): "/proc/vmmemctl" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/vsftpd.py b/sos/plugins/vsftpd.py index 6c254e1..d071bdb 100644 --- a/sos/plugins/vsftpd.py +++ b/sos/plugins/vsftpd.py @@ -31,4 +31,4 @@ class Vsftpd(Plugin, RedHatPlugin): "/etc/vsftpd" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/x11.py b/sos/plugins/x11.py index 4db7ee3..ad20dc0 100644 --- a/sos/plugins/x11.py +++ b/sos/plugins/x11.py @@ -37,4 +37,4 @@ class X11(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "xrandr --verbose" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/xen.py b/sos/plugins/xen.py index 284b079..7cf3582 100644 --- a/sos/plugins/xen.py +++ b/sos/plugins/xen.py @@ -104,4 +104,4 @@ class Xen(Plugin, RedHatPlugin): self.add_custom_text("Xen hostType: "+host_type) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/xfs.py b/sos/plugins/xfs.py index 4e61e2b..6f8f60c 100644 --- a/sos/plugins/xfs.py +++ b/sos/plugins/xfs.py @@ -39,4 +39,4 @@ class Xfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): parts = e.split(' ') self.add_cmd_output("xfs_logprint -c %s" % (parts[0])) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/xinetd.py b/sos/plugins/xinetd.py index fe39bc0..4fd1d12 100644 --- a/sos/plugins/xinetd.py +++ b/sos/plugins/xinetd.py @@ -33,4 +33,4 @@ class Xinetd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/etc/xinetd.d" ]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py index 697a6b5..78eb4da 100644 --- a/sos/plugins/yum.py +++ b/sos/plugins/yum.py @@ -72,4 +72,4 @@ class Yum(Plugin, RedHatPlugin): except IndexError: pass -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/policies/__init__.py b/sos/policies/__init__.py index b3f0623..93aace1 100644 --- a/sos/policies/__init__.py +++ b/sos/policies/__init__.py @@ -442,4 +442,4 @@ class LinuxPolicy(Policy): return -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/policies/debian.py b/sos/policies/debian.py index 564f5c6..c85103c 100644 --- a/sos/policies/debian.py +++ b/sos/policies/debian.py @@ -42,4 +42,4 @@ class DebianPolicy(LinuxPolicy): except: return False -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/policies/osx.py b/sos/policies/osx.py index adbeea4..ad75d37 100644 --- a/sos/policies/osx.py +++ b/sos/policies/osx.py @@ -13,4 +13,4 @@ class OSXPolicy(Policy): except Exception: return False -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/policies/redhat.py b/sos/policies/redhat.py index b8dd0c4..0f717b2 100644 --- a/sos/policies/redhat.py +++ b/sos/policies/redhat.py @@ -188,4 +188,4 @@ class FedoraPolicy(RedHatPolicy): return int(pkg["version"]) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/policies/ubuntu.py b/sos/policies/ubuntu.py index 4c87eca..25652ea 100644 --- a/sos/policies/ubuntu.py +++ b/sos/policies/ubuntu.py @@ -36,4 +36,4 @@ class UbuntuPolicy(DebianPolicy): except: return False -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/reporting.py b/sos/reporting.py index 709aaf0..49d5c97 100644 --- a/sos/reporting.py +++ b/sos/reporting.py @@ -155,4 +155,4 @@ class PlainTextReport(object): for item in section.get(key): self.buf.append(format_ % item) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/sosreport.py b/sos/sosreport.py index 1226726..2b58648 100644 --- a/sos/sosreport.py +++ b/sos/sosreport.py @@ -1458,4 +1458,4 @@ def main(args): sos = SoSReport(args) sos.execute() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/sos/utilities.py b/sos/utilities.py index b1ec772..327287c 100644 --- a/sos/utilities.py +++ b/sos/utilities.py @@ -232,4 +232,4 @@ class ImporterHelper(object): return plugins -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/tests/archive_tests.py b/tests/archive_tests.py index c778e4e..fcfe169 100644 --- a/tests/archive_tests.py +++ b/tests/archive_tests.py @@ -92,4 +92,4 @@ class TarFileArchiveTest(unittest.TestCase): if __name__ == "__main__": unittest.main() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/tests/importer_tests.py b/tests/importer_tests.py index e7e20a2..9d80990 100644 --- a/tests/importer_tests.py +++ b/tests/importer_tests.py @@ -12,4 +12,4 @@ class ImporterHelperTests(unittest.TestCase): if __name__ == "__main__": unittest.main() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/tests/option_tests.py b/tests/option_tests.py index 3185bce..9ef1784 100644 --- a/tests/option_tests.py +++ b/tests/option_tests.py @@ -33,4 +33,4 @@ class GlobalOptionTest(unittest.TestCase): if __name__ == "__main__": unittest.main() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/tests/plugin_tests.py b/tests/plugin_tests.py index 7364eff..696a02b 100644 --- a/tests/plugin_tests.py +++ b/tests/plugin_tests.py @@ -319,4 +319,4 @@ class RegexSubTests(unittest.TestCase): if __name__ == "__main__": unittest.main() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/tests/policy_tests.py b/tests/policy_tests.py index fe208fc..9bbb3a1 100644 --- a/tests/policy_tests.py +++ b/tests/policy_tests.py @@ -68,4 +68,4 @@ class PackageManagerTests(unittest.TestCase): if __name__ == "__main__": unittest.main() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/tests/report_tests.py b/tests/report_tests.py index 5bb1d83..82e0d5f 100644 --- a/tests/report_tests.py +++ b/tests/report_tests.py @@ -117,4 +117,4 @@ class TestPlainReport(unittest.TestCase): if __name__ == "__main__": unittest.main() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/tests/sosreport_pexpect.py b/tests/sosreport_pexpect.py index 4b80723..cccb840 100644 --- a/tests/sosreport_pexpect.py +++ b/tests/sosreport_pexpect.py @@ -27,4 +27,4 @@ class PexpectTest(unittest.TestCase): if __name__ == '__main__': unittest.main() -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/tests/test_exe.py b/tests/test_exe.py index ee493b7..d2bb238 100755 --- a/tests/test_exe.py +++ b/tests/test_exe.py @@ -1,4 +1,4 @@ #!/usr/bin/python print "executed" -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 diff --git a/tests/utilities_tests.py b/tests/utilities_tests.py index 60087c1..b8050f7 100644 --- a/tests/utilities_tests.py +++ b/tests/utilities_tests.py @@ -87,4 +87,4 @@ class FindTest(unittest.TestCase): leaves = find("leaf", TEST_DIR, path_pattern="tests/path") self.assertFalse(any(name.endswith("leaf") for name in leaves)) -# vim: et ts=4 sw=4 +# vim: set ts=4 sw=4 -- 2.1.2 From bmr at redhat.com Thu May 28 12:33:59 2015 From: bmr at redhat.com (Bryn M. Reeves) Date: Thu, 28 May 2015 13:33:59 +0100 Subject: [sos-devel] [PATCH] plugins/__init__.py: Skip copying of broken symlink In-Reply-To: <55657569.2010801@linux.vnet.ibm.com> References: <1432627063-22429-1-git-send-email-kamalesh@linux.vnet.ibm.com> <20150526095634.GA19008@localhost.localdomain> <55657569.2010801@linux.vnet.ibm.com> Message-ID: <20150528123359.GB1594@localhost.localdomain> On Wed, May 27, 2015 at 01:12:33PM +0530, Kamalesh Babulal wrote: > + # skip the symlink pointing to itself > + if (absdest != srcpath): > + self._do_copy_path(absdest) > + > + self.copied_files.append({'srcpath': srcpath, > + 'dstpath': srcpath, > + 'symlink': "yes", > + 'pointsto': linkdest}) This still needs to happen; the link has been created (recursively) so it needs to be recorded in copied_files since this forms the basis for the HTML/text report data. Regards, Bryn. From kamalesh at linux.vnet.ibm.com Fri May 29 05:43:17 2015 From: kamalesh at linux.vnet.ibm.com (Kamalesh Babulal) Date: Fri, 29 May 2015 11:13:17 +0530 Subject: [sos-devel] [v2 PATCH] [plugin] fix recursive symlink handling Message-ID: <1432878197-12333-1-git-send-email-kamalesh@linux.vnet.ibm.com> symlink which points to itself, might exist in directories mentioned in plugin(s) for collection/copying. With regular symlink, we could create the link and copy the file but with symlink pointing to itself, we end up in recursive loop. When trying to follow the src, for creating link and copying it. For example: # ls -lstrh /etc/libvirt/qemu/networks/autostart/ total 0 0 lrwxrwxrwx. 1 root root 14 May 18 09:22 default.xml -> ../default.xml 0 lrwxrwxrwx. 1 root root 7 May 22 05:37 kop.xml -> kop.xml Trying to copying such symlink, will ends up in following exception: Traceback (most recent call last): File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 1172, in collect plug.collect() File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 630, in collect self._collect_copy_specs() File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 600, in _collect_copy_specs self._do_copy_path(path) File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 319, in _do_copy_path self._copy_symlink(srcpath) File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 271, in _copy_symlink self._do_copy_path(absdest) File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 319, in _do_copy_path self._copy_symlink(srcpath) File "/usr/lib/python2.7/site-packages/sos/plugins/__init__.py", line 261, in _copy_symlink self.archive.add_link(reldest, srcpath) File "/usr/lib/python2.7/site-packages/sos/archive.py", line 198, in add_link os.symlink(source, dest) OSError: [Errno 17] File exists Fix this recursive loop but just creating the link and skip copying the symlink. Signed-off-by: Kamalesh Babulal Cc: Bryn M. Reeves --- v2: - Create the link and skip copying, if both src and dest are same. - Append the symlink to files, copied list. v1: Initial version: Returns, if the source path does not exist. sos/plugins/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py index 2a944ed..6cd3ddb 100644 --- a/sos/plugins/__init__.py +++ b/sos/plugins/__init__.py @@ -268,7 +268,12 @@ class Plugin(object): # to absolute paths to pass to _do_copy_path. self._log_debug("normalized link target '%s' as '%s'" % (linkdest, absdest)) - self._do_copy_path(absdest) + + # skip recursive copying of symlink pointing to itself. + if (absdest != srcpath): + self._do_copy_path(absdest) + else: + self._log_debug("link '%s' is a self link, skipping..." % linkdest) self.copied_files.append({'srcpath': srcpath, 'dstpath': srcpath, -- 2.1.2 From prayther at gmail.com Sat May 30 20:00:16 2015 From: prayther at gmail.com (aaron prayther) Date: Sat, 30 May 2015 16:00:16 -0400 Subject: [sos-devel] trying to generate an json, or xml report Message-ID: A default html and xml file used to be generated under sos_reports. I really want to get a json report. Any suggestions? -- -prayther -------------- next part -------------- An HTML attachment was scrubbed... URL: