diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2023-01-30 15:31:12 -0500 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2023-01-31 08:51:04 -0500 |
| commit | b047468d7a7cf20d1d176e69d7e9276a6bcf268e (patch) | |
| tree | 0f64e5f2558aefa24cbeae17f97553ed7961a464 | |
| parent | 554c8be31a40ff034cc19d70589cfbc9ee8e9def (diff) | |
| download | sos-b047468d7a7cf20d1d176e69d7e9276a6bcf268e.tar.gz | |
[ceph_common] Update log patterns for multiple ceph versions
Updates the log patterns for `ceph_common` to handle Ceph versions that
use or don't use fsid's as part of the logging paths.
Related: #3122
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
| -rw-r--r-- | sos/report/plugins/ceph_common.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sos/report/plugins/ceph_common.py b/sos/report/plugins/ceph_common.py index c4af6fe3..105fd8c4 100644 --- a/sos/report/plugins/ceph_common.py +++ b/sos/report/plugins/ceph_common.py @@ -48,7 +48,7 @@ class Ceph_Common(Plugin, RedHatPlugin, UbuntuPlugin): self.add_file_tags({ '.*/ceph.conf': 'ceph_conf', - '/var/log/ceph/ceph.log.*': 'ceph_log', + '/var/log/ceph(.*)?/ceph.log.*': 'ceph_log', }) if not all_logs: @@ -57,8 +57,8 @@ class Ceph_Common(Plugin, RedHatPlugin, UbuntuPlugin): self.add_copy_spec("/var/log/calamari",) self.add_copy_spec([ - "/var/log/ceph/ceph.log", - "/var/log/ceph/ceph.audit.log*", + "/var/log/ceph/**/ceph.log", + "/var/log/ceph/**/ceph.audit.log*", "/var/log/calamari/*.log", "/etc/ceph/", "/etc/calamari/", |