[checkmk-commits] Check_MK Git: check_mk: FIX: continue inventory, if one check does not support it

Module: check_mk Branch: master Commit: d3922e17d08c714b903ee649eae47db15c0c1650 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3922e17d08c71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 01:01:01 2013 +0200 FIX: continue inventory, if one check does not support it --- ChangeLog | 1 + modules/check_mk.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fcf96ea..bd166d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core: * FIX: inventory check now honors settings for exit code * FIX: avoid exception nodes of cluster have different agent type + * FIX: continue inventory, if one check does not support it Multisite: * Speed-O-Meter: now measure only service checks. Host checks diff --git a/modules/check_mk.py b/modules/check_mk.py index 990303f..9602144 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -381,8 +381,9 @@ except Exception, e: # those checks that do not support inventory. It must be known before # we read in all the checks def no_inventory_possible(checkname, info): - sys.stderr.write("Sorry. No inventory possible for check type %s.\n" % checkname) - sys.exit(3) + if opt_verbose: + sys.stdout.write("%s does not support inventory. Skipping it.\n" % checkname) + return [] # +----------------------------------------------------------------------+