aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Hunsaker <jhunsake@redhat.com>2020-07-14 11:17:56 -0400
committerJake Hunsaker <jhunsake@redhat.com>2020-07-21 10:01:01 -0400
commit840370ba2155ce7c7c65d2282c49ab960f26f731 (patch)
tree4d9a8f4ffa9293f94a52e06af11437bc65360d57
parent17e5055accf833fd8d7fa5ec12710875b6315122 (diff)
downloadsos-840370ba2155ce7c7c65d2282c49ab960f26f731.tar.gz
[host] Update sos config collection
Updates the host plugin to capture from /etc/sos now that the config layout has been changed. Adds a forbidden path to never collect the default_mapping file generated by `sos clean`. Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
-rw-r--r--sos/report/plugins/host.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/sos/report/plugins/host.py b/sos/report/plugins/host.py
index ecb94d72..a5f87ede 100644
--- a/sos/report/plugins/host.py
+++ b/sos/report/plugins/host.py
@@ -20,6 +20,8 @@ class Host(Plugin, RedHatPlugin, DebianPlugin):
def setup(self):
+ self.add_forbidden_path('/etc/sos/cleaner/default_mapping')
+
self.add_cmd_output('hostname', root_symlink='hostname')
self.add_cmd_output('uptime', root_symlink='uptime')
@@ -30,7 +32,7 @@ class Host(Plugin, RedHatPlugin, DebianPlugin):
])
self.add_copy_spec([
- '/etc/sos.conf',
+ '/etc/sos',
'/etc/hostid',
])