|
 |
5866eb |
From e24dc299b7c41bf446b0330869c4b4687fdfbfde Mon Sep 17 00:00:00 2001
|
|
|
5866eb |
From: Jan Jansky <jjansky@redhat.com>
|
|
|
5866eb |
Date: Tue, 25 May 2021 10:00:34 +0200
|
|
|
5866eb |
Subject: [PATCH] [foreman] Collect all apache foreman* logs in foreman plugin
|
|
|
5866eb |
|
|
|
5866eb |
Some important logs are written to foreman_[access|error].log in
|
|
|
5866eb |
/var/log/httpd dir. foreman plugin should collect all the logs that
|
|
|
5866eb |
apache plugin skips to prevent duplicit collection.
|
|
|
5866eb |
|
|
|
5866eb |
Related: #2554
|
|
|
5866eb |
Resolves: #2557
|
|
|
5866eb |
|
|
|
5866eb |
Signed-off-by: Jan Jansky <jjansky@redhat.com>
|
|
|
5866eb |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
5866eb |
---
|
|
|
5866eb |
sos/plugins/foreman.py | 2 +-
|
|
|
5866eb |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
5866eb |
|
|
|
5866eb |
diff --git a/sos/plugins/foreman.py b/sos/plugins/foreman.py
|
|
|
5866eb |
index d3d3543..58f5256 100644
|
|
|
5866eb |
--- a/sos/plugins/foreman.py
|
|
|
5866eb |
+++ b/sos/plugins/foreman.py
|
|
|
5866eb |
@@ -114,7 +114,7 @@ class Foreman(Plugin):
|
|
|
5866eb |
"/etc/puppetlabs/puppet/ssl/certs/ca.pem",
|
|
|
5866eb |
"/etc/puppetlabs/puppet/ssl/certs/{}.pem".format(_hostname),
|
|
|
5866eb |
"/var/lib/puppet/ssl/certs/{}.pem".format(_hostname),
|
|
|
5866eb |
- "/var/log/{}*/foreman-ssl_*_ssl*log[.-]*".format(self.apachepkg),
|
|
|
5866eb |
+ "/var/log/{}*/foreman*".format(self.apachepkg),
|
|
|
5866eb |
"/var/log/{}*/katello-reverse-proxy_access_ssl.log*".format(
|
|
|
5866eb |
self.apachepkg),
|
|
|
5866eb |
"/var/log/{}*/katello-reverse-proxy_error_ssl.log*".format(
|
|
|
5866eb |
--
|
|
|
5866eb |
1.8.3.1
|
|
|
5866eb |
|