From 9a2de0c36880f76cea7fece1f877557fcb44833a Mon Sep 17 00:00:00 2001
From: Jake Hunsaker <jhunsake@redhat.com>
Date: Wed, 28 Apr 2021 16:19:18 -0400
Subject: [apache] Forbid collecting openstack logs

Like we do for foreman and pulp, avoid collecting logs from the various
openstack components that write to /var/log/httpd/*, instead allowing
those plugins to set the proper collections.

Closes: #1950
Resolves: #2516

Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
---
 sos/report/plugins/apache.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/sos/report/plugins/apache.py b/sos/report/plugins/apache.py
index 838c393b..1ee263c6 100644
--- a/sos/report/plugins/apache.py
+++ b/sos/report/plugins/apache.py
@@ -29,11 +29,21 @@ class Apache(Plugin):
             "apachectl -t"
         ])
 
-        # The foreman and pulp plugins collect these files;
+        # Other plugins collect these files;
         # do not collect them here to avoid collisions in the archive paths.
+        subdirs = [
+            'aodh',
+            'ceilometer',
+            'cinder',
+            'foreman',
+            'horizon',
+            'keystone',
+            'nova',
+            'placement',
+            'pulp'
+        ]
         self.add_forbidden_path([
-            "/var/log/{}*/foreman*".format(self.apachepkg),
-            "/var/log/{}*/pulp*".format(self.apachepkg)
+            "/var/log/%s*/%s*" % (self.apachepkg, sub) for sub in subdirs
         ])
 
 
-- 
cgit