diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2014-09-16 18:07:04 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2014-09-16 18:07:04 +0100 |
| commit | 073d201b10b4b53399b8ead971a052d21be4b243 (patch) | |
| tree | 9a94a6a035e48d111137bc63163464a3424a75ee | |
| parent | d86f92037000e7a5ac924543a74616de067837fc (diff) | |
| download | sos-073d201b10b4b53399b8ead971a052d21be4b243.tar.gz | |
[systemd,logs] move journalctl logs to logs plugin
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/logs.py | 4 | ||||
| -rw-r--r-- | sos/plugins/systemd.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sos/plugins/logs.py b/sos/plugins/logs.py index eed1e3a4..4fac5d50 100644 --- a/sos/plugins/logs.py +++ b/sos/plugins/logs.py @@ -31,6 +31,10 @@ class Logs(Plugin): self.limit = self.get_option("log_size") self.add_copy_spec_limit("/var/log/boot.log", sizelimit=self.limit) self.add_copy_spec_limit("/var/log/cloud-init*", sizelimit=self.limit) + self.add_cmd_outputs([ + "journalctl --all --this-boot --no-pager", + "journalctl --all --this-boot --no-pager -o verbose", + ]) if self.get_option('all_logs'): logs = self.do_regex_find_all("^\S+\s+(-?\/.*$)\s+", diff --git a/sos/plugins/systemd.py b/sos/plugins/systemd.py index 2ca8f21e..692483ac 100644 --- a/sos/plugins/systemd.py +++ b/sos/plugins/systemd.py @@ -36,8 +36,6 @@ class Systemd(Plugin, RedHatPlugin): "systemctl list-unit-files", "systemctl show-environment", "systemd-delta", - "journalctl --all --this-boot --no-pager", - "journalctl --all --this-boot --no-pager -o verbose", "journalctl --list-boots", "ls -l /lib/systemd", "ls -l /lib/systemd/system-shutdown", |