|
 |
ce8dbd |
From 2c04f56675b36f59ab4d4cb455efeb7d71badb74 Mon Sep 17 00:00:00 2001
|
|
|
ce8dbd |
From: Kazuhito Hagio <k-hagio@ab.jp.nec.com>
|
|
|
ce8dbd |
Date: Tue, 22 May 2018 15:29:47 -0400
|
|
|
ce8dbd |
Subject: [PATCH] [logs] rework: collect journalctl verbosed logs with
|
|
|
ce8dbd |
--all-logs only
|
|
|
ce8dbd |
|
|
|
ce8dbd |
commit 7bc90f618f0549279544d26effae2e5197d85e2b ("[logs] collect
|
|
|
ce8dbd |
journalctl verbosed logs with --all-logs only") did not suppress
|
|
|
ce8dbd |
the journalctl verbosed logs by default. Let's rework it.
|
|
|
ce8dbd |
|
|
|
ce8dbd |
Related: #1225
|
|
|
ce8dbd |
Resolves: #1310
|
|
|
ce8dbd |
|
|
|
ce8dbd |
Signed-off-by: Kazuhito Hagio <k-hagio@ab.jp.nec.com>
|
|
|
ce8dbd |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
ce8dbd |
---
|
|
|
ce8dbd |
sos/plugins/logs.py | 3 +--
|
|
|
ce8dbd |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
ce8dbd |
|
|
|
ce8dbd |
diff --git a/sos/plugins/logs.py b/sos/plugins/logs.py
|
|
|
ce8dbd |
index 1d18bad8..c67d3e66 100644
|
|
|
ce8dbd |
--- a/sos/plugins/logs.py
|
|
|
ce8dbd |
+++ b/sos/plugins/logs.py
|
|
|
ce8dbd |
@@ -34,10 +34,10 @@ class Logs(Plugin):
|
|
|
ce8dbd |
self.add_copy_spec("/var/log/boot.log", sizelimit=self.limit)
|
|
|
ce8dbd |
self.add_copy_spec("/var/log/cloud-init*", sizelimit=self.limit)
|
|
|
ce8dbd |
self.add_journal(boot="this")
|
|
|
ce8dbd |
- self.add_journal(boot="this", allfields=True, output="verbose")
|
|
|
ce8dbd |
self.add_cmd_output("journalctl --disk-usage")
|
|
|
ce8dbd |
|
|
|
ce8dbd |
if self.get_option('all_logs'):
|
|
|
ce8dbd |
+ self.add_journal(boot="this", allfields=True, output="verbose")
|
|
|
ce8dbd |
syslog_conf = self.join_sysroot("/etc/syslog.conf")
|
|
|
ce8dbd |
logs = self.do_regex_find_all("^\S+\s+(-?\/.*$)\s+", syslog_conf)
|
|
|
ce8dbd |
if self.is_installed("rsyslog") \
|
|
|
ce8dbd |
--
|
|
|
ce8dbd |
2.13.6
|
|
|
ce8dbd |
|