Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

Move SNMP trap handling initialization calls into EventServer.

by Sven Panne

Module: check_mk Branch: master Commit: 9e51bda5d56a1922c1cb2283312575bd6b55d474 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e51bda5d56a19… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 27 15:17:51 2018 +0200 Move SNMP trap handling initialization calls into EventServer. Change-Id: I5ed4cc6b36237ff8c7bb5c42002e69762697a1bd --- cmk/ec/main.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index e25d018..be87319 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1299,6 +1299,7 @@ class EventServer(ECServerThread): self.open_syslog() self.open_syslog_tcp() self.open_snmptrap() + initialize_snmptrap_handling(self.settings, self._config, self) @classmethod def status_columns(cls): @@ -2031,6 +2032,7 @@ class EventServer(ECServerThread): def reload_configuration(self, config): self._config = config + initialize_snmptrap_handling(self.settings, self._config, self) self.compile_rules(self._config["rules"], self._config["rule_packs"]) self.host_config.initialize() @@ -5025,7 +5027,6 @@ def load_configuration(settings, slave_status): def reload_configuration(settings, event_status, event_server, status_server, slave_status): with lock_configuration: config = load_configuration(settings, slave_status) - initialize_snmptrap_handling(settings, config, event_server) event_server.reload_configuration(config) event_status.reload_configuration(config) @@ -5098,9 +5099,6 @@ def main(): status_server = StatusServer(settings, config, slave_status, perfcounters, event_status, event_server, table_events, terminate_main_event) event_status.load_status(event_server) - - initialize_snmptrap_handling(settings, config, event_server) - event_server.compile_rules(config["rules"], config["rule_packs"]) if not settings.options.foreground:

6 years, 2 months

Removed unused argument.

by Sven Panne

Module: check_mk Branch: master Commit: 146f38c8d5d8ba7755741efe9435deb8e45cf3e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=146f38c8d5d8ba… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 27 15:00:42 2018 +0200 Removed unused argument. Change-Id: I7c9ed1cd18a1fee69d1ea2231e55f1fe4e3b55ad --- cmk/ec/main.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 3fca07b..e25d018 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -473,17 +473,17 @@ class SNMPTrapEngine(object): self.snmp_engine = snmp_engine -def initialize_snmptrap_handling(settings, config, event_server, table_events): +def initialize_snmptrap_handling(settings, config, event_server): if settings.options.snmptrap_udp is None: return - initialize_snmptrap_engine(config, event_server, table_events) + initialize_snmptrap_engine(config, event_server) if snmptrap_translation_enabled(config): event_server.load_mibs() -def initialize_snmptrap_engine(config, event_server, table_events): +def initialize_snmptrap_engine(config, event_server): snmp_engine = pysnmp.entity.engine.SnmpEngine() # Disable receiving of SNMPv3 INFORM messages. We do not support them (yet) @@ -5025,7 +5025,7 @@ def load_configuration(settings, slave_status): def reload_configuration(settings, event_status, event_server, status_server, slave_status): with lock_configuration: config = load_configuration(settings, slave_status) - initialize_snmptrap_handling(settings, config, event_server, status_server.table_events) + initialize_snmptrap_handling(settings, config, event_server) event_server.reload_configuration(config) event_status.reload_configuration(config) @@ -5099,7 +5099,7 @@ def main(): event_status.load_status(event_server) - initialize_snmptrap_handling(settings, config, event_server, table_events) + initialize_snmptrap_handling(settings, config, event_server) event_server.compile_rules(config["rules"], config["rule_packs"])

6 years, 2 months

5994 FIX inv_if: Fixed failing scan function if device returns no data for OID ' .1.3.6.1.2.1.2.1.0'

by Simon Betz

Module: check_mk Branch: master Commit: bfdb188d53d2dbc42a17fcfbfdc23f6865ac3547 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfdb188d53d2db… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 27 14:53:01 2018 +0200 5994 FIX inv_if: Fixed failing scan function if device returns no data for OID '.1.3.6.1.2.1.2.1.0' Change-Id: I72fff6f9ba6c82d0b5236c1e40b0e9a00a3e5194 --- .werks/5994 | 11 +++++++++++ inventory/if | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/5994 b/.werks/5994 new file mode 100644 index 0000000..6ae885b --- /dev/null +++ b/.werks/5994 @@ -0,0 +1,11 @@ +Title: inv_if: Fixed failing scan function if device returns no data for OID '.1.3.6.1.2.1.2.1.0' +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524833303 + + diff --git a/inventory/if b/inventory/if index 97657aa..4bef0ed 100644 --- a/inventory/if +++ b/inventory/if @@ -25,6 +25,13 @@ # Boston, MA 02110-1301 USA. +def scan_inv_if(oid): + try: + return int(oid(".1.3.6.1.2.1.2.1.0")) >= 2 + except ValueError: + return False + + # TODO unify with other if inventory plugins def inv_if(info, params): def round_to_day(ts): @@ -133,6 +140,6 @@ inv_info['inv_if'] = { ]), ( ".1.3.6.1.2.1.1", [ "3.0" ] ), # uptime ], - 'snmp_scan_function': lambda oid: int(oid(".1.3.6.1.2.1.2.1.0")) >= 2, + 'snmp_scan_function': scan_inv_if, 'includes': ['if.include', 'uptime.include'], }

