[checkmk-commits] Check_MK Git: check_mk: usewalk_hosts: set ip to 127.0.0.1 only if SNMP

Module: check_mk Branch: master Commit: 918532444ca2268e58bbe4e874fa091a4410dd58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=918532444ca226… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 17:42:12 2011 +0100 usewalk_hosts: set ip to 127.0.0.1 only if SNMP --- ChangeLog | 6 ++++++ modules/check_mk_base.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6bfaee1..307a5bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,13 @@ 1.1.10b1: + Core, Setup, etc.: + * FIX: do not assume 127.0.0.1 as IP address for usewalk_hosts if + they are not SNMP hosts. + Checks & Agents: * FIX: drbd now handles output of older version without an ep field + + 1.1.9i9: Core, Setup, etc.: * FIX: check_mk_templates.cfg: add missing check_period for hosts diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 4c80f54..85ed85f 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -546,7 +546,8 @@ def lookup_ipaddress(hostname): if fake_dns: return fake_dns - elif simulation_mode or opt_use_snmp_walk or is_usewalk_host(hostname): + elif simulation_mode or opt_use_snmp_walk or \ + (is_usewalk_host(hostname) and is_snmp_host(hostname)): return "127.0.0.1" elif hostname in g_dns_cache: return g_dns_cache[hostname]