[checkmk-commits] 6038 FIX Nagios: Fixed IP address resolution of dual stack hosts

Module: check_mk Branch: master Commit: acd467ea93a20a7c7b1e2291cadfbc490a188b8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acd467ea93a20a… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Apr 27 10:40:16 2018 +0200 6038 FIX Nagios: Fixed IP address resolution of dual stack hosts Change-Id: I4acd7b1257b556fd570fe951ca1246ff0ffd8123 --- .werks/6038 | 11 +++++++++++ cmk_base/core_nagios.py | 36 +++++++++++++++++++++++------------- 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/.werks/6038 b/.werks/6038 new file mode 100644 index 0000000..c5dd6a3 --- /dev/null +++ b/.werks/6038 @@ -0,0 +1,11 @@ +Title: Nagios: Fixed IP address resolution of dual stack hosts +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524818393 + + diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 30a9a6c..178129e 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -1064,7 +1064,7 @@ if '-d' in sys.argv: cluster_nodes = config.nodes_of(hostname) output.write("clusters = { %r : %r }\n" % (hostname, cluster_nodes)) - output.write("def is_cluster(hostname):\n return True\n\n") + output.write("def is_cluster(hostname):\n return hostname == %r\n\n" % hostname) nodes_of_map = {hostname: cluster_nodes} for node in config.nodes_of(hostname): @@ -1075,25 +1075,35 @@ if '-d' in sys.argv: output.write("def nodes_of(hostname):\n return None\n") # IP addresses - needed_ipaddresses = {} - nodes = [] + needed_ipaddresses, needed_ipv6addresses, = {}, {} if config.is_cluster(hostname): for node in config.nodes_of(hostname): - ipa = ip_lookup.lookup_ip_address(node) - needed_ipaddresses[node] = ipa - nodes.append( (node, ipa) ) + if config.is_ipv4_host(node): + needed_ipaddresses[node] = ip_lookup.lookup_ipv4_address(node) + + if config.is_ipv6_host(node): + needed_ipv6addresses[node] = ip_lookup.lookup_ipv6_address(node) try: - ipaddress = ip_lookup.lookup_ip_address(hostname) # might throw exception - needed_ipaddresses[hostname] = ipaddress + if config.is_ipv4_host(hostname): + needed_ipaddresses[hostname] = ip_lookup.lookup_ipv4_address(hostname) except: - ipaddress = None + pass + + try: + if config.is_ipv6_host(hostname): + needed_ipv6addresses[hostname] = ip_lookup.lookup_ipv6_address(hostname) + except: + pass else: - ipaddress = ip_lookup.lookup_ip_address(hostname) # might throw exception - needed_ipaddresses[hostname] = ipaddress - nodes = [ (hostname, ipaddress) ] + if config.is_ipv4_host(hostname): + needed_ipaddresses[hostname] = ip_lookup.lookup_ipv4_address(hostname) + + if config.is_ipv6_host(hostname): + needed_ipv6addresses[hostname] = ip_lookup.lookup_ipv6_address(hostname) output.write("config.ipaddresses = %r\n\n" % needed_ipaddresses) + output.write("config.ipv6addresses = %r\n\n" % needed_ipv6addresses) # datasource programs. Is this host relevant? @@ -1120,7 +1130,7 @@ if '-d' in sys.argv: # perform actual check with a general exception handler output.write("try:\n") - output.write(" sys.exit(checking.do_check(%r, %r))\n" % (hostname, ipaddress)) + output.write(" sys.exit(checking.do_check(%r, None))\n" % hostname) output.write("except MKTerminate:\n") output.write(" console.output('<Interrupted>\\n', stream=sys.stderr)\n") output.write(" sys.exit(1)\n")