From 489eddc8ef4013c50f0ca7c11fd361470a5669ed Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Wed, 4 Apr 2018 09:02:12 -0500 Subject: [pacemaker] Collect Pacemaker 2.0 log locations Upstream changed the intended new log locations in the Pacemaker 2.0.0 release cycle, so add them (they will stay the same in the 2.0.0 final release). Keep the /var/log/cluster locations added previously, as many users prefer to configure those. Resolves: #1106 Signed-off-by: Ken Gaillot Signed-off-by: Bryn M. Reeves --- sos/plugins/pacemaker.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sos/plugins/pacemaker.py b/sos/plugins/pacemaker.py index 3677b0a9..17ba1b2d 100644 --- a/sos/plugins/pacemaker.py +++ b/sos/plugins/pacemaker.py @@ -74,12 +74,16 @@ class Pacemaker(Plugin): "/var/lib/pacemaker/cib/cib.xml", # Pacemaker 2.x default log locations - "/var/log/cluster/pacemaker.log", - "/var/log/cluster/bundles/*/", + "/var/log/pacemaker/pacemaker.log", + "/var/log/pacemaker/bundles/*/", # Pacemaker 1.x default log locations "/var/log/pacemaker.log", "/var/log/pacemaker/bundles/*/", + + # Common user-specified locations + "/var/log/cluster/pacemaker.log", + "/var/log/cluster/bundles/*/", ]) self.setup_crm_mon() -- cgit