diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2021-04-28 16:19:18 -0400 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2021-04-30 10:26:40 -0400 |
| commit | 9a2de0c36880f76cea7fece1f877557fcb44833a (patch) | |
| tree | 3216fe1ff97dc59cce757dd02c634e17f5ed4654 | |
| parent | 1fc945f6c80fee684d36e008e36eb11b333f0bbb (diff) | |
| download | sos-9a2de0c36880f76cea7fece1f877557fcb44833a.tar.gz | |
[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>
| -rw-r--r-- | sos/report/plugins/apache.py | 16 |
1 files 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 ]) |