diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2021-04-13 12:08:28 -0400 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2021-04-15 11:58:20 -0400 |
| commit | b641a8af91375bfb8494330d20bd11cb86bff7c7 (patch) | |
| tree | 2a3f34e0b767069ab85dfcd7eb993ee63bce5711 | |
| parent | 932d21d64b8f8c9306f01e5bbd69d92e7a639e81 (diff) | |
| download | sos-b641a8af91375bfb8494330d20bd11cb86bff7c7.tar.gz | |
[ipmitool] Add elist and lan command output
This commit adds collection of `ipmitool isel elist` and adds verbosity to
the regular `ipmitool sel list` collection.
Additionally, simplify the base command construction logic, and pull in
`ipmitool lan print` from #998. Note that network obfuscation is
relegated to the use of `sos clean` here, rather than doing plugin-based
scrubbing.
Closes: #998
Closes: #2015
Resolves: #2486
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
| -rw-r--r-- | sos/report/plugins/ipmitool.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sos/report/plugins/ipmitool.py b/sos/report/plugins/ipmitool.py index 41e7ce77..f052a07d 100644 --- a/sos/report/plugins/ipmitool.py +++ b/sos/report/plugins/ipmitool.py @@ -21,19 +21,18 @@ class IpmiTool(Plugin, RedHatPlugin, DebianPlugin): packages = ('ipmitool',) def setup(self): + cmd = "ipmitool" result = self.collect_cmd_output("ipmitool -I usb mc info") - have_usbintf = result['status'] - - if not have_usbintf: - cmd = "ipmitool -I usb" - else: - cmd = "ipmitool" + if result['status'] == 0: + cmd += " -I usb" self.add_cmd_output([ "%s sel info" % cmd, - "%s sel list" % cmd, + "%s sel elist" % cmd, + "%s sel list -v" % cmd, "%s sensor list" % cmd, "%s chassis status" % cmd, + "%s lan print" % cmd, "%s fru print" % cmd, "%s mc info" % cmd, "%s sdr info" % cmd |