diff options
| author | Pavel Moravec <pmoravec@redhat.com> | 2020-01-21 14:44:20 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2020-02-14 18:38:12 +0000 |
| commit | b39bf13cd0ba8dcdd012bac79c310c9b3c4ea196 (patch) | |
| tree | cc2767c4160121792528524f4c85128934612ad7 | |
| parent | 310fc9064928502847d2e95d88c785fa9cb94bae (diff) | |
| download | sos-b39bf13cd0ba8dcdd012bac79c310c9b3c4ea196.tar.gz | |
[plugins] collect missing command outputs from e51d3e6
Commit e51d3e6 caused some commands are called but not further
stored in an sosreport archive. This fixes that regression.
Related: #1923
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/block.py | 2 | ||||
| -rw-r--r-- | sos/plugins/networking.py | 2 | ||||
| -rw-r--r-- | sos/plugins/ntp.py | 2 | ||||
| -rw-r--r-- | sos/plugins/openstack_keystone.py | 2 | ||||
| -rw-r--r-- | sos/plugins/virsh.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sos/plugins/block.py b/sos/plugins/block.py index c4574421..621985de 100644 --- a/sos/plugins/block.py +++ b/sos/plugins/block.py @@ -53,7 +53,7 @@ class Block(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "fdisk -l %s" % disk_path ]) - lsblk = self.exec_cmd("lsblk -f -a -l") + lsblk = self.collect_cmd_output("lsblk -f -a -l") # for LUKS devices, collect cryptsetup luksDump if lsblk['status'] == 0: for line in lsblk['output'].splitlines(): diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py index 4e1382e5..f37466f2 100644 --- a/sos/plugins/networking.py +++ b/sos/plugins/networking.py @@ -201,7 +201,7 @@ class Networking(Plugin): # Capture additional data from namespaces; each command is run # per-namespace. - ip_netns = self.exec_cmd("ip netns") + ip_netns = self.collect_cmd_output("ip netns") cmd_prefix = "ip netns exec " if ip_netns['status'] == 0: out_ns = [] diff --git a/sos/plugins/ntp.py b/sos/plugins/ntp.py index e825258a..0ffe092e 100644 --- a/sos/plugins/ntp.py +++ b/sos/plugins/ntp.py @@ -29,7 +29,7 @@ class Ntp(Plugin): "ntpq -pn" ]) - ids = self.exec_cmd('ntpq -c as') + ids = self.collect_cmd_output('ntpq -c as') if ids['status'] == 0: for asid in [i.split()[1] for i in ids['output'].splitlines()[3:]]: self.add_cmd_output("ntpq -c 'rv %s'" % asid) diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py index 943a6529..6052926f 100644 --- a/sos/plugins/openstack_keystone.py +++ b/sos/plugins/openstack_keystone.py @@ -48,7 +48,7 @@ class OpenStackKeystone(Plugin): # collect domain config directory, if specified # if not, collect default /etc/keystone/domains - exec_out = self.exec_cmd( + exec_out = self.collect_cmd_output( "crudini --get /etc/keystone/keystone.conf " "identity domain_config_dir") self.domain_config_dir = exec_out['output'] diff --git a/sos/plugins/virsh.py b/sos/plugins/virsh.py index d757c8ce..e8073adb 100644 --- a/sos/plugins/virsh.py +++ b/sos/plugins/virsh.py @@ -43,7 +43,7 @@ class LibvirtClient(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): # get network, pool and nwfilter elements for k in ['net', 'nwfilter', 'pool']: - k_list = self.exec_cmd('%s %s-list' % (cmd, k)) + k_list = self.collect_cmd_output('%s %s-list' % (cmd, k)) if k_list['status'] == 0: k_lines = k_list['output'].splitlines() # the 'Name' column position changes between virsh cmds |