Module: check_mk
Branch: master
Commit: 5a2bc59b82f515acc288ef810abf65359ed8d00f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a2bc59b82f515…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Apr 16 11:08:36 2013 +0200
Fixed problem with snmp_check_interval in inventory check
---
modules/check_mk.py | 2 +-
modules/check_mk_base.py | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 432159d..351184d 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -2346,7 +2346,7 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals
checkname_base = checkname.split('.')[0] # make e.g. 'lsi' from 'lsi.arrays'
try:
- info = get_realhost_info(hostname, ipaddress, checkname_base, inventory_max_cachefile_age)
+ info = get_realhost_info(hostname, ipaddress, checkname_base, inventory_max_cachefile_age, True)
# Add information about nodes if check wants this
if check_info[checkname]["node_info"]:
if clusters_of(hostname):
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 56c7de0..b3dd7e2 100755
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -321,7 +321,7 @@ def get_host_info(hostname, ipaddress, checkname):
#
# This function assumes, that each check type is queried
# only once for each host.
-def get_realhost_info(hostname, ipaddress, check_type, max_cache_age):
+def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, ignore_check_interval = False):
info = get_cached_hostinfo(hostname)
if info and info.has_key(check_type):
return info[check_type]
@@ -335,7 +335,8 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age):
if oid_info:
cache_path = tcp_cache_dir + "/" + cache_relpath
check_interval = check_interval_of(hostname, check_type)
- if check_interval is not None and os.path.exists(cache_path) \
+ if not ignore_check_interval \
+ and check_interval is not None and os.path.exists(cache_path) \
and cachefile_age(cache_path) < check_interval:
# cache file is newer than check_interval, skip this check
raise MKSkipCheck()