| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The automation used to convert to add_copy_specs() and
add_cmd_outputs() left a few missing and stray commas in file
and command lists, for e.g. causing two lsusb commands to be
concatenated:
Running 71/74: usb...
[plugin:usb] collecting path '/sys/bus/usb'
[plugin:usb] collecting output of 'lsusblsusb -v'
[plugin:usb] collecting output of 'lsusb -t'
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
| |
The plugin list shows logs twice for Ubuntu and Debian systems. Since the
variations between the 2 are minimal we are combining those classes.
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|
|
|
|
|
|
|
| |
Plugins should not open-code calls to external commands. Use the
build-in check_ext_prog() interface instead and test for success
before attempting to collect the statedump files.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
| |
Looks like python 3.4 is not ready available on travis-ci.org. We'll make
3.4 unit testing a requirement once travis-ci makes python 3.4 an available
environment.
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|
|
|
| |
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|\
| |
| | |
Add collection of /etc/network/interfaces.d for Ubuntu
|
|/
|
|
|
|
|
|
| |
Since 14.04 Trusty, ubuntu uses config scripts in
/etc/network/interfaces.d. Collect those.
Closes: #264
Signed-off-by: Louis Bouchard <louis.bouchard@canonical.com>
|
|
|
|
|
|
|
|
|
|
| |
Add a new method to Plugin to add a list of commands to be run,
analogous to add_copy_specs() vs add_copy_spec().
Also convert a few plugins not using add_copy_specs() for long
file lists (or using it inconsistently).
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
| |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
| |
Fixes Issue #253.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
| |
The rpm plugin is the last user of shell syntax. For now have it
call its pipeline explicitly using sh -c '...'.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
|
| |
OpenShift uses 'cd /path && cmd' in a call to add_cmd_output().
Replace this with the runat paramter and avoid shell syntax in
the plugin.
Related: Issue #253.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
| |
Add a new 'runat' parameter sos_get_command_output() to specify
a directory for the child to switch to before executing the given
command and propagate this through the various command output
collection interfaces.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
| |
This is redundant since the whole ps and mount output is
captured elsewhere. Also removes shell syntax from the plugin.
Related: Issue #253.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
| |
This is redundant since the whole lspci and lsmod output is
captured elsewhere. Also removes shell syntax from the plugin.
Related: Issue #253.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
|
| |
This is redundant since the whole boottime dmesg (and current
dmesg buffer) are captured elsewhere. Also removes shell syntax
from the plugin.
Related: Issue #253.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
|
| |
The generic UI text in the policy base class was replaced with
the Red Hat Enterprise Linux wording in commit c59877c. The
wording isn't suitable for all distributions so revert this part
of the commit and move the RHEL text back to the RHEL-specific
policy class.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Improve logging output and make consistent use of log levels in
plugin code.
Log messages for the archive and plugin classes now use their
own class-level logging interface to prefix messages with a
label indicating the message source, e.g.:
[plugin:yum] collecting output of 'yum -C repolist'
[archive:TarFileArchive] finalizing archive '/var/tmp/sosreport-f20-vm1-20140406162540'
Convert existing plugin and archive code to use the new
interfaces.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
| |
Since add_string() attempts to copystat() strings that exist in
the host file system it also needs to check for PermissionError
exceptions.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
| |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
An exception can occur at several points in add_file()
- Copying the source to the destination
- Propagating permissions with shutil.copystat
- Setting ownership via os.chown
The second of these can occur when copying SELinux xattrs from
/proc. Separate out the three cases and ignore failures in
copystat.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
| |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
| |
Update URLs to reflect repository rename to 'sos'.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
| |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
| |
Use call_ext_prog() to mount/umount debugfs and check for errors
before running kvm_stat.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
| |
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|
|
|
|
|
|
| |
The 'u' prefix wasn't reintroduced back into Python 3 until
version 3.3. Use six here to accomodate for that.
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|
|
|
|
|
| |
Python3 needs a byte string as argument to six.binary_types.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
| |
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|
|
|
|
|
|
|
|
| |
Python3 strings do not have a .decode() method. When clearing
output for command-not-found case use binary_type("") instead of
the empty string. This gives a bytestring on python3 which does
support the decode() method.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
| |
Something our unittests didnt catch which is more functional
than anything. Using raw_input fails on python3 because it was
renamed to input. Six provides an alias that handles both
cases.
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The path to the 'head' binary was mangled in the automated PATH
conversion (commit e0d132e). It's not required anyway - we might
as well grab the entire output. Also remove a useless package
check before running the command.
Fixes Issue #254.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Returning a 3-tuple has always been ugly. It gets worse as the
parameter list for this family of functions grows. Worse, the 3rd
member of the tuple is unused and is always set to 0.
Rip the whole mess out and return a single, simple dictionary
object with 'status' and 'output' keys.
Update utilities_tests to reflect the new interface.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
| |
Remove dead code and clean up the logic in sos_get_command_output.
This paves the way for simplifying parameter and return passing
in the Plugin command output entry points.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
| |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
| |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Add a method to the Plugin class to apply a regex substitution
to a set of paths maching a path regex. For e.g.:
self.do_path_regex_sub(r'/etc/foo.*', 'pw=(.*)', 'pw=****')
The oVirt plugin will use this.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
| |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
| |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
| |
Move common files from DebianCgroups to Cgroups and drop separate
DebianPlugin class. Make add_copy_specs() invocations conform to
recommended indent style.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
| |
/var/log/cloud-init-output.log if they exist.
Closes: #250
Signed-off-by: Louis Bouchard <louis.bouchard@canonical.com>
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|
|
|
| |
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|
|
|
|
|
| |
Also updated the REPO variable to point to new vcs location
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The output of ifconfig or ip link is not enough to understand the full
state of the network card flags. In particular IFF_PROMISC is set on a
a bridge port-member but that is not displayed via ifconfig nor ip link.
See also https://bugzilla.redhat.com/show_bug.cgi?id=199979c#17 why we
need to do this.
Closes #245
Signed-off-by: Michele Baldessari <michele@acksyn.org>
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|
|
|
|
|
|
|
|
|
|
| |
UEFI systems store the grub configuration at:
/boot/efi/EFI/*/grub.conf [grub 1.x]
/boot/efi/EFI/*/grub.cfg [grub 2.x]
Add these paths to the respective modules.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
|
| |
Since strings are iterable a plugin attempting to call
add_copy_specs("/something") results in a plugin calling
add_copy_spec("/"). Raise a TypeError if this happens.
Fixes Issue #141.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
| |
Give add_copy_spec() and add_copy_specs() their own test cases.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
| |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
|
|
|
|
|
| |
We want to remove any duplicates from the list of paths to
collect. Use a set and update it with the expansion of each copy
spec as we add it. This avoids having to explictly test for
duplicates when we come to iterate over the set.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
|
| |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|