diff options
| -rw-r--r-- | sos/report/plugins/candlepin.py | 9 | ||||
| -rw-r--r-- | sos/report/plugins/foreman.py | 7 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sos/report/plugins/candlepin.py b/sos/report/plugins/candlepin.py index 3ca2a193..5ad94997 100644 --- a/sos/report/plugins/candlepin.py +++ b/sos/report/plugins/candlepin.py @@ -62,7 +62,14 @@ class Candlepin(Plugin, RedHatPlugin): "/var/log/candlepin/candlepin.log[.-]*", "/var/log/candlepin/cpdb*.log*", "/var/log/candlepin/cpinit*.log*", - "/var/log/candlepin/error.log[.-]*" + "/var/log/candlepin/error.log[.-]*", + # Specific to candlepin, ALL catalina logs are relevant. Adding it + # here rather than the tomcat plugin to ease maintenance and not + # pollute non-candlepin sosreports that enable the tomcat plugin + "/var/log/tomcat*/catalina*log*", + "/var/log/tomcat*/host-manager*log*", + "/var/log/tomcat*/localhost*log*", + "/var/log/tomcat*/manager*log*", ]) self.add_cmd_output("du -sh /var/lib/candlepin/*/*") diff --git a/sos/report/plugins/foreman.py b/sos/report/plugins/foreman.py index eafd0b23..c3044836 100644 --- a/sos/report/plugins/foreman.py +++ b/sos/report/plugins/foreman.py @@ -104,13 +104,6 @@ class Foreman(Plugin): "/var/log/foreman-installer/", "/var/log/foreman-maintain/", "/var/log/syslog*", - # Specific to TFM, _all_ catalina logs are relevant. Adding this - # here rather than the tomcat plugin to ease maintenance and not - # pollute non-Sat sosreports that enable the tomcat plugin - "/var/log/tomcat*/catalina*log*", - "/var/log/tomcat*/host-manager*log*", - "/var/log/tomcat*/localhost*log*", - "/var/log/tomcat*/manager*log*", "/usr/share/foreman/Gemfile*", "/var/lib/puppet/ssl/certs/ca.pem", "/etc/puppetlabs/puppet/ssl/certs/ca.pem", |