diff options
| author | Ken Gaillot <kgaillot@redhat.com> | 2018-04-04 09:02:12 -0500 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2018-04-04 16:35:36 +0100 |
| commit | 489eddc8ef4013c50f0ca7c11fd361470a5669ed (patch) | |
| tree | 3f254e0f3123ee2ddadec078da45d8471afe535d | |
| parent | 6b83a1ece804227d372be19e593eb92b200234d4 (diff) | |
| download | sos-489eddc8ef4013c50f0ca7c11fd361470a5669ed.tar.gz | |
[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 <kgaillot@redhat.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/pacemaker.py | 8 |
1 files 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() |