aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make ethernet interface detection more robustBryn M. Reeves2013-11-151-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The networking module parses the link information in the output of the 'ip -o addr' command to determine a list of ethernet interfaces on which to run ethtool. An upstream change in the iproute package appears to have introduced a regression in the output of this command which causes link information to not be displayed: 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP qlen 1000\ link/ether 52:54:00:ce:9d:6d brd ff:ff:ff:ff:ff:ff 2: eth0 inet 192.168.122.31/24 brd 192.168.122.255 scope global eth0\ valid_lft forever preferred_lft forever 2: eth0 inet6 fe80::5054:ff:fece:9d6d/64 scope link \ valid_lft forever preferred_lft forever vs: 2: eth0 inet 192.168.122.31/24 brd 192.168.122.255 scope global eth0\ valid_lft forever preferred_lft forever 2: eth0 inet6 fe80::5054:ff:fece:9d6d/64 scope link \ valid_lft forever preferred_lft forever This breaks detection of ethernet interfaces and all ethtool data collection. This was introduced in the following iproute commit: commit af9d406f99853848054162ed7aefbe71dc03e433 Author: Mike Frysinger <vapier@gentoo.org> Date: Mon Aug 13 08:09:52 2012 -0700 Fix regression with 'ip address show' Which appears to fix a different problem (i.e. the change to link info was unintended). Make this more robust by switching the networking module to use 'ip -o link' instead which explicitly requests the required information. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Change tab -> space in sunrpc and nfs pluginsBryn M. Reeves2013-11-142-2/+2
| | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Fix regressions introduced with --build optionBryn M. Reeves2013-11-142-22/+27
| | | | | | | | | | | | | | | The changes to reinstate the --build option introduced two regressions: - Running sosreport with no otions generates a backtrace due to a non-existant _build member in the SoSOptions object - Running sosreport without --build leaves the temporary archive directory in places with the sos_logs directory containing sos.log and ui.log due to changes in the order of log shutdown and archive creation. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Replace print statements with six.print_() callsBryn M. Reeves2013-11-142-12/+14
| | | | | | | | | | | | | | | | | | | | | | Using the print statement as though it was a function leads to incorrect behaviour in a python2 runtime. E.g.: print() print( "Some examples:") print() Produces: () Some examples: () Instead replace use of the print keyword with a call to the six module's print_() function. Fixes Issue #219 Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Remove unused urllib import from plugins moduleBryn M. Reeves2013-11-141-1/+1
| | | | | | | | | | | | The urllib import via six.moves in the plugins module is unused. This causes an exception on some distributions when attempting to import the moved module. Drop the import since nothing in the plugin classes is using it. Fixes Issue #218 Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Remove debug statements from logs pluginBryn M. Reeves2013-11-131-3/+0
| | | | | | | | The 'all_logs' path of the logs plugin has three leftover debug print statements. Remove them to avoid cluttering the console output when the option is used. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Increase plugin name padding in list_plugins outputAdam Stokes2013-11-121-2/+2
| | | | | | | openstack-* is longer than the allotted 15 spaces, increased to 20 to make things line up again. Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* sos plugins filesyste, xfs, python2/python3 compatbilityAdam Stokes2013-11-122-5/+5
| | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* sos/sosreport.py: more py3/py2 compatability changesAdam Stokes2013-11-122-6/+14
| | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* Fixes #209Adam Stokes2013-11-129-63/+110
|\ | | | | | | | | | | Forward merges from master to make this PR mergeable again. Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| * Fix typo in yum add_forbidden_paths()Bryn M. Reeves2013-11-121-2/+2
| | | | | | | | | | | | | | The PKI files that should be omitted are in /etc/pki/entitlement, not /etc/pki/entitlements as the plug-in currently uses. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| * Add simple nfs plug-inBryn M. Reeves2013-11-081-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There has been an nfsserver plug-in for some time however no corresponding client-side data is collected. This was added to sos-2.2 earlier this year. This commit is a forward port of those changes: commit 71066b4a7d4fd97692b50bf231ad6810df5ec3d0 Author: root <root@rhel6-vm2.(none)> Date: Wed Jul 10 17:11:52 2013 +0100 Collect additional nfs-client relevant files Additional NFS client-side data collection: "/etc/nfsmount.conf", "/proc/fs/nfsfs/servers", "/proc/fs/nfsfs/volumes" Signed-off-by: Bryn M. Reeves <bmr@redhat.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| * Fix regex substitution in openhpi plug-inBryn M. Reeves2013-11-071-6/+2
| | | | | | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| * Fix traceback when sar module is force-enabledBryn M. Reeves2013-11-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward port of the following sos-2.2 fix: commit d4e3bcc3ed247d8d9a1228c3661b6456f534daf4 Author: Bryn M. Reeves <bmr@redhat.com> Date: Mon Aug 12 18:42:48 2013 +0100 Fix traceback when sar module is force-enabled The sar plug-in assumes that when it runs the /var/lib/sa directory and binaries exist (they are part of checkenabled() for this module). This leads to a traceback when the plug-in lists a non-existent directory on hosts where sar is not installed but '-o sar' is specified on the command line. Catch the exception and exit gracefully. (Edited by bmr to improve error message logged). Signed-off-by: David Kutálek <dkutalek@redhat.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| * Fix foreman and katello for sos-3.xBryn M. Reeves2013-11-072-26/+16
| | | | | | | | | | | | | | | | | | | | | | The foreman and katello plug-ins committed in 4650d3f use the sos-2.2 APIs and class names. This breaks sos since the plug-ins will not load under 3.0. Fix up the modules to use the new names and API conventions and ensure that they load correctly. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| * Restore --build command line optionBryn M. Reeves2013-11-073-26/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Releases of sos prior to 3.0 included the '--build' option to disable creation of a compressed archive and to leave the temporary build tree in place. This was removed with the reorganisation of the archive classes to support in-line archiving. Since all supported policies are now using an archive that derives from FileCacheArchive (commit 0178d5f) the option can be re-introduced. Archive classes that do not accumulate files in a temporary directory will return the path to the in-progress archive file. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| * Normalize temporary directory pathBryn M. Reeves2013-11-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The archive and temporary file handling classes expect to operate on absolute paths. If a user specifies a relative path via the command line --tmp-dir switch it must be normalized before being passed to these classes to provide correct behaviour. Failing to do this causes a variety of errors: the final archive cannot be created since the path is constructed incorrectly and temporary files are not cleaned up since they are not at the "expected" location. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* | fix print syntaxes for py2 and py3 also address an issue with powerpc pluginAdam Stokes2013-11-065-77/+78
| | | | | | | | | | | | that was formatted with tabs. Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* | debian/control: Set python3 requirementsAdam Stokes2013-11-061-3/+3
| | | | | | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* | Merge branch 'master' into py33Adam Stokes2013-11-068-5/+34
|\|
| * Add domainname output to the NIS plug-inBryn M. Reeves2013-11-051-0/+1
| | | | | | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| * maas: Dont capture everything /var/lib/maasAdam Stokes2013-11-051-1/+1
| | | | | | | | | | | | | | | | ephermeral images and other pickled objects are stored here which can increase the sosreport archive to well over 2G. so only capture the readable files which is only the dhcp leases and dhcp interface file. Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| * Added ubuntu/debian specific grub.cfg pathLouis Bouchard2013-11-041-0/+1
| | | | | | | | | | | | | | Fixes: #214 Signed-off-by: Louis Bouchard <louis.bouchard@canonical.com> Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| * Add a few more contributors to AUTHORSAdam Stokes2013-11-011-0/+3
| | | | | | | | | | | | Guy, Flavio, and Jeremy Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| * Generate report by defaultAdam Stokes2013-11-011-4/+4
| | | | | | | | | | | | Fixes #2 Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| * Do not copy ceph keyring filesAdam Stokes2013-11-011-0/+3
| | | | | | | | | | | | Fixes #200 Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| * Merge branch 'add-neutron-check-enabled' of github.com:jdutton/sosreport ↵Adam Stokes2013-10-311-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | into jdutton-add-neutron-check-enabled Fixes #211 Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| | * Add check_enabled for neutron pluginJeff Dutton2013-10-311-0/+6
| | | | | | | | | | | | Signed-off-by: Jeff Dutton <jeff.r.dutton@gmail.com>
| * | Include Brent Eagles into authors fileAdam Stokes2013-10-311-0/+1
| |/ | | | | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| * Scrub credentials from openssl pluginAdam Stokes2013-10-301-0/+11
| | | | | | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| * Add IBM contributors to AUTHORSAdam Stokes2013-10-301-0/+3
| | | | | | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* | Set hard runtime dependency on python-sixAdam Stokes2013-10-302-1/+2
| | | | | | | | | | | | Set for both RHEL/Fedora and Debian/Ubuntu Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* | Update CI specAdam Stokes2013-10-301-4/+1
| | | | | | | | | | | | | | Remove allow failures for python 3.3 as all tests should now pass going forward. Also install six via pip for unittests on travis-ci Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* | Python 3 portAdam Stokes2013-10-3012-50/+71
|/ | | | | | | | | | | | This includes a necessary dependency on python-six for its compability layer since we are wanting to continue support for both Python 2.7.x and Python 3.x. In addition, this will allow us to effectively phase out Python 2 support when/if the time arises that all interested distributions have done away with Python 2. This port passes all unittests for both python 2.7.x and python 3.3.x Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* Change add_copy_spec calls that are passed array to use add_copy_specsJeff Dutton2013-10-303-2/+3
| | | | | Signed-off-by: Jeff Dutton <jeff.r.dutton@gmail.com> Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* Fix config file regressionBryn M. Reeves2013-10-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Changes in the organisation of sos in commit 6ea48cb broke the reading of custom configuration files (either the default /etc/sos.conf or one specified on the command line using --config-file): Traceback (most recent call last): File "/usr/sbin/sosreport", line 23, in <module> main(sys.argv[1:]) File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 1167, in main sos.execute() File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 1133, in execute self._set_tunables() File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 798, in _set_tunables if not opt.split('.')[0] in self.disabled: AttributeError: 'SoSReport' object has no attribute 'disabled' The code attempts to reference the obsolete 'disabled' list of plug-ins (rather than calling self._get_disabled_plugins()) and failed to initialise the plugopts list to an empty deque. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* This patch defines a new PowerPC Plugin to collect generic Power logs.Bryn M. Reeves2013-10-301-0/+73
| | | | | | | | | | | | | | | Based on further platform checks,IBM Power System specific logs and commands will be collected. This would help IBM Power system users to collect system data in one shot by running sosreport. Signed-off-by: Bharani C.V. <bharanve@linux.vnet.ibm.com> Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com> --- sos/plugins/powerpc.py | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 sos/plugins/powerpc.py
* Fix --alloptionsBryn M. Reeves2013-10-301-1/+2
| | | | | | | | | | During the re-organisation of sosreport.py the code to apply all boolean options to plug-ins was factored out into its own function, _set_all_options() however this was never called from the main execute() method. Fix this to allow the option to work as previously. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Check for usable temporary directoryBryn M. Reeves2013-10-301-0/+6
| | | | | | | | A user may override the sos temporary directory via --tmp-dir to a non-existent or unwritable location. Check for this before initialising temporary files and exit with an error message. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Remove version checks in gluster plug-inBryn M. Reeves2013-10-291-16/+2
| | | | | | | Current distributions do not include the legac package versions that the plug-in was checking for. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Limit default sar data collectionBryn M. Reeves2013-10-291-1/+11
| | | | | | | | | | | By default the general module will scoop up all files under the /var/log/sa directory. With some configurations this path could contain many GB of data. Use add_copy_spec_limit() by default for sar data and add a new option sar.all_sar=False to allow the user to override this. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Move sar data colletion to sar plug-inBryn M. Reeves2013-10-292-1/+1
| | | | | | | | | | | Historically the general plug-in collected the content of the /var/log/sa directory while a separate sar plug-in handles the text formatted summary files. This makes little sense and adds to the bloat in the "general" module; move the collection to the sar plug-in itself. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Remove capturing redundant database export in MAASAdam Stokes2013-10-251-1/+0
| | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* Remove OpenStack Dashboard plug-inBryn M. Reeves2013-10-221-82/+0
| | | | | | | | | Following the reorganisation of the OpenStack plug-ins the dashboard module now duplicates functionality provided by the horizon plug-in. Remove it and keep all the horizon and dashboard support in a single module. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Make OpenStack Keystone password removal defaultBryn M. Reeves2013-10-221-16/+15
| | | | | | | | The keystone plug-in used a command line option to enable password removal. This should be the default behaviour - remove the option and always apply the password replacement rules. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Fix configuration files paths for novaXavier Queralt2013-10-221-3/+2
| | | | Signed-off-by: Xavier Queralt <xqueralt@redhat.com>
* Fix password protection for novaXavier Queralt2013-10-221-14/+11
| | | | Signed-off-by: Xavier Queralt <xqueralt@redhat.com>
* Split out Cinder, Dashboard, Nova and Quantum from OpenStackBryn M. Reeves2013-10-225-135/+357
| | | | | | | | Split out support for the OpenStack Cinder, Dashboard, Nova and Quantum components from the single OpenStack plug-in. Signed-off-by: Jeremy Agee <jagee@redhat.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Update AUTHORSAdam Stokes2013-10-211-0/+1
|
* Merge pull request #206 from jamesodhunt/masterAdam Stokes2013-10-212-0/+66
|\ | | | | | | Addition of plugins for procenv and upstart. Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
generated by cgit (git 2.34.1) at 2024-11-18 00:27:42 +0000