aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Moravec <pmoravec@redhat.com>2019-08-25 12:54:55 +0200
committerPavel Moravec <pmoravec@redhat.com>2019-08-25 12:54:55 +0200
commit16bf3224175bb844edc702b688684745e85ce622 (patch)
tree3a588caf69e83a4a41a8df90e13775aaaf132924
parent75b17a1711e9122f32d7fd543ee74566089aad93 (diff)
downloadsos-16bf3224175bb844edc702b688684745e85ce622.tar.gz
[satellite] dont collect apache and squid data
Stop collecting duplicate data that apache and squid plugin are responsible for. Resolves: #1766 Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
-rw-r--r--sos/plugins/satellite.py9
1 files changed, 0 insertions, 9 deletions
diff --git a/sos/plugins/satellite.py b/sos/plugins/satellite.py
index 83733076..b34314eb 100644
--- a/sos/plugins/satellite.py
+++ b/sos/plugins/satellite.py
@@ -20,8 +20,6 @@ class Satellite(Plugin, RedHatPlugin):
satellite = False
proxy = False
- option_list = [("log", 'gathers all apache logs', 'slow', False)]
-
def rhn_package_check(self):
self.satellite = self.is_installed("rhns-satellite-tools") \
or self.is_installed("spacewalk-java") \
@@ -38,14 +36,10 @@ class Satellite(Plugin, RedHatPlugin):
def setup(self):
self.rhn_package_check()
self.add_copy_spec([
- "/etc/httpd/conf*",
"/etc/rhn",
"/var/log/rhn*"
])
- if self.get_option("log"):
- self.add_copy_spec("/var/log/httpd")
-
# all these used to go in $DIR/mon-logs/
self.add_copy_spec([
"/opt/notification/var/*.log*",
@@ -80,7 +74,4 @@ class Satellite(Plugin, RedHatPlugin):
% self.get_cmd_output_path(name="spacewalk-debug"),
timeout=900)
- if self.proxy:
- self.add_copy_spec(["/etc/squid", "/var/log/squid"])
-
# vim: set et ts=4 sw=4 :