aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [Cirrus] Add testing via Cirrus CIJake Hunsaker2020-11-191-0/+101
| | | | | | | | | | | | | | | | | | | | | | | Adds functional CI testing via Cirrus in conjunction with GCE. Tests can now be run on Fedora as well as Ubuntu hosts, and minor tasks can be run in containers. This will allow us to easily expand our testing base across more distributions provided those distributions can be run on GCP instances. As new releases of supported distributions are made available, the maintainers will need to build and push updated Fedora (or more generally, RH-family) images to the GCP project. Ubuntu has cloud images on GCE already, so when new releases of Ubuntu are pushed we will simply need to update .cirrus.yml to point to the new public images. Note that at the moment testing on RHEL is not enabled, though it should follow the same framework as the Fedora tests and should hopefully be coming before too long. Closes: #1885 Resolves: #2305 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [component] Add log verbosity from presetsErik Bernoth2020-11-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: #2289 The main problem this tries to solve was that preset verbosity was ignored in logging. With a simple test this could be reproduced: sudo sh -c "source /path/to/repo/sosreport/venv/bin/activate; \ cd /tmp/foo; sos report --preset sostestpreset; cd -" The bug is that without a change of code there are no messages from the plugin `host` (no lines of output start wiht "[plugin:host]"). The problem is that the logging is set in the inherited __init__() method from Component, but the presets are only handled afterwards in the Report's __init__(). Since it is good to have logging configured from the beginning, the only option is to reconfigure it after the preset config is known. The simplest method is to reinitialize the logging, although maybe not the most efficient. Signed-off-by: Erik Bernoth <ebernoth@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [cleaner] Match MAC addrs in lines that end in punctuationJake Hunsaker2020-11-181-1/+22
| | | | | | | | | | | | | | | It was found that sometimes MAC addresses would not be obfuscated from certain files when the MAC address was followed by punctuation, such as periods. This was because the regex used to match IPv4 MAC addresses needs to avoid matching a substring within IPv6 mac addresses. Update the regex to compensate, and then override the `parse_line()` method to pull the matched punctuation out of the matched MAC substring so that obfuscation remains consistent. Resolves: #2311 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [auditd] Collect all fanotify message by defaultThorsten Scherf2020-11-181-1/+1
| | | | | | | | | The auditd plugin should collect all fanotify messages by default. Resolves: #2313 Signed-off-by: Thorsten Scherf <tscherf@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [postgresql] reorganize postgres from SCLPavel Moravec2020-11-171-30/+24
| | | | | | | | | | | - enable RedHatPostgreSQL also by rh-postgresql12 SCL - collect configs and logs regardless of running service - collect "du -sh" for SCL directories as well Resolves: #2309 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [Plugin] exec_cmd(): pass stderr along to sos_get_command_output()Mauricio Faria de Oliveira2020-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sosreport of a system with this issue: ``` # ip netns Error: Peer netns reference is invalid. Error: Peer netns reference is invalid. test-ns ``` Shows this difference between the plugins ebpf and networking (callers of `ip netns`): ``` # ./bin/sos report -o ebpf,networking --batch # tar tf /tmp/sosreport-*.tar.xz | grep ip_netns_exec .../sos_commands/ebpf/ip_netns_exec_test-ns_bpftool_net_list .../sos_commands/networking/ip_netns_exec_Error_ip6tables-save .../sos_commands/networking/ip_netns_exec_Error_ip6tables-save.1 ... .../sos_commands/networking/ip_netns_exec_test-ns_ip6tables-save ... ``` Only the networking plugin called `ip netns exec <ns> <cmd>` on `Error:` lines. Hmm. ... The networking plugin calls `collect_cmd_output()`, which has parameter stderr=True` as default: ``` def collect_cmd_output(self, cmd, suggest_filename=None, ... stderr=True, ... ``` The ebpf plugin calls `exec_cmd()`, BUT it has parameter `stderr=True` as default AS WELL: ``` def exec_cmd(self, cmd, timeout=cmd_timeout, stderr=True, ... ``` So, why the difference? ... Well, it turns out `exec_cmd()` does NOT pass the `stderr` parameter along to `sos_get_command_output()`: [but `collect_cmd_output()` does.] ``` return sos_get_command_output(cmd, timeout=timeout, chroot=root, chdir=runat, binary=binary, env=env, foreground=foreground) ``` And `sos_get_command_output()` has `stderr=False` as default: ``` def sos_get_command_output(command, timeout=300, stderr=False, ... ``` Thus, despite `exec_cmd()` has `stderr=True` as default it is _ignored_, as its callee `sos_get_command_output()` has `stderr=False` as default. This explains the output difference between the ebpf/networking plugins. ... Looking back for details, the origin of the change is in PR#1807 [1], with commit e8bb94c (refactor command functions/introduce `exec_cmd()`) and commit e51d3e6 (update caller plugins). The PR has no mentions/discussion around `stderr` in comments/review, so it's apparently an oversight during the refactor, I guess. Because, previously the refactored callers of `sos_get_command_output()` (`get_command_output()`, `call_ext_prog()`, `[_]get_cmd_output_now()`) all had `stderr=True` as parameter/default, passing it along to callee. (The only exception is in `_collect_cmd_output()` which does the first call in the chroot with `stderr`, and falls back to non-chroot without `stderr`, but it was already that way. Thus not changing this case.) ... So, it seems right and safe and opportune to fix this inconsistency between default `stderr` in `exec_cmd()` / `sos_get_command_output()` by just passing it along between them: Right: because it restores the previous behavior (before refactor) assumed/accepted by callers that did not specify `stderr=False`. Safe: because it restores the actual behavior to previous behavior, and if plugins handled `stderr` lines previously, they should also handle it now, for the most part (i.e., not any new `stderr` lines, but they are currently ignoring those, and should get them covered.) Opportune: because if any plugin breaks _now_ because of this, it is a new/post-refactor change that decided to use `exec_cmd()` with the default that is inconsistent with actual behavior, and it seems okay to take bugs for that, so to identify and fix such cases. Hopefully those points are reasonable with the project's philosophy. ... Test-case: Setup: ``` $ sudo python3 from sos import SoS from sos.report.plugins import Plugin sos = SoS(['report']) plugin = Plugin(sos._component.get_commons()) ``` Before: ``` >>> print(plugin.exec_cmd('ip netns')['output']) test-ns >>> print(plugin.exec_cmd('ip netns', stderr=True)['output']) test-ns >>> print(plugin.exec_cmd('ip netns', stderr=False)['output']) test-ns ``` After: ``` >>> print(plugin.exec_cmd('ip netns')['output']) Error: Peer netns reference is invalid. Error: Peer netns reference is invalid. test-ns >>> print(plugin.exec_cmd('ip netns', stderr=True)['output']) Error: Peer netns reference is invalid. Error: Peer netns reference is invalid. test-ns >>> print(plugin.exec_cmd('ip netns', stderr=False)['output']) test-ns ``` ... Test-suite: ``` # ./tests/simple.sh <...> Summary failures false time 2 -l failures false time 3 --list-presets failures false time 3 --list-profiles failures false time 17 --batch --build --no-env-vars failures false time 3 Size 14.23KiB --batch --no-report -o hardware failures false time 20 Size 2.99MiB --batch --label TEST -a -c never failures false time 20 Size 2.81MiB --batch --debug --log-size 0 -c always failures false time 20 Size 2.84MiB --batch -z xz --log-size 1 failures false time 19 Size 4.01MiB --batch -z gzip failures false time 32 Size 2.76MiB --batch -t 1 -n hardware failures false time 19 --batch --quiet -e opencl -k kernel.with-timer failures false time 22 Size 4.31MiB --batch --case-id 10101 --all-logs --since=20201110 failures false time 21 Size 3.06MiB --batch --verbose --no-postproc failures false time 39 Size 2.82MiB --batch --mask Everything worked! ``` [1] https://github.com/sosreport/sos/pull/1807 Resolves: #2306 Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [openstack_tripleo] Add new path for log collectionKevin Carter2020-11-171-7/+6
| | | | | | | | | | | | | This change essentially adds /var/lib/tripleo to the collection path. All of the collection targets have been moved into a class object which is easily shared across methods. This will alow us to easily collect more in the future and ensure all of our collected objects are sanitized. Resolves: #2300 Signed-off-by: Kevin Carter <kecarter@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [sos] Fix argparse error output formattingJake Hunsaker2020-11-101-1/+2
| | | | | | | | | | | | | | | | | | | Error message propagation from the subparsers was causing the error message to be mangled with the usage string from the "main" parser when an invalid argument value was passed. After discussion with python upstream, while this is an issue with the subparser formatting (as %(prog) is being set to the main parser's usage), there are simple paths around this behavior so a code change there will not be forthcoming. Instead, override the subparser's prog to be a single line string instead of the main parser's usage string. Closes: #2285 Resolves: #2301 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [ds] collect listing of DB filesPavel Moravec2020-11-101-0/+2
| | | | | | | | | The listing helps to troubleshoot possible DB corruption issues. Resolves: #2303 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [ovirt] collect /etc/pki/ovirt-engine/.truststorePavel Moravec2020-11-101-2/+5
| | | | | | | | | | | .truststore contains useful public CAs but a_c_s skips collecting that hidden file. Closes: #2296 Resolves: #2297 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [component] execute() as Abstract classErik Bernoth2020-11-101-0/+3
| | | | | | | | | | | | | | Resolves: #2295 `execute()` is a method that should be implemented by subclasses of Component. And the python documentation recommends to also add the method to the parent class and raise a specific error to indicate that the parent class should not implement it. See: https://docs.python.org/3/library/exceptions.html#NotImplementedError Signed-off-by: Erik Bernoth <ebernoth@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [report] remove redundant test of compression methodsPavel Moravec2020-11-041-9/+0
| | | | | | | | | | | Argparse processing of compression method already contains this inclusion test, let delete it from here. Closes: #2286 Resolves: #2293 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [rhui] remove obsolete pluginPavel Moravec2020-11-041-41/+0
| | | | | | | | | | This is python2 only specific plugin, remove it for now. Closes: #2287 Resolves: #2292 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [fibrechannel] Add remote_ports to files tupleDaria Bukharina2020-11-041-1/+1
| | | | | | | | | | | Adds the `fc_remote_paths` path to the files tuple for plugin enablement. This also indirectly fixes a bug where the plugin would also be enabled due to a malformed 1-tuple. Resolves: #2284 Signed-off-by: Daria Bukharina d.bukharina@yadro.com Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [sapnw] Update plugin to conform with style guidelinesJake Hunsaker2020-11-031-46/+37
| | | | | | | | | | Updates the `sapnw` plugin to conform to modern sos plugin style guidelines, and generally make the plugin easier to read. Closes: #1071 Resolves: #2291 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [saphana] Refactor collection loop for style guidelinesJake Hunsaker2020-11-031-29/+21
| | | | | | | | | Updates the `saphana` plugin to be more readable and align with the standard sos plugin style guidelines. Related: #1071 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [report] Allow users to specify commands and files to skipJake Hunsaker2020-11-038-0/+85
| | | | | | | | | | | | | | | Adds two new options, `--skip-commands` and `--skip-files`, that allow users to selectively skip specific command or file collection instead of having to disable whole plugins to skip those collections. These options are also exposed via `sos collect`, being gated by a version of 4.1 since that is the next scheduled release where we can guarantee this functionality will be present. Closes: #2203 Resolves: #2271 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [build] Update specfile for RPM buildsJake Hunsaker2020-11-031-3/+3
| | | | | | | | | | | First, fixes incorrect package names in the Requires added to the final RPM. Second, fixes the specfile to remove the unpackaged copy of sos.conf. Resolves: #2222 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [build] Add sos.conf to distutils configJake Hunsaker2020-11-031-1/+2
| | | | | | | Adds sos.conf to the distutils config so that it will be included in manual installations and source distribution tarballs. Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [azure] Include AEM (Azure Enhanced Monitoring for Linux) dataOliver Falk2020-10-271-1/+2
| | | | | | | Resolves: #2267 Signed-off-by: Oliver Falk <oliver@linux-kernel.at> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [sos] Fix use of relative paths for --tmp-dirJake Hunsaker2020-10-261-1/+1
| | | | | | | | | | | | | | | Fixes an issue where the use of relative paths for `--tmp-dir` causes a failure in the building of the final archive. Previously, a relative path would cause the tarball to be produced in a nested directory under the temp directory of the same name, which would in turn cause compression and all further operations for the archive to fail. Fix this by converting relative paths in the option to the absolute path internally. Resolves: RHBZ#1891562 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [networking] Include ns ip neigh and ip rule infoEdward Hope-Morley2020-10-261-0/+2
| | | | | | | | Resolves: #2282 Closes: #2281 Signed-off-by: Edward Hope-Morley <edward.hope-morley@canonical.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [plugins] Use `IndependentPlugin` tag in more pluginsJake Hunsaker2020-10-2695-201/+197
| | | | | | | | | | | | | | | | This commit updates 94 plugins to use `IndependentPlugin` as the tagging class, instead of the distro-specific tags. This tag is applied to plugins where _all_ of `RedHatPlugin`, `DebianPlugin`, and `UbuntuPlugin` are imported and there is only a single class definition for the plugin which uses all of those tagging classes. `SuSEPlugin` is also accepted where it is explicitly imported, as the SuSE policy already uses the `RedHatPlugin` tagging class as well. Resolves: #2256 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [policy] Fix the passing of 'query_command' argument for SUSE.Daria Bukharina2020-10-261-1/+2
| | | | | | | | | RPM query string was passing to chroot argument insted of query_command. Resolves: #2279 Signed-off-by: Daria Bukharina <d.bukharina@yadro.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [pulp] collect dynaconf list in pulp-3Pavel Moravec2020-10-261-1/+16
| | | | | | | | | | | - enable the plugin for pulp-3 - collect dynaconf list output and scrub passwords there Resoves: #2277 Closes: #2266 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [stratis] Collect key list and report enginePavel Moravec2020-10-191-1/+4
| | | | | | | | | | Required for troubleshooting Stratis-engine v. 2.1.0. Resolves: #2274 Closes: #2273 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [ovirt_imageio] Include oVirt imageio v2 filesJuan Orti Alcaine2020-10-191-2/+6
| | | | | | | | | | | | | | Include logs and configuration of ovirt-imageio v2 (ovirt >= 4.4) The configuration is now located in /etc/ovirt-imageio, and the logs in /var/log/ovirt-imageio. Include also /etc/ovirt-imageio-daemon/daemon.conf which was missing for older versions. Closes: #2260 Resolves: #2275 Signed-off-by: Juan Orti <jortialc@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [policy] Use FTP server when user isnt set in batch modePavel Moravec2020-10-191-2/+10
| | | | | | | | | | | Caling "sos report --upload --case-id=123 --batch" should fallback to uploading to FTP server as the upload user is unknown and can't be prompted in batch mode. Resolves: #2276 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [openvswitch] fix dpdk-devbind.py commandKevin Traynor2020-10-141-1/+1
| | | | | | | | | | | | | | | | dpdk_nic_bind.py came from DPDK project and was renamed to dpdk-devbind.py in DPDK 16.07. The renamed script uses a hyphen as a seperator and not an underscore. Checked upstream DPDK project and packaged versions on Fedora32/RHEL8/Ubuntu20.04 and all using hyphen. Replace underscore with hyphen in the sos command. Signed-off-by: Kevin Traynor <ktraynor@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [kdump] Collect new kdump logfilesJose Castillo2020-10-141-1/+3
| | | | | | | | | | | | | | | | | | Two new logfiles are available in kdump: /var/log/kdump.log /var/crash/*/kexec-kdump.log The path for the second logfile mentioned above is the default one, but this patch deals with a change in default directory the same way that we do with the file vmcore-dmesg.txt. Resolves: RHBZ#1817042 and RHBZ#1887390. Resolves: #2270 Signed-off-by: Jose Castillo <jcastillo@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [cleaner] more streamlined sanitize_item methodPavel Moravec2020-10-141-2/+1
| | | | | | | | | Remove a duplicate call in both IF branches. Resolves: #2272 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [haproxy] Collect journal logs and services status infosEric Desrochers2020-10-091-0/+3
| | | | | | | Resolves: #2259 Signed-off-by: Eric Desrochers <eric.desrochers@canonical.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [filesys] never collect content of /proc/fs/panfsRenaud Métrich2020-10-091-0/+2
| | | | | | | | | | | panfs (from Panasas company) provides statistics under /proc/fs/panfs which makes sosreports become several hundreds of GBs. This path must hence be blacklisted. Resolves: #2262 Signed-off-by: Renaud Métrich <rmetrich@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [docs] update readmeKenny Tordeurs2020-10-091-2/+7
| | | | | | | Resolves: #2268 Signed-off-by: Kenny Tordeurs <ktordeur@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [npm] Remove call to 'npm cache ls'Jake Hunsaker2020-10-071-41/+0
| | | | | | | | | | | | This removes the call and iteration of `npm cache ls`, which is no longer a valid `npm` command. The upstream for npm notes that the only way to inspect the cache now is to use the `cacache` node.js library, which is something that cannot be done via sos. Closes: #2177 Resolves: #2255 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [cleaner] Add username parserJake Hunsaker2020-10-075-2/+113
| | | | | | | | | | | | | Adds a username parser for native obfuscation of usernames that appear in `lastlog` output as collected by the `login` plugin. Users may also supply additional usernames not appearing in `lastlog` output via the `--usernames` option for either report, clean, or collect. Resolves: #2253 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [policy] Handle additional failure conditions for FTP uploadsJake Hunsaker2020-10-071-3/+8
| | | | | | | | | | | | | | | | Adds a timeout and a timeout handler for FTP connections, rather than letting the connection attempt continue indefinitely. Second, adds exception handling for an edge case where the connection to the FTP server fails, but does not generate an exception from the ftplib module. Additionally, correct the type-ing of the error numbers being checked so that we actually match them. Resolves: #2245 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [policy] Use user-provided FTP directory if specifiedJake Hunsaker2020-10-072-2/+3
| | | | | | Fixes an issue whereby we ignore a user-provided FTP directory. Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [redhat] Ease upload url determination logicJake Hunsaker2020-10-072-4/+10
| | | | | | | | | The logic for determining if an archive should be uploaded to the Customer Portal was too strict, ease it to now properly only block on a missing case number since username and passwords may now be provided via env vars. Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [networking] Add ip6tables-save output for namespacesBrian Haley2020-10-011-0/+1
| | | | | | | | | | The loop that collects iptables-save output should be doing the same for IPv6. Resolves: #2252 Signed-off-by: Brian Haley <bhaley@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [conntrack] add conntrack infoHemanth Nakkina2020-10-011-4/+11
| | | | | | | | | | | | | The plugin conntrackd is renamed to conntrack. Added the following conntrack commands to the plugin. conntrack -L -o extended conntrack -S Closes: #2049 Resolves: #2251 Signed-off-by: Hemanth Nakkina hemanth.nakkina@canonical.com Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [openvswitch] catch cases when 'ovs-vsctl list bridge' has no outputPavel Moravec2020-10-011-0/+1
| | | | | | | | | | | | If ovs_list_bridge_cmd does not return a valuable output, br_protos variable won't be assigned before we reference it. Fix that by assigning an empty list to br_protos . Resolves: #2249 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [openvswitch] Flake8 fixupsJake Hunsaker2020-09-241-1/+3
| | | | | | Import `re` and make the regex string a raw string to fix flake8 errors. Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [snappy] Renaming snappy plugin to snap.Eric Desrochers2020-09-241-2/+2
| | | | | | | | | | | | The term 'snap' is generally more recognised in the wider community and in a day-to-day Canonical support. Closes: #2243 Resolves: #2244 Signed-off-by: Eric Desrochers <eric.desrochers@canonical.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [openvswitch] Adding 6wind commandsDavid Vallee Delisle2020-09-241-11/+121
| | | | | | | | | This adds the 6wind's commands to openvswitch plugin. Resolves: #2242 Signed-off-by: David Vallee Delisle <dvd@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [cleaner] Make tarball regex raw stringsJake Hunsaker2020-09-211-2/+2
| | | | | | | Make the tarball regex strings raw strings, to satisfy a flake8 rule for escape sequences. Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [crio] collect /etc/crio/crio.conf.d/Pavel Moravec2020-09-211-0/+1
| | | | | | | | | Crio configs can be newly in the dir also. Resolves: #2240 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [obfuscation_archive] Fix tarball skipping regexJake Hunsaker2020-09-211-1/+3
| | | | | | | | | | | | | | | The regex used to skip tarballs was slightly too vague, in that we were checking for any characters following 'tar', instead of any characters following 'tar.'. This in turn lead to the potential for skipping files that included the original sosreport archive's name. Make the regex more exact to no longer make these accidental matches, and only match on true tarballs. Closes: #2236 Resolves: #2238 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [cleaner] Fix handling of filepath when archive name is in the filepathJake Hunsaker2020-09-211-1/+1
| | | | | | | | | Fixes the splitting of filepaths within the archive, when the archive name is included in the filename inside the archive. Related: #2236 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
* [rabbitmq] Add 10 second timeout to call to `maybe_stuck()`.Nicolas Bock2020-09-211-2/+3
| | | | | | | | | | | | | | The `maybe_stuck()` function might run for a long time if it is tracking down a lot of potentially stuck processes. In order to prevent long run times of `sos report` the `cmd` timeout should be set explicitly. As a compromise between acceptable execution times and information gathered from the plugin, this change introduces a timeout of 10 seconds for the `maybe_stuck()` call. Resolves: #2239 Signed-off-by: Nicolas Bock <nicolas.bock@canonical.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>