Module: check_mk Branch: master Commit: f6f54072b87a009df3ea08b5ea1fdb945d28075e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6f54072b87a00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 28 09:36:48 2014 +0200 Fixed broken check manpages --- checkman/jolokia_metrics.gc | 1 + checkman/jolokia_metrics.tp | 1 + modules/check_mk.py | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/checkman/jolokia_metrics.gc b/checkman/jolokia_metrics.gc index c829c7f..ef33f2d 100644 --- a/checkman/jolokia_metrics.gc +++ b/checkman/jolokia_metrics.gc @@ -1,5 +1,6 @@ title: Java virtual machine garbage collection agents: linux +catalog: app/java license: GPL distribution: check_mk description: diff --git a/checkman/jolokia_metrics.tp b/checkman/jolokia_metrics.tp index 24a0c7e..55bc528 100644 --- a/checkman/jolokia_metrics.tp +++ b/checkman/jolokia_metrics.tp @@ -1,6 +1,7 @@ title: Tomcat number of threads in thread pool agents: linux license: GPL +catalog: app/java distribution: check_mk description: This check monitors the number of threads in a tomcat thread pool. diff --git a/modules/check_mk.py b/modules/check_mk.py index 015e284..8c03880 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3622,7 +3622,12 @@ def read_manpage_catalog(): if filename.startswith("."): continue parsed = parse_man_header(checkname, path) - cat = parsed["catalog"] + try: + cat = parsed["catalog"] + except KeyError: + sys.stderr.write('ERROR: Invalid manpage: %s (Catalog info missing)\n' % checkname) + continue + if not cat: cat = [ "unsorted" ]