aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix exception in command output substitutionBryn M. Reeves2013-10-061-1/+4
| | | | | | | | | | | | | | | | If an attempt is made to apply command output substitution via Plugin.do_cmd_output_sub() and no output has been collected (i.e. called['file'] == None) an exception is thrown by os.path.join(). The exception is also not logged properly due to an attempt in the do_cmd_output_sub() exception handler to access an unbound local variable (path - the exception occurs before it is assigned). Fix both of these by checking for an empty file entry and avoiding access to the path variable from the exception handler. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Include /etc/yaboot.conf in boot plug-inBryn M. Reeves2013-10-041-0/+1
| | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Do not exit on interactive mode read exceptionsBryn M. Reeves2013-10-031-1/+1
| | | | | | | | | | | Currently the default policy object will exit without logging any errors if an exception (e.g. EOF while reading line) is caught during reads for interactive mode prompts. Instead re-set the report name to a sane value (localname) and attempt to continue. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* No TTY should not imply batch modeBryn M. Reeves2013-10-031-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6ea48cbb introduced an isatty() check on stdin and automatically sets batch mode if we're not attached to a TTY. Although the logic of this seems simple enough the combination of this and commit 4b46e04 breaks valid uses that have worked since sos-1.x, e.g.: 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 1171, in main sos.execute() File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 1133, in execute self._setup_logging() File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 630, in _setup_logging self.opts.batch = True File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 324, in batch self._check_options_initialized() File "/usr/lib/python2.7/site-packages/sos/sosreport.py", line 229, in _check_options_initialized + "from command line") ValueError: SoSOptions object already initialized from command line Given the actual semantics of --batch (do not prompt for or read user input from stdin) there is no need to enable it if stdin is a pipe or other non-TTY file descriptor. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Merge pull request #202 from karibou/masterAdam Stokes2013-09-301-0/+31
|\ | | | | | | | | Add new plugin for apt Signed-off by: Adam Stokes <adam.stokes@ubuntu.com>
| * Add new plugin for aptLouis Bouchard2013-09-301-0/+31
|/ | | | Closes #201
* Update AUTHORSAdam Stokes2013-09-091-0/+2
| | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* Merge branch 'master' of github.com:jpeeler/sosreport into jpeeler-masterAdam Stokes2013-09-091-0/+59
|\ | | | | | | | | | | | | | | | | | | Note: Changed original filename from openstack-heat.py to openstack_heat.py as the plugin would fail to load with the original filename. Closes #190 Signed-off-by: Jeff Peeler <jpeeler@redhat.com> Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| * Add new plugin for openstack-heatJeff Peeler2013-08-271-0/+59
| |
* | Add new plugin for openstack-ceilometer.Eoghan Glynn2013-09-091-0/+53
| | | | | | | | | | | | | | Closes #199 Signed-off-by: Eoghan Glynn <eglynn@redhat.com> Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* | Update travis-ci notifications for ircAdam Stokes2013-09-081-0/+4
| | | | | | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* | Update README.mdAdam Stokes2013-09-081-1/+1
| | | | | | Replace travis-ci status image with that of this upstream repo.
* | Split Cinder out of openstack's plugin. #183Flaper Fesp2013-09-072-18/+65
| | | | | | | | | | Signed-off-by: Flavio Percoco <fpercoco@redhat.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* | Merge pull request #188 from FlaPer87/issue/184Bryn M. Reeves2013-09-072-18/+55
|\ \ | | | | | | Split Swift out of openstack's plugin. #184
| * | Split Swift out of openstack's plugin. #184Flaper Fesp2013-09-072-18/+55
| |/ | | | | | | Signed-off-by: Flavio Percoco <flaper87@gmail.com>
* | Merge pull request #187 from FlaPer87/issue/182Bryn M. Reeves2013-09-072-15/+54
|\ \ | | | | | | Split Glance out of openstack's plugin
| * | Split Glance out of openstack's plugin. #182Flaper Fesp2013-09-072-15/+54
| |/ | | | | | | Signed-off-by: Flavio Percoco <flaper87@gmail.com>
* | Merge pull request #194 from wenjianhn/import-sysAdam Stokes2013-09-041-0/+1
|\ \ | |/ |/| import sys - Module sys is used but it is not imported.
| * import sysJian Wen2013-09-041-0/+1
|/ | | | Module sys is used but not imported.
* Make semange use stdout instead of output pathBryn M. Reeves2013-08-221-2/+1
| | | | | | | | | | The semanage tool fails to write to a path within the temporary report tree on some distributions due to an SELinux AVC denial. Force the command to write data to stdout instead by passing '-o -'. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Add Plugin method to build command output pathsBryn M. Reeves2013-08-212-6/+15
| | | | | | | | | | | | | Add a convenience method to construct an absolute path for command output from a relative path or file name. This can be used for e.g. to pass an output path to an external program that produces output at a named path rather than on stdout and can be used internally by the Plugin.make_cmd_dirs() method. Convert the SELinux plug-in to use the new method when passing output paths to the semanage command. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Add Plugin method to create new command output directoriesBryn M. Reeves2013-08-211-0/+5
| | | | | | | | | | | | Some plug-ins want to store command output in subdirectories of their 'sos_commands/<plugin>/' directory. Currently there are various hand-rolled methods to build this in different plug-ins. Add a single method to the base Plugin class that builds the correct path string and recursively creates the directories via os.makedirs() in a single step. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Rename Plugin.get_cmd_dir() to get_cmd_path()Bryn M. Reeves2013-08-216-9/+9
| | | | | | | | | | The method to retrieve the path into which a plug-in's collected command output returns a path as a string rather than a directory object. Make this clear by renaming the method to 'get_cmd_path()'. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Add ausearch and semange customisations to SELinux plug-inBryn M. Reeves2013-08-211-0/+5
| | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Add crm_report support to cluster plug-inBryn M. Reeves2013-08-141-0/+3
| | | | | | | | | | Recent cluster stacks using the pacemaker stack include a crm_report script to generate debugging information for the cluster. Call it in single-node mode in the cluster module. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Remove legacy system support from cluster plug-inBryn M. Reeves2013-08-141-71/+29
| | | | | | | | | | | The cluster plug-in attempted to support three prior generations of cluster components in a single plug-in. These will never be required today since all current versions where sos-3.x would be used are all using much later packages. Remove this code and simplify the overall plug-in organisation. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Remove obsolete checks and exception handling from s390 plug-inBryn M. Reeves2013-08-141-7/+3
| | | | | | | | | | | | The s390 plug-in has some strange checks on the distribution version before collecting a couple of s390-specific commands. The entire code block is also wrapped in try/except. Remove this: all add_cmd_output() succeed without exceptions even if the command does not exist or cannot be run. The exception handling also does nothing useful. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Do not attempt to read use-gss-proxy file in procfsBryn M. Reeves2013-08-141-0/+2
| | | | | | | | | | | | | | The networking plug-in scoops up /proc/net. There are some pseudo- files in here that we should avoid touching. These either have side-effects or hang the reading process. Add a forbidden path for the /proc/net/rpc/*/{channel,flush} files as these will cause side-effects for RPC applications running on the host. Forward port of commit 61585d4 on rhel-6 branch. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Do not attempt to read use-gss-proxy file in procfsBryn M. Reeves2013-08-141-0/+1
| | | | | | | | | | The networking plug-in scoops up /proc/net. There are some pseudo- files in here that we should avoid touching. These either have side-effects or hang the reading process. Add a forbidden path for the /proc/net/rpc/use-gss-proxy file. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Add new patterns to the RPM plug-in verify listBryn M. Reeves2013-08-131-1/+7
| | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Collect saved vmcore-dmesg.txt files in kdump plug-inBryn M. Reeves2013-08-131-3/+5
| | | | | | | | | Recent versions of kexec-utils automatically generate a text file containing the dmesg buffer of the captured vmcore. This is useful for first-fault debugging and should be included. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Make 'ipsec barf' collection non-default in openswan plug-inBryn M. Reeves2013-08-131-1/+5
| | | | | | | | | | | | | The 'ipsec barf' debugging command has a nasty bug where it runs grep on /var/log/lastlog. Since this can be a multi-gigabyte sparse file this doesn't work very well and consumes huge amounts of memory. This can lead to timeouts and aborts when running sos since the openswan plug-in calls this command by default. The barf information is seldom useful anyway - turn it off by default to avoid this problem. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Add pam_ldap.conf collection to ldap plug-inBryn M. Reeves2013-08-131-4/+9
| | | | | | | Add the pam_ldap.conf file to the data collected by the ldap plug-in and tidy up substitution strings for this plug-in. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Improve readability of add_copy_specs() usage in ldap.pyBryn M. Reeves2013-08-131-3/+10
| | | | | | | Use multi-line style for add_copy_specs() invocations in the ldap plug-in per the recommendations in Issue #173. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Rationalise lvm2 plug-in lvmdump optionsBryn M. Reeves2013-08-131-7/+11
| | | | | | | | | | | The lvm2 lvmdump options were a bit crazy, allowing the user to specify a default ('lvmdump'), or an advanced collection ('lvmdump-a') but not the raw metadata ('-m') option which is often useful for support purposes. Replace 'lvmdump-a' with 'lvmdump-am' to collect both. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Make lvm2 plugin lvmdump option collect metadataBryn M. Reeves2013-08-131-2/+2
| | | | | | | | | | The lvmdump-a option currently collects 'advanced' data but not raw metadata. Since it's off by default and the metadata is often of interest in support cases rename the option to lvmdump-am and have it also pass the '-m' (raw metadata) option to the lvmdump script. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Collect /var/log/squid in squid plug-inBryn M. Reeves2013-08-121-1/+2
| | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Add file substitution rule for openhpiclient.confBryn M. Reeves2013-08-121-0/+3
| | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Add new plug-in to gather OpenHPI configurationBryn M. Reeves2013-08-121-0/+34
| | | | | | | | | New plug-in to collect OpenHPI configuration files. These files may contain passwords; a regex substitution rule has been added based on information from the reporter but this needs testing with a range of actual configuration files. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Collect /proc/self/mountstats and /proc/self/mountinfoBryn M. Reeves2013-08-121-0/+2
| | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Update utilities_tests.pyAdam Stokes2013-08-091-2/+2
| | | Update unittests to reflect 4a594b6dce129f8d9837c0d93768576badf2b2b7
* Strip trailing newline from command outputBryn M. Reeves2013-08-061-0/+2
| | | | | | | | This commit brings sos-3.x behaviour into line with earlier releases and produces captured command output that is consistent with typical shell redirection use. Resolves: bz971420
* Do not collect krb5.keytabBryn M. Reeves2013-08-012-4/+2
| | | | | | | | | | | | Avoid collecting kerberos keytabs to prevent unintended information disclosures. Instead retrieve a list using the klist command. Also remove the duplicative collection of this information from the ipa plug-in (which should only be collecting non-system keytabs that are specific to the IPA tools). Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Split kerberos data collection into separate plug-inBryn M. Reeves2013-08-012-17/+31
| | | | | | | | | The krb5 data collection in the samba plug-in is misplaced. Since this is collecting information about the system keytab move it to its own plug-in that can be activated on any kerberos enabled system. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Merge pull request #178 from battlemidget/patch-debian-updatesAdam Stokes2013-07-313-1/+14
|\ | | | | Update debian changelog and watch file
| * Merge branch 'master' into patch-debian-updatesAdam Stokes2013-07-313-5/+18
| |\ | |/ |/|
* | Add restricted rpm verifyBryn M. Reeves2013-07-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | Add a default call to rpm -V/--verify for a targeted subset of packages. This greatly reduces the time taken relative to rpm -Va while still capturing important diagnostic information. In future this capability could be made a feature of the PackageManager class interface and available to all ports/modules. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* | Restrict wbinfo collection to the current domain.Bryn M. Reeves2013-07-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The samba module calls the wbinfo command to collect user and group information. This by default will search all domains to which the host has access. In a large AD environment with a number of trusted domains this causes the winbindd process to consume excessive CPU and memory resources. The Samba developers have commented that fixing this would require a complete rewrite of the winbind protocol and wbinfo client. Since listing out the _entire_ set of visible users is unlikely to be of any use anyway pass the --domain='.' option to restrict the search to the current domain of the system. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* | Update README.mdAdam Stokes2013-07-291-3/+8
| | | | | | Now that sosreport is in Debian unstable and Ubuntu 13.10 update the readme to reflect a more 'official' way to install this application
| * add additional information into changelog update watch file to point to latestAdam Stokes2013-07-262-1/+11
| | | | | | | | | | | | release. Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>