diff options
| author | Pavel Moravec <pmoravec@redhat.com> | 2019-03-22 12:45:08 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2019-03-22 14:56:15 +0000 |
| commit | bfda850eb26f782e841480e0fa45a79c8cbbbd78 (patch) | |
| tree | 023f6ceb595dda0471bab8d89a18289e9e6a688e | |
| parent | 999cef2e72ffbf86c58ed577abe089874619ac30 (diff) | |
| download | sos-bfda850eb26f782e841480e0fa45a79c8cbbbd78.tar.gz | |
[foreman] collect all logrotated patterns and error httpd logs
Logrotated files can have suffix starting by '-' or '.' also.
Additionally, collect also foreman-ssl_error_ssl.log httpd logs.
Resolves: #1612
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
| -rw-r--r-- | sos/plugins/foreman.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sos/plugins/foreman.py b/sos/plugins/foreman.py index 1f6a7afb..cd3b6f2f 100644 --- a/sos/plugins/foreman.py +++ b/sos/plugins/foreman.py @@ -37,7 +37,7 @@ class Foreman(Plugin): # Collect these completely everytime self.add_copy_spec([ "/var/log/foreman/production.log", - "/var/log/{}*/foreman-ssl_access_ssl.log".format(self.apachepkg) + "/var/log/{}*/foreman-ssl_*_ssl.log".format(self.apachepkg) ], sizelimit=0) # Allow limiting these @@ -53,7 +53,7 @@ class Foreman(Plugin): "/var/log/foreman/cron*.log*", "/var/log/foreman/db_migrate*log*", "/var/log/foreman/db_seed*log*", - "/var/log/foreman/production.log-*", + "/var/log/foreman/production.log[.-]*", "/var/log/foreman-proxy/cron*log*", "/var/log/foreman-proxy/migrate_settings*log*", "/var/log/foreman-proxy/proxy*log*", @@ -75,7 +75,7 @@ class Foreman(Plugin): "/etc/puppetlabs/puppet/ssl/certs/ca.pem", "/etc/puppetlabs/puppet/ssl/certs/{}.pem".format(_hostname), "/var/lib/puppet/ssl/certs/{}.pem".format(_hostname), - "/var/log/{}*/foreman-ssl_access_ssl*log*".format(self.apachepkg), + "/var/log/{}*/foreman-ssl_*_ssl*log[.-]*".format(self.apachepkg), "/var/log/{}*/error_log*".format(self.apachepkg), "/etc/{}*/conf/".format(self.apachepkg), "/etc/{}*/conf.d/".format(self.apachepkg) |