aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Moravec <pmoravec@redhat.com>2021-02-17 22:41:15 +0100
committerJake Hunsaker <jhunsake@redhat.com>2021-02-22 10:32:30 -0500
commit20d8938fe948c4bbfedd6b68b59a543e8b2baaca (patch)
tree75b5c994fbbf77c032246af5e5ec168d7f74adde
parent51e8213fd3a83e717fe7ef35d48d5c541b077c5f (diff)
downloadsos-20d8938fe948c4bbfedd6b68b59a543e8b2baaca.tar.gz
[apache] skip collecting pulp* logs
Since these are collected in the pulp plugin directly. Resolves: #2413 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
-rw-r--r--sos/report/plugins/apache.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/sos/report/plugins/apache.py b/sos/report/plugins/apache.py
index b1b366b5..38635a7f 100644
--- a/sos/report/plugins/apache.py
+++ b/sos/report/plugins/apache.py
@@ -29,9 +29,12 @@ class Apache(Plugin):
"apachectl -t"
])
- # The foreman plugin collects these files with a greater size limit:
+ # The foreman and pulp plugins collect these files;
# do not collect them here to avoid collisions in the archive paths.
- self.add_forbidden_path("/var/log/{}*/foreman*".format(self.apachepkg))
+ self.add_forbidden_path([
+ "/var/log/{}*/foreman*".format(self.apachepkg),
+ "/var/log/{}*/pulp*".format(self.apachepkg)
+ ])
class RedHatApache(Apache, RedHatPlugin):