[checkmk-commits] Guard against mixing up check results from different hosts.

Module: check_mk Branch: master Commit: 8bb5727619c50c0394ee9c6f637fea476314eb27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bb5727619c50c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 4 10:48:14 2016 +0200 Guard against mixing up check results from different hosts. --- modules/check_mk_base.py | 4 ++-- modules/discovery.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 95d36ed..dabc466 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1279,7 +1279,7 @@ def do_check(hostname, ipaddress, only_check_types = None): save_snmp_stats() if opt_keepalive: - add_keepalive_result_line(output) + add_keepalive_active_check_result(hostname, output) verbose(output) else: sys.stdout.write(core_state_names[status] + " - " + output.encode('utf-8')) @@ -1914,7 +1914,7 @@ def submit_check_result(host, servicedesc, result, sa, cached_at=None, cache_int def submit_to_core(host, service, state, output, cached_at = None, cache_interval = None): if opt_keepalive: # Regular case for the CMC - check helpers are running in keepalive mode - add_keepalive_check_result(service, state, output, cached_at, cache_interval) + add_keepalive_check_result(host, service, state, output, cached_at, cache_interval) elif check_submission == "pipe" or monitoring_core == "cmc": # In case of CMC this is used when running "cmk" manually diff --git a/modules/discovery.py b/modules/discovery.py index f91a33a..68c8b9e 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -383,7 +383,7 @@ def check_discovery(hostname, ipaddress=None): status = spec.get(what, 3) if opt_keepalive: - add_keepalive_result_line(output) + add_keepalive_active_check_result(hostname, output) return status else: sys.stdout.write(core_state_names[status] + " - " + output)