diff options
| -rw-r--r-- | sos/plugins/filesys.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py index 75beb5a1..d14d1976 100644 --- a/sos/plugins/filesys.py +++ b/sos/plugins/filesys.py @@ -36,13 +36,15 @@ class Filesys(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/proc/self/mounts", "/proc/self/mountinfo", "/proc/self/mountstats", - "/etc/fstab", + "/proc/[0-9]*/mountinfo", + "/etc/fstab" ]) self.add_cmd_output("mount -l", root_symlink="mount") self.add_cmd_output("df -al -x autofs", root_symlink="df") self.add_cmd_output([ "df -ali -x autofs", - "findmnt" + "findmnt", + "lslocks" ]) if self.get_option('lsof'): @@ -66,4 +68,11 @@ class Filesys(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): r"\1********" ) + # remove expected errors from lsof due to command formatting, but still + # keep stderr so other errors are reported + regex = (r"(lsof: (avoiding (.*?)|WARNING: can't stat\(\) (.*?))|" + "Output information may be incomplete.)\n") + + self.do_cmd_output_sub("lsof", regex, '') + # vim: set et ts=4 sw=4 : |