| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Update the build badge for the repo README to point to Cirrus-CI instead
of Travis now that we've switched CI platforms.
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Split this into its own commit as it's mostly indentation changes.
From:
```
if self.g_n_n():
out_ns = self.g_n_n(<filters>)
for namespace in out_ns:
...
if self.get_option('ethtool_namespaces'):
for namespace in out_ns:
...
```
To:
```
for namespace in self.g_n_n(<filters>):
...
if self.get_option('ethtool_namespaces'):
for namespace in self.g_n_n(<filters>):
...
```
Resolves: #2308
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Copy the logic over from the networking plugin to `filter_namespaces()`,
which is generic, taking any list of namespaces; and then wrap it in
`get_network_namespaces()` for the particular network namespace type.
Now other plugins may be able to filter namespaces as well, and
not only network namespaces, but other types that may be added
(which can get convenience wrappers `get_X_namespaces()` then.)
In order to make the review simpler, the changes for the networking
plugin are intentionally small (keep the optional `if self.g_n_n():`
and only filter in `out_ns` which is used in `ethtool_namespaces`.)
The next patch addresses that, with the larger indentation changes.
Testing with the networking plugins' options to filter namespaces
by a regex pattern, and limit by the number:
```
$ ip netns
ns3
ns2
ns1
```
Option `networking.namespace_pattern` (only namespaces with trailing 2):
```
$ sudo ./bin/sos report -o networking \
-k networking.namespace_pattern='.*2' --batch
$ find sosreport-*/sos_commands/networking \
| cut -d/ -f2- | grep ip_netns_exec
sos_commands/networking/ip_netns_exec_ns2_iptables-save
sos_commands/networking/ip_netns_exec_ns2_ip_-s_-s_neigh_show
sos_commands/networking/ip_netns_exec_ns2_ip_address_show
sos_commands/networking/ip_netns_exec_ns2_ip_route_show_table_all
sos_commands/networking/ip_netns_exec_ns2_ethtool_-i_lo
sos_commands/networking/ip_netns_exec_ns2_ethtool_-k_lo
sos_commands/networking/ip_netns_exec_ns2_ethtool_-S_lo
sos_commands/networking/ip_netns_exec_ns2_ethtool_lo
sos_commands/networking/ip_netns_exec_ns2_ip6tables-save
sos_commands/networking/ip_netns_exec_ns2_netstat_-W_-agn
sos_commands/networking/ip_netns_exec_ns2_netstat_-W_-neopa
sos_commands/networking/ip_netns_exec_ns2_ip_rule_list
sos_commands/networking/ip_netns_exec_ns2_netstat_-s
```
Option `networking.namespaces` (only one namespace):
```
$ sudo ./bin/sos report -o networking \
-k networking.namespaces=1 --batch
$ grep 'Limiting namespace iteration' sosreport-*/sos_logs/sos.log
2020-11-18 22:48:00,263 WARNING: [plugin:networking] \
Limiting namespace iteration to first 1 namespaces found
$ find sosreport-*/sos_commands/networking \
| cut -d/ -f2- | grep ip_netns_exec
sos_commands/networking/ip_netns_exec_ns3_ethtool_-i_lo
sos_commands/networking/ip_netns_exec_ns3_ip_rule_list
sos_commands/networking/ip_netns_exec_ns3_ip_route_show_table_all
sos_commands/networking/ip_netns_exec_ns3_netstat_-W_-neopa
sos_commands/networking/ip_netns_exec_ns3_netstat_-s
sos_commands/networking/ip_netns_exec_ns3_ethtool_-k_lo
sos_commands/networking/ip_netns_exec_ns3_netstat_-W_-agn
sos_commands/networking/ip_netns_exec_ns3_iptables-save
sos_commands/networking/ip_netns_exec_ns3_ip_address_show
sos_commands/networking/ip_netns_exec_ns3_ip_-s_-s_neigh_show
sos_commands/networking/ip_netns_exec_ns3_ip6tables-save
sos_commands/networking/ip_netns_exec_ns3_ethtool_-S_lo
sos_commands/networking/ip_netns_exec_ns3_ethtool_lo
```
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Put the list of network namespaces in `commons['namespaces']['network']`
as with eg, existing block devices in `commons['devices']['block']`.
Then provide the shortcut function `get_network_namespaces()` for such.
And convert the conntrack/ebpf/networking plugins to use it, which
deduplicates their code and simplifies the plugins per-ns handling.
```
$ ip netns
ns3
ns2
ns1
$ sudo python3
>>> from sos import SoS
>>> from sos.report.plugins import Plugin
>>>
>>> sos = SoS(['report'])
>>> plugin = Plugin(sos._component.get_commons())
>>> plugin.commons['namespaces']['network']
['ns3', 'ns2', 'ns1']
>>> plugin.commons['devices']['block']
['loop1', 'vdb', 'vda', ...]
```
The contents of the `sos_commands/{contrack,ebpf,networking}`
directories are identical before/after this patch (no changes).
Before and After:
```
$ sudo ./bin/sos report -o conntrack,ebpf,networking --batch
```
Compare:
```
$ find sosreport-<OLD>/sos_commands/ | cut -d/ -f2- | sort \
> find-sosreport.old
$ find sosreport-<NEW>/sos_commands/ | cut -d/ -f2- | sort \
> find-sosreport.new
$ diff find-sosreport.{old,new}
$
$ md5sum find-sosreport.{old,new}
6fb6d8db55b4bc7197de3c65358c3576 find-sosreport.old
6fb6d8db55b4bc7197de3c65358c3576 find-sosreport.new
```
For reference, listing the commands run for `ns1`:
```
$ find sosreport-sos-g-2020-11-18-ryrcztt/sos_commands/ \
| cut -d/ -f2- | grep ns1
sos_commands/networking/ip_netns_exec_ns1_ip_rule_list
sos_commands/networking/ip_netns_exec_ns1_netstat_-W_-neopa
sos_commands/networking/ip_netns_exec_ns1_netstat_-s
sos_commands/networking/ip_netns_exec_ns1_iptables-save
sos_commands/networking/ip_netns_exec_ns1_ip_address_show
sos_commands/networking/ip_netns_exec_ns1_ethtool_lo
sos_commands/networking/ip_netns_exec_ns1_ip_route_show_table_all
sos_commands/networking/ip_netns_exec_ns1_netstat_-W_-agn
sos_commands/networking/ip_netns_exec_ns1_ip6tables-save
sos_commands/networking/ip_netns_exec_ns1_ip_-s_-s_neigh_show
sos_commands/networking/ip_netns_exec_ns1_ethtool_-i_lo
sos_commands/networking/ip_netns_exec_ns1_ethtool_-k_lo
sos_commands/networking/ip_netns_exec_ns1_ethtool_-S_lo
sos_commands/conntrack/ip_netns_exec_ns1_conntrack_-S
sos_commands/conntrack/ip_netns_exec_ns1_conntrack_-L_-o_extended
sos_commands/ebpf/ip_netns_exec_ns1_bpftool_net_list
```
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Run conntrack commands per-namespace, as the ebpf/networking plugins:
Test-case:
```
# ip netns
ns3
ns2
ns1
```
Before:
```
# ./bin/sos report -o conntrack,ebpf,networking --batch
# tar tf /tmp/sosreport-*.tar.xz | grep ip_netns_exec
.../sos_commands/ebpf/ip_netns_exec_ns1_bpftool_net_list
.../sos_commands/ebpf/ip_netns_exec_ns2_bpftool_net_list
.../sos_commands/ebpf/ip_netns_exec_ns3_bpftool_net_list
...
.../sos_commands/networking/ip_netns_exec_ns1_ip_address_show
...
.../sos_commands/networking/ip_netns_exec_ns2_ip_address_show
...
.../sos_commands/networking/ip_netns_exec_ns3_ip_address_show
...
```
After:
```
# ./bin/sos report -o conntrack,ebpf,networking --batch
# tar tf /tmp/sosreport-*.tar.xz | grep ip_netns_exec
.../sos_commands/conntrack/ip_netns_exec_ns1_conntrack_-L_-o_extended
.../sos_commands/conntrack/ip_netns_exec_ns1_conntrack_-S
.../sos_commands/conntrack/ip_netns_exec_ns2_conntrack_-L_-o_extended
.../sos_commands/conntrack/ip_netns_exec_ns2_conntrack_-S
.../sos_commands/conntrack/ip_netns_exec_ns3_conntrack_-L_-o_extended
.../sos_commands/conntrack/ip_netns_exec_ns3_conntrack_-S
.../sos_commands/ebpf/ip_netns_exec_ns1_bpftool_net_list
.../sos_commands/ebpf/ip_netns_exec_ns2_bpftool_net_list
.../sos_commands/ebpf/ip_netns_exec_ns3_bpftool_net_list
...
.../sos_commands/networking/ip_netns_exec_ns1_ip_address_show
...
.../sos_commands/networking/ip_netns_exec_ns2_ip_address_show
...
.../sos_commands/networking/ip_netns_exec_ns3_ip_address_show
...
```
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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 that the networking plugin runs commands for the `Error:` lines:
(note the ebpf plugin does not due to differences addressed in PR #2306)
```
# ./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
...
```
This happens because the networking plugin calls `collect_cmd_output()`
with default `stderr=True` and does not handle such line type.
For the purposes of getting the list of network namespaces, it is OK to
ignore `stderr` since it does not provide that information. However, we
do want it in the archive, so it is fully documented for analysis/debug.
So change the call from `collect_cmd_output()` to `add_cmd_output()` to
include both `stdout` and `stderr` in the archive, and call `exec_cmd()`
that ignores `stderr` to get the list of network namespaces.
Note that the plugin _currently_ does not need `exec_cmd(stderr=False)`
to ignore `stderr`, as described in PR#2306, but will once/if that is
applied. However, with the next patch, `stderr=False` won't be needed.
Before:
```
# 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
...
```
After:
```
# 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_test-ns_ip6tables-save
.../sos_commands/networking/ip_netns_exec_test-ns_ip_-s_-s_neigh_show
...
```
And the `ip netns` contents with `stderr` still remain in the archive:
```
# tar xf /tmp/sosreport-*.tar.xz --to-stdout \
--wildcards '*/sos_commands/networking/ip_netns'
Error: Peer netns reference is invalid.
Error: Peer netns reference is invalid.
test-ns
```
Test suite:
```
# ./tests/simple.sh
...
Everything worked!
```
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
| |
Small stylistic cleanups for the `grub2-mkconfig` environment variable
settings and command formatting.
Closes: #1070
Resolves: #2317
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adds a new method, `Plugin.get_all_containers_by_regex()`, that will
return all known containers on the system with a name matching a
provided regex string. Optionally, this method may also return
terminated containers in addition to those that are active and running.
Closes: #2176
Resolves: #2319
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
| |
In newer versions of podman, the `container` env var set inside the
container will be set to `podman` instead of `oci`. Add this value to
the list of valid values to use to determine if sos is running inside a
container or not, for when we want to capture from the host system.
Resolves: #2320
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
| |
Fix packit/copr build failures by adding lang files to sos.spec
Closes: #2318
Resolves: #2321
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
| |
Resolve a minor indentation issue.
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The previously merged #2311 was thought to be sufficient for remaining
cases where MAC addrs were followed by punctuation characters, however
it was found to be too restrictive in that it would leave quoted and
other forms of MAC addrs unobfuscated when those addrs were immediately
followed by other characters.
Simply the regex match to catch all of these, and further update the
`parse_lines()` override to properly trim down the match to just the
address substring.
Related: #2311
Related: #2305
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
| |
We are dropping the use of Travis for our CI testing, and moving to
Cirrus-CI.
Resolves: #2305
Closes: #2246
Closes: #2048
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch overhauls tests/simple.sh to provide more granular details on
why a test run may have failed, beyond checking for a non-zero exit code
or if output was written to stderr.
This should also serve as another step towards more easily extendible
tests for our automated processes.
Resolves: #2305
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
.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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Resolves: #2267
Signed-off-by: Oliver Falk <oliver@linux-kernel.at>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
Resolves: #2282
Closes: #2281
Signed-off-by: Edward Hope-Morley <edward.hope-morley@canonical.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Resolves: #2259
Signed-off-by: Eric Desrochers <eric.desrochers@canonical.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Resolves: #2268
Signed-off-by: Kenny Tordeurs <ktordeur@redhat.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|