aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2013-05-01 18:33:43 +0100
committerBryn M. Reeves <bmr@redhat.com>2013-05-01 18:33:43 +0100
commit395ad13da82d4fb42cb1edc2018c3538e2df4ec3 (patch)
tree9446347e6d8221b382c53fcddccfb460c349c6a3
parent13b9c3c0e696a19dc0a1a733749af541455cc6b6 (diff)
downloadsos-395ad13da82d4fb42cb1edc2018c3538e2df4ec3.tar.gz
Move syslog and rsyslog configuratoin collection to logs plug-in
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/plugins/logs.py5
-rw-r--r--sos/plugins/system.py6
2 files changed, 6 insertions, 5 deletions
diff --git a/sos/plugins/logs.py b/sos/plugins/logs.py
index 8fdb9185..28db0e47 100644
--- a/sos/plugins/logs.py
+++ b/sos/plugins/logs.py
@@ -29,6 +29,11 @@ class Logs(Plugin):
]
def setup(self):
+ self.add_copy_specs([
+ "/etc/syslog.conf",
+ "/etc/rsyslog.conf"
+ )]
+
self.limit = self.get_option("syslogsize")
self.add_copy_spec_limit("/var/log/boot*", sizelimit = self.limit)
diff --git a/sos/plugins/system.py b/sos/plugins/system.py
index cc287e15..a61e4c7c 100644
--- a/sos/plugins/system.py
+++ b/sos/plugins/system.py
@@ -21,11 +21,7 @@ class System(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
plugin_name = "system"
def setup(self):
- self.add_copy_specs([
- "/proc/sys",
- "/etc/syslog.conf",
- "/etc/rsyslog.conf",
- ])
+ self.add_copy_specs("/proc/sys")
self.add_forbidden_path(
"/proc/sys/net/ipv8/neigh/*/retrans_time")
self.add_forbidden_path(