6 years, 2 months

Simplification: Just use a lambda instead of separate func/args.

by Sven Panne

Module: check_mk Branch: master Commit: 489b72d507543d62fefa7f63249dbf26db2db5b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=489b72d507543d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 27 13:53:52 2018 +0200 Simplification: Just use a lambda instead of separate func/args. Change-Id: Iaf6a17a0a683974144d0e742a16fd1082bddb18d --- cmk/ec/main.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index f89e551..3fca07b 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1566,11 +1566,10 @@ class EventServer(ECServerThread): # Receives an incoming SNMP trap from the socket and hands it over to PySNMP for parsing # and processing. PySNMP is calling self.handle_snmptrap back. - def process_snmptrap(self, data): - whole_msg, sender_address = data + def process_snmptrap(self, message, sender_address): self.logger.verbose("Trap received from %s:%d. Checking for acceptance now." % sender_address) g_snmp_trap_engine.snmp_engine.setUserContext(sender_address=sender_address) - g_snmp_trap_engine.snmp_engine.msgAndPduDsp.receiveMessage(g_snmp_trap_engine.snmp_engine, (), (), whole_msg) + g_snmp_trap_engine.snmp_engine.msgAndPduDsp.receiveMessage(g_snmp_trap_engine.snmp_engine, (), (), message) def handle_snmptrap(self, snmp_engine, state_reference, context_engine_id, context_name, var_binds, cb_ctx): @@ -1740,8 +1739,8 @@ class EventServer(ECServerThread): # Read events from builtin snmptrap server if self._snmptrap is not None and self._snmptrap.fileno() in readable: try: - data = self._snmptrap.recvfrom(65535) - self.process_raw_data(self.process_snmptrap, data) + message, sender_address = self._snmptrap.recvfrom(65535) + self.process_raw_data(lambda: self.process_snmptrap(message, sender_address)) except Exception: self.logger.exception('Exception handling a SNMP trap from "%s". Skipping this one' % (data[1][0])) @@ -1757,12 +1756,12 @@ class EventServer(ECServerThread): # Processes incoming data, just a wrapper between the real data and the # handler function to record some statistics etc. - def process_raw_data(self, handler_func, data): + def process_raw_data(self, handler): self._perfcounters.count("messages") before = time.time() # In replication slave mode (when not took over), ignore all events if not is_replication_slave(self._config) or self._slave_status["mode"] != "sync": - handler_func(data) + handler() elif self.settings.options.debug: self.logger.info("Replication: we are in slave mode, ignoring event") elapsed = time.time() - before @@ -1775,7 +1774,7 @@ class EventServer(ECServerThread): line = scrub_and_decode(line.rstrip()) if line: try: - self.process_raw_data(self.process_line, (line, address)) + self.process_raw_data(lambda: self.process_line(line, address)) except Exception as e: self.logger.exception('Exception handling a log line (skipping this one): %s' % e) @@ -2176,8 +2175,7 @@ class EventServer(ECServerThread): (100.0 * count / float(total_count)) )) - def process_line(self, data): - line, address = data + def process_line(self, line, address): line = line.rstrip() if self._config["debug_rules"]: if address:

6 years, 2 months

docker_container_cpu: Fixed calculation of CPU utilization

by Lars Michelsen

