Module: check_mk
Branch: master
Commit: ca725d8e54ac9fe469edae6123e862f0b62372c7
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca725d8e54ac9f…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Apr 22 15:50:10 2016 +0200
update for wk3387: better implementation
---
checks/ps | 3 +++
checks/ps.include | 6 +-----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/checks/ps b/checks/ps
index ac8c386..cf02118 100644
--- a/checks/ps
+++ b/checks/ps
@@ -217,6 +217,9 @@ def ps_parse_process_entries(parsed):
# Make number of columns in line consistent for discovery/check
line.insert(1, (None,))
+ # Filter out any lines where no process command line is available, e.g.
+ # [None, u'(<defunct>,,,)']
+ parsed = [ x for x in parsed if len(x) > 2 ]
return parsed
diff --git a/checks/ps.include b/checks/ps.include
index 45748f8..98093aa 100644
--- a/checks/ps.include
+++ b/checks/ps.include
@@ -185,11 +185,7 @@ def process_matches_for_discovery(process_line, process_pattern,
userspec):
if matchobject:
return [ g and g or "" for g in matchobject.groups() ],
grabbed_user
else:
- # command_line can be empty. Found in AIX agent output (server-aix-ps-1):
- # ...
- # (<defunct>,,,)
- # ...
- if command_line and command_line[0] == process_pattern:
+ if command_line[0] == process_pattern:
return (), grabbed_user
return False, grabbed_user