Module: check_mk Branch: master Commit: 1751131db7b2eb587b2eac876fdd1920195316b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1751131db7b2eb… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Oct 15 14:05:01 2013 +0200 FIX: Ignoring snmp check intervall in interactive mode of check_mk --- ChangeLog | 1 + modules/check_mk_base.py | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4b76ec7..4f30137 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * Automatically remove duplicate checks when monitoring with Agent+SNMP at the same time. TCP based ones have precedence. * inventory check of SNMP devices now does scan per default (configurable) + * FIX: Ignore snmp_check_interval cache in interactive situations (e.g. -nv) Multisite: * Speed-O-Meter: now measure only service checks. Host checks diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index a47207e..205109c 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -342,6 +342,7 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, ignore_che cache_path = tcp_cache_dir + "/" + cache_relpath check_interval = check_interval_of(hostname, check_type) if not ignore_check_interval \ + and not opt_dont_submit \ and check_interval is not None and os.path.exists(cache_path) \ and cachefile_age(cache_path) < check_interval * 60: # cache file is newer than check_interval, skip this check