Module: check_mk Branch: master Commit: 888ca6b4cba951b1388889f7a46b558ce4ac4e7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=888ca6b4cba951… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 19:01:03 2018 +0200 docker_container_cpu: Fixed calculation of CPU utilization Change-Id: Ibf81448856fb28b1a1c19ccb9f55d6d00435f282 --- agents/check_mk_agent.linux | 16 ++++++++++------ checks/docker_container_cpu | 22 +++++++++++++++++----- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 4f912dc..9df613a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -125,16 +125,20 @@ function section_mem() function section_cpu() { + if [ "$(uname -m)" = "armv7l" ]; then + CPU_REGEX='^processor' + else + CPU_REGEX='^CPU|^processor' + fi + NUM_CPUS=$(grep -c -E $CPU_REGEX < /proc/cpuinfo) + if [ -z "$MK_IN_CONTAINER" ]; then echo '<<<cpu>>>' - if [ "$(uname -m)" = "armv7l" ]; then - CPU_REGEX='^processor' - else - CPU_REGEX='^CPU|^processor' - fi - echo "$(cat /proc/loadavg) $(grep -c -E $CPU_REGEX < /proc/cpuinfo)" + echo "$(cat /proc/loadavg) $NUM_CPUS" else echo '<<<docker_container_cpu>>>' + grep "^cpu " /proc/stat + echo "num_cpus $NUM_CPUS" cat /sys/fs/cgroup/cpu/cpuacct.stat fi } diff --git a/checks/docker_container_cpu b/checks/docker_container_cpu index bef4b4c..aa99a2d 100644 --- a/checks/docker_container_cpu +++ b/checks/docker_container_cpu @@ -33,11 +33,23 @@ def check_docker_container_cpu(_no_item, params, info): if not params: params = {} - # user, nice, system, idle, iowait, hw-int, sw-int, steal - ticks = dict(info) - values = [ int(ticks["user"]), 0, int(ticks["system"]), 0, 0, 0, 0, 0 ] + ticks = {} + for line in info: + if line[0] == "cpu": + ticks["total"] = sum(map(int, line[1:])) + else: + ticks[line[0]] = int(line[1]) - return check_cpu_util_unix(values, params) + this_time = time.time() + node_delta = get_rate("node_total", this_time, ticks["total"]) + container_delta = get_rate("container", this_time, ticks["user"] + ticks["system"]) + + if not node_delta or not container_delta: + raise MKCounterWrapped("Too short time difference since last check") + + cpu_usage = (container_delta / node_delta) * ticks["num_cpus"] * 100.0 + + return check_cpu_util(cpu_usage, params) check_info["docker_container_cpu"] = { @@ -46,5 +58,5 @@ check_info["docker_container_cpu"] = { "service_description": "CPU utilization", "has_perfdata": True, "includes": ["cpu_util.include"], - "group": "cpu_iowait", + "group": "cpu_utilization_os", }

6 years, 2 months

6036 FIX Fixed broken IP lookup in Check_MK service when using Nagios core

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c28582697ae2940c83720a16a19ba5cea3f8261 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c28582697ae29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 08:16:13 2018 +0200 6036 FIX Fixed broken IP lookup in Check_MK service when using Nagios core The "Check_MK" services of hosts were not doing IP resolution correctly, leading to messages like "(No output returned from plugin)" and non working checking for these hosts. Change-Id: I0c21093b1c9b96a76a8692882728c6c12c513f8c --- .werks/6036 | 13 +++++++++++++ cmk_base/core_nagios.py | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/6036 b/.werks/6036 new file mode 100644 index 0000000..c5b1496 --- /dev/null +++ b/.werks/6036 @@ -0,0 +1,13 @@ +Title: Fixed broken IP lookup in Check_MK service when using Nagios core +Level: 2 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524809608 + +The "Check_MK" services of hosts were not doing IP resolution correctly, +leading to messages like "(No output returned from plugin)" and non working +checking for these hosts. diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index faa5273..30a9a6c 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -1094,7 +1094,6 @@ if '-d' in sys.argv: nodes = [ (hostname, ipaddress) ] output.write("config.ipaddresses = %r\n\n" % needed_ipaddresses) - output.write("ip_lookup.lookup_ip_address = lambda hostname: config.ipaddresses.get(hostname)\n\n"); # datasource programs. Is this host relevant?

6 years, 2 months

Drop ancient check crash logging - we have the crash reporting these days

by Lars Michelsen

Module: check_mk Branch: master Commit: e5c3cac22a8e51a2ee104f96d3f6facc22f09e01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5c3cac22a8e51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 13:40:02 2018 +0200 Drop ancient check crash logging - we have the crash reporting these days Change-Id: Iafd6c9126d525cd38b0e590d1984e45bb0d89a00 --- cmk_base/core_nagios.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 178129e..3a9b14a 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -1145,20 +1145,7 @@ if '-d' in sys.argv: # generate traceback for long output output.write(" sys.stdout.write(\"Traceback: %s\\n\" % traceback.format_exc())\n") - # debug logging output.write("\n") - output.write(" l = file(cmk.paths.log_dir + \"/crashed-checks.log\", \"a\")\n") - output.write(" l.write((\"Exception in precompiled check:\\n\"\n") - output.write(" \" Check_MK Version: %s\\n\"\n") - output.write(" \" Date: %s\\n\"\n") - output.write(" \" Host: %s\\n\"\n") - output.write(" \" %s\\n\") % (\n") - output.write(" cmk.__version__,\n") - output.write(" time.strftime(\"%Y-%d-%m %H:%M:%S\"),\n") - output.write(" \"%s\",\n" % hostname) - output.write(" traceback.format_exc().replace('\\n', '\\n ')))\n") - output.write(" l.close()\n") - output.write(" sys.exit(3)\n") output.close()

6 years, 2 months

Removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: 40960fdec7eb9d343c6d76fe36f67493775988fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40960fdec7eb9d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 14:14:55 2018 +0200 Removed debug output Change-Id: I539fa874d59a4ab126f5c9ff87c7608738c8e0d9 --- cmk_base/check_table.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cmk_base/check_table.py b/cmk_base/check_table.py index bd1f3a8..58e3aa0 100644 --- a/cmk_base/check_table.py +++ b/cmk_base/check_table.py @@ -135,7 +135,6 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, return svc_is_mine = hostname == config.host_of_clustered_service(hostname, descr) - print hostname, descr, svc_is_mine, filter_mode if filter_mode is None and not svc_is_mine: return

6 years, 2 months

6037 FIX Fixed broken "Primary IP address family" rule set

by Lars Michelsen

Module: check_mk Branch: master Commit: 8413b81af4766eaee2907d4802e6e27259a517cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8413b81af4766e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 10:30:55 2018 +0200 6037 FIX Fixed broken "Primary IP address family" rule set When using the rule set "Primary IP address family" to change the IP address family of dual stack hosts to IPv6, this rule was not effective. Change-Id: I364757474544262f8686b84a14b6c5eb827f923b --- .werks/6037 | 13 +++++++++++++ cmk_base/config.py | 9 ++++++++- tests/unit/cmk_base/test_config.py | 22 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/.werks/6037 b/.werks/6037 new file mode 100644 index 0000000..ed5fe78 --- /dev/null +++ b/.werks/6037 @@ -0,0 +1,13 @@ +Title: Fixed broken "Primary IP address family" rule set +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524817782 + +When using the rule set "Primary IP address family" to change the +IP address family of dual stack hosts to IPv6, this rule was not +effective. diff --git a/cmk_base/config.py b/cmk_base/config.py index e964cdb..5b297c4 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -666,7 +666,14 @@ def is_ipv6_primary(hostname): primarily via IPv6.""" dual_stack_host = is_ipv4v6_host(hostname) return (not dual_stack_host and is_ipv6_host(hostname)) \ - or (dual_stack_host and rulesets.host_extra_conf(hostname, primary_address_family) == "ipv6") + or (dual_stack_host and _primary_ip_address_family_of(hostname) == "ipv6") + + +def _primary_ip_address_family_of(hostname): + rules = rulesets.host_extra_conf(hostname, primary_address_family) + if rules: + return rules[0] + return "ipv4" def is_ipv4v6_host(hostname): diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index a0e0e23..6727434 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1,6 +1,7 @@ import pytest import cmk_base.config as config +import cmk_base.rulesets as rulesets @pytest.mark.parametrize("hostname,tags,result", [ ("testhost", [], True), @@ -24,3 +25,24 @@ def test_is_ipv4_host(monkeypatch, hostname, tags, result): def test_is_no_ip_host(monkeypatch, hostname, tags, result): monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) assert config.is_no_ip_host(hostname) == result + + +(a)pytest.mark.parametrize("hostname,tags,result,ruleset", [ + ("testhost", [], False, []), + ("testhost", ["ip-v4"], False, + [ ( 'ipv6', [], rulesets.ALL_HOSTS, {} ), ]), + ("testhost", ["ip-v4", "ip-v6"], False, []), + ("testhost", ["ip-v4", "ip-v6"], True, + [ ( 'ipv6', [], rulesets.ALL_HOSTS, {} ), ]), + ("testhost", ["ip-v6"], True, []), + ("testhost", ["ip-v6"], True, + [ ( 'ipv4', [], rulesets.ALL_HOSTS, {} ), ]), + ("testhost", ["ip-v6"], True, + [ ( 'ipv6', [], rulesets.ALL_HOSTS, {} ), ]), + ("testhost", ["no-ip"], False, []), +]) +def test_is_ipv6_primary_host(monkeypatch, hostname, tags, result, ruleset): + monkeypatch.setattr(config, "all_hosts", ["%s|%s" % (hostname, "|".join(tags))]) + monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) + monkeypatch.setattr(config, "primary_address_family", ruleset) + assert config.is_ipv6_primary(hostname) == result

6 years, 2 months

6038 FIX Nagios: Fixed IP address resolution of dual stack hosts

by Lars Michelsen

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 <lm(a)mathias-kettner.de> 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")

6 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018