Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

Check_MK Git: check_mk: First step of implementation of active_checks in WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0862981ece7e97a99a5abe4ce2b34c63004caaf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0862981ece7e97… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 30 22:47:36 2012 +0200 First step of implementation of active_checks in WATO --- checks/check_tcp | 29 +++++++++++ modules/automation.py | 20 ++++++-- modules/check_mk.py | 64 ++++++++++++++++++++++++- modules/check_mk_base.py | 5 ++- web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 43 ++++++++++-------- web/plugins/wato/active_checks.py | 93 +++++++++++++++++++++++++++++++++++++ 7 files changed, 229 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0862981ece…

12 years, 4 months

Check_MK Git: check_mk: Make setting monitoring_host optional

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 00fc994abb651c2fd8c0432d1ba275392affa39f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00fc994abb651c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 30 15:03:04 2012 +0200 Make setting monitoring_host optional --- modules/check_mk.py | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 1a5c420..10b6d21 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -220,7 +220,7 @@ simulation_mode = False agent_simulator = False perfdata_format = "pnp" # also possible: "standard" debug_log = None -monitoring_host = "localhost" # your Nagios host +monitoring_host = None # deprecated max_num_processes = 50 # SNMP communities and encoding @@ -3854,9 +3854,10 @@ def do_scan_parents(hosts): gateway_hosts.add(gateway) parent_hosts.append("%s|parent|ping" % gateway) parent_ips[gateway] = gateway_ip - parent_rules.append( (monitoring_host, [gateway]) ) # make Nagios a parent of gw + if monitoring_host: + parent_rules.append( (monitoring_host, [gateway]) ) # make Nagios a parent of gw parent_rules.append( (gateway, [host]) ) - elif host != monitoring_host: + elif host != monitoring_host and monitoring_host: # make monitoring host the parent of all hosts without real parent parent_rules.append( (monitoring_host, [host]) ) @@ -3878,7 +3879,11 @@ def do_scan_parents(hosts): sys.stdout.write("\nWrote %s\n" % outfilename) def scan_parents_of(hosts, silent=False, settings={}): - nagios_ip = lookup_ipaddress(monitoring_host) + if monitoring_host: + nagios_ip = lookup_ipaddress(monitoring_host) + else: + nagios_ip = None + os.putenv("LANG", "") os.putenv("LC_ALL", "") @@ -3981,11 +3986,13 @@ def scan_parents_of(hosts, silent=False, settings={}): # this in monitoring_host. elif len(routes) == 1: if ip == nagios_ip: - gateways.append((None, "root", "")) # We are the root-monitoring host + gateways.append( (None, "root", "") ) # We are the root-monitoring host dot(tty_white, 'N') - else: + elif monitoring_host: gateways.append( ((monitoring_host, nagios_ip, None), "direct", "") ) dot(tty_cyan, 'L') + else: + gateways.append( (None, "direct", "") ) continue # Try far most route which is not identical with host itself

12 years, 4 months

Check_MK Git: check_mk: FIX: Bugs in brocade_fcport check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f881156a864aa838e5e500edccd75c0b14790370 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f881156a864aa8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Apr 30 11:09:09 2012 +0200 FIX: Bugs in brocade_fcport check --- ChangeLog | 2 + checks/brocade_fcport | 6 ++-- web/plugins/wato/check_parameters.py | 36 +++++++++++++++++----------------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d7939f..df99d0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ Checks & Agents: * FIX: Made logwatch parsing mechanism a little more robust (Had problems with emtpy sections from windows agent) + * FIX: brocade_fcport: Configuration of portsates now possible + WATO: * Reimplemented folder listing in host/folders module diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 3a8074b..69304c9 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -247,7 +247,7 @@ def check_brocade_fcport(item, params, info): # Port Status (physical layer) errorflag = "" if params.get("phystate") != None and phystate != params['phystate'] \ - and not (type(params['phystate']) == list and phystate in params['phystate']): + and not (type(params['phystate']) == list and phystate in map(int, params['phystate'])): # noCard (1), noTransceiver (2), laserFault (3), noLight (4), # noSync (5), inSync (6), portFault (7), diagFault (8), lockRef (9) if phystate in [1, 6]: @@ -261,7 +261,7 @@ def check_brocade_fcport(item, params, info): errorflag = "" #unknown(0) online(1) offline(2) testing(3) faulty(4) ] if params.get("opstate") != None and opstate != params['opstate'] \ - and not (type(params['opstate']) == list and opstate in params['opstate']): + and not (type(params['opstate']) == list and opstate in map(int, params['opstate'])): if opstate in [1, 3]: errorflag = "(!)" summarystate = max(summarystate, 1) @@ -273,7 +273,7 @@ def check_brocade_fcport(item, params, info): errorflag = "" # online(1) offline(2) testing(3) faulty(4) if params.get("admstate") and admstate != params['admstate'] \ - and not (type(params['admstate']) == list and admstate in params['admstate']): + and not (type(params['admstate']) == list and admstate in map(int, params['admstate'])): if admstate not in [2, 4]: errorflag = "(!)" summarystate = max(summarystate, 1) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 51bafe8..9792225 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -240,15 +240,15 @@ checkgroups.append(( Optional( ListChoice( title = _("Allowed states (otherwise check will be critical)"), - choices = [ ("1", _("noCard") ), - ("2", _("noTransceiver") ), - ("3", _("laserFault") ), - ("4", _("noLight") ), - ("5", _("noSync") ), - ("6", _("inSync") ), - ("7", _("portFault") ), - ("8", _("diagFault") ), - ("9", _("lockRef") ), + choices = [ (1, _("noCard") ), + (2, _("noTransceiver") ), + (3, _("laserFault") ), + (4, _("noLight") ), + (5, _("noSync") ), + (6, _("inSync") ), + (7, _("portFault") ), + (8, _("diagFault") ), + (9, _("lockRef") ), ] ), title = _("Physical state of port") , @@ -260,11 +260,11 @@ checkgroups.append(( Optional( ListChoice( title = _("Allowed states (otherwise check will be critical)"), - choices = [ ("0", _("unknown") ), - ("1", _("online") ), - ("2", _("offline") ), - ("3", _("testing") ), - ("4", _("faulty") ), + choices = [ (0, _("unknown") ), + (1, _("online") ), + (2, _("offline") ), + (3, _("testing") ), + (4, _("faulty") ), ] ), title = _("Operational state") , @@ -276,10 +276,10 @@ checkgroups.append(( Optional( ListChoice( title = _("Allowed states (otherwise check will be critical)"), - choices = [ ("1", _("online") ), - ("2", _("offline") ), - ("3", _("testing") ), - ("4", _("faulty") ), + choices = [ (1, _("online") ), + (2, _("offline") ), + (3, _("testing") ), + (4, _("faulty") ), ] ), title = _("Administrative state") ,

12 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dc1322d2c8c0c6c1ff3c8d30bacd90fedff7e4cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc1322d2c8c0c6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Apr 30 11:09:17 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Added check for HP Proliant Server

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bbc7e886272fc3b29f5bbe85bae3505ccf352565 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbc7e886272fc3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Apr 30 11:01:53 2012 +0200 Added check for HP Proliant Server --- checks/hp_proliant | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/checks/hp_proliant b/checks/hp_proliant new file mode 100644 index 0000000..241d2df --- /dev/null +++ b/checks/hp_proliant @@ -0,0 +1,51 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Author: Bastian Kuhn <bk(a)mathias-kettner.de> + +# General Status: +# '.1.3.6.1.4.1.232.2.2.2.1.0' => Serial Number of Server +# '.1.3.6.1.4.1.232.11.2.14.1.1.5.0' => cpqHoFwVerVersion +# '.1.3.6.1.4.1.232.11.1.3.0' => cpqHoMibCondition + +hp_proliant_generel_status_map = { 1: 'Other', 2: 'Ok', 3: 'Degraded', 4: 'Failed' } +hp_proliant_generel_status2nagios_map = { 'Other': 2, 'Ok': 0, 'Degraded': 1, 'Failed': 2, } + +def inventory_proliant_general(info): + if len(info) > 0 and len(info[0]) > 1: + return [ (None, None) ] + +def check_proliant_general(item, no_params, info): + snmp_state = hp_proliant_status_map[int(info[0][0])] + status = hp_proliant_status2nagios_map[snmp_state] + return (status, "%s - General Status is %s (Firmware: %s, S/N: %s)" % + (nagios_state_names[status], snmp_state, info[0][1], info[0][2])) + + +check_info['hp_proliant'] = (check_proliant_general, "General Status", 0, inventory_proliant_general) +snmp_info['hp_proliant'] = ( ".1.3.6.1.4.1.232", [ "11.1.3.0", "11.2.14.1.1.5.0", "2.2.2.1.0" ] ) +snmp_scan_functions['hp_proliant'] = \ + lambda oid: "8072.3.2.10" in oid(".1.3.6.1.2.1.1.2.0")

12 years, 4 months

Check_MK Git: check_mk: Fix typo

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60b8a37e22025017d282be1acc7f1f89c33ed6d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60b8a37e220250… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Apr 30 10:50:36 2012 +0200 Fix typo --- web/plugins/sidebar/shipped.py | 2 +- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/check_parameters.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 6c12c36..4cf53e0 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -766,7 +766,7 @@ def ajax_speedometer(): # Recompute the scheduled_rate only if it is not known (first call) # or if one of the sites has been restarted. The computed value cannot # change during the monitoring since it just reflects the configuration. - # That way we save CPU ressources since the computation of the + # That way we save CPU resources since the computation of the # scheduled checks rate needs to loop over all hosts and services. if last_program_start != program_start: scheduled_rate = 0.0 diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 32c16b3..61a5d93 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -860,7 +860,7 @@ register_rule(group, "in order to support as many devices as possible. Please use this ruleset in order " "to configure SNMP v2c for as many hosts as possible. That version has two advantages: " "it supports 64 bit counters, which avoids problems with wrapping counters at too " - "much traffic. And it support bulk walk, which saves much CPU and network ressources. " + "much traffic. And it supports bulk walk, which saves much CPU and network resources. " "Please be aware, however, that there are some broken devices out there, that support " "bulk walk but behave very bad when it is used. When you want to enable v2c while not using " "bulk walk, please use the rule set snmpv2c_hosts instead.")) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 51bafe8..9cbec01 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -34,7 +34,7 @@ group = "checkparams" subgroup_networking = _("Networking") subgroup_windows = _("Windows") subgroup_storage = _("Storage, Filesystems and Files") -subgroup_cpumem = _("Memory, CPU, Kernel ressources") +subgroup_cpumem = _("Memory, CPU, Kernel resources") subgroup_time = _("Time synchronization") subgroup_printing = _("Printers") subgroup_environment = _("Temperature, Humidity, etc.")

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed problem with new eval/pickle

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8a0972769a0efca1a349f66f6ba585c98e9a4178 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a0972769a0efc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 30 09:32:02 2012 +0200 FIX: Fixed problem with new eval/pickle --- ChangeLog | 1 + web/htdocs/wato.py | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d7939f..1411682 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * Filter for times now accept ranges (from ... until) * New view setting for page header: repeat. This repeats the column headers every 20'th row. + * FIX: Fixed problem with new eval/pickle Checks & Agents: * FIX: Made logwatch parsing mechanism a little more robust diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7d28b1b..f0bb2be 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10983,17 +10983,13 @@ def validate_all_hosts(hostnames, force_all = False): # | Functions needed at various places | # '----------------------------------------------------------------------' +import base64 + def mk_eval(s): - if config.debug: - return eval(s) - else: - return pickle.loads(s) + return pickle.loads(base64.b64decode(s)) def mk_repr(s): - if config.debug: - return repr(s) - else: - return pickle.dumps(s) + return base64.b64encode(pickle.dumps(s)) # Returns true when at least one folder is defined in WATO def have_folders():

12 years, 4 months

Check_MK Git: check_mk: WATO: parentscan now honors permissions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 940503f7e71e52d9a6387f9ab2a59881fb4b3017 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=940503f7e71e52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 29 22:52:49 2012 +0200 WATO: parentscan now honors permissions --- ChangeLog | 1 + web/htdocs/wato.py | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cb2349..6d7939f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ retry only hosts that have failed in a previous inventory. * You can configure parents now (via a host attribute, no rules are neccessary). + * You can now do an automated scan for parents and layer 3 (IP) * FIX: fix page header after confirmation dialogs * FIX: Fixed umlaut problem in host aliases and ip addresses created by WATO * FIX: Fixed exception caused by validation problems during editing tags in WATO diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 80a74da..7d28b1b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2975,6 +2975,8 @@ def configure_gateway(state, site_id, folder, host, effective, gateway): gw_folder = g_folder[".folders"]["parents"] load_hosts(gw_folder) else: + config.need_permission("wato.manage_folders") + check_folder_permissions(g_folder, "write") gw_folder = { ".name" : "parents", ".parent" : g_folder, @@ -2992,6 +2994,8 @@ def configure_gateway(state, site_id, folder, host, effective, gateway): load_hosts(gw_folder) # Create gateway host + config.need_permission("wato.manage_hosts") + check_folder_permissions(gw_folder, "write") if dns_name: gw_host = dns_name elif site_id: @@ -3033,6 +3037,10 @@ def configure_gateway(state, site_id, folder, host, effective, gateway): return _("Parents unchanged at %s") % \ (parents and ",".join(parents) or _("none")), False, gwcreat + + config.need_permission("wato.edit_hosts") + check_host_permissions(host[".name"], folder=folder) + if force_explicit: host["parents"] = parents else:

12 years, 4 months

Check_MK Git: check_mk: WATO: make host names in column parents clickable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 53aa3c737218d10e3f3cab9ba43527ec8be9f54e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53aa3c737218d1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 29 22:28:51 2012 +0200 WATO: make host names in column parents clickable --- web/plugins/wato/builtin_attributes.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 3f8311f..a310fdc 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -60,6 +60,7 @@ class ParentsAttribute(ValueSpecAttribute): "manually.<br><br>In a distributed setup make sure that the host and all " "of its parents are monitored by the same site."), orientation = "horizontal")) + def to_nagios(self, value): if value: return ",".join(value) @@ -67,6 +68,12 @@ class ParentsAttribute(ValueSpecAttribute): def nagios_name(self): return "parents" + def paint(self, value, hostname): + parts = [ '<a href="%s">%s</a>' % ( + "wato.py?" + htmllib.urlencode_vars([("mode", "edithost"), ("host", hn)]), hn) + for hn in value ] + return "", ", ".join(parts) + declare_host_attribute(ParentsAttribute(), show_in_table = True,

12 years, 4 months

Check_MK Git: check_mk: WATO parent scan: honor performance settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 870544b0c5e318eb247c92b5289edc279553fd64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=870544b0c5e318… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 29 22:21:44 2012 +0200 WATO parent scan: honor performance settings --- modules/automation.py | 9 ++++++- modules/check_mk.py | 10 ++++++-- web/htdocs/wato.py | 50 +++++++++++++++++++++++++++++------------------- 3 files changed, 44 insertions(+), 25 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index a6e72cb..1661027 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -525,13 +525,18 @@ def automation_get_check_information(): return checks def automation_scan_parents(args): - hostnames = args + settings = { + "timeout" : int(args[0]), + "probes" : int(args[1]), + "max_ttl" : int(args[2]), + } + hostnames = args[3:] traceroute_prog = find_bin_in_path('traceroute') if not traceroute_prog: raise MKAutomationError("Cannot find binary <tt>traceroute</tt> in search path.") try: - gateways = scan_parents_of(hostnames, silent=True) + gateways = scan_parents_of(hostnames, silent=True, settings=settings) return gateways except Exception, e: raise MKAutomationError(str(e)) diff --git a/modules/check_mk.py b/modules/check_mk.py index 25ebc7c..1a5c420 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3877,7 +3877,7 @@ def do_scan_parents(hosts): out.write("parents += %s\n\n" % pprint.pformat(parent_rules)) sys.stdout.write("\nWrote %s\n" % outfilename) -def scan_parents_of(hosts, silent=False): +def scan_parents_of(hosts, silent=False, settings={}): nagios_ip = lookup_ipaddress(monitoring_host) os.putenv("LANG", "") os.putenv("LC_ALL", "") @@ -3890,7 +3890,11 @@ def scan_parents_of(hosts, silent=False): sys.stdout.flush() try: ip = lookup_ipaddress(host) - command = "traceroute -m 15 -n -w 3 '%s' 2>&1" % ip + command = "traceroute -w %d -q %d -m %d -n '%s' 2>&1" % ( + settings.get("timeout", 8), + settings.get("probes", 2), + settings.get("max_ttl", 10), + ip) if opt_debug: sys.stderr.write("Running '%s'\n" % command) procs.append( (host, ip, os.popen(command) ) ) @@ -3980,7 +3984,7 @@ def scan_parents_of(hosts, silent=False): gateways.append((None, "root", "")) # We are the root-monitoring host dot(tty_white, 'N') else: - gateways.append( (monitoring_host, "direct", nagios_ip) ) + gateways.append( ((monitoring_host, nagios_ip, None), "direct", "") ) dot(tty_cyan, 'L') continue diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6e23d8e..80a74da 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2715,10 +2715,20 @@ def mode_parentscan(phase): html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") return - elif phase == "action": + # Ignored during initial form display + settings = { + "where" : html.var("where"), + "alias" : html.var_utf8("alias", "").strip() or None, + "recurse" : html.get_checkbox("recurse"), + "select" : html.var("select"), + "timeout" : saveint(html.var("timeout")) or 8, + "probes" : saveint(html.var("probes")) or 2, + "max_ttl" : saveint(html.var("max_ttl")) or 10, + "force_explicit" : html.get_checkbox("force_explicit"), + } + + if phase == "action": if html.var("_item"): - # HIRN: Parameter einbeziehen zur Performance und - # Gatewayerzeugun try: # TODO: We could improve the performance by scanning # in parallel. The automation already can do this. @@ -2729,7 +2739,8 @@ def mode_parentscan(phase): host = folder[".hosts"][hostname] eff = effective_attributes(host, folder) site_id = eff.get("site") - gateways = check_mk_automation(site_id, "scan-parents", [hostname]) + params = map(str, [ settings["timeout"], settings["probes"], settings["max_ttl"] ]) + gateways = check_mk_automation(site_id, "scan-parents", params + [hostname]) gateway, state, error = gateways[0] if state in [ "direct", "root", "gateway" ]: @@ -2797,20 +2808,18 @@ def mode_parentscan(phase): return entries # 'all' not set -> only scan checked hosts in current folder, no recursion - select = html.var("select") if not html.var("all"): - select = html.var("select") complete_folder = False items = [] for hostname in get_hostnames_from_checkboxes(): host = g_folder[".hosts"][hostname] - if include_host(g_folder, host, select): + if include_host(g_folder, host, settings["select"]): items.append("%s|%s" % (g_folder[".path"], hostname)) # all host in this folder, maybe recursively else: complete_folder = True - entries = recurse_hosts(g_folder, html.get_checkbox("recurse"), html.var("select")) + entries = recurse_hosts(g_folder, settings["recurse"], settings["select"]) items = [] for hostname, folder in entries: items.append("%s|%s" % (folder[".path"], hostname)) @@ -2818,15 +2827,6 @@ def mode_parentscan(phase): if html.var("_start"): # Persist settings - settings = { - "where" : html.var("where"), - "alias" : html.var_utf8("alias").strip() or None, - "recurse" : html.get_checkbox("recurse"), - "select" : html.var("select"), - "timeout" : saveint(html.var("timeout")) or 8, - "probes" : saveint(html.var("probes")) or 2, - "force_explicit" : html.get_checkbox("force_explicit"), - } config.save_user_file("parentscan", settings) @@ -2873,6 +2873,7 @@ def mode_parentscan(phase): "select" : "noexplicit", "timeout" : 8, "probes" : 2, + "max_ttl" : 10, "force_explicit" : False, }) @@ -2895,10 +2896,16 @@ def mode_parentscan(phase): html.write("<table><tr><td>") html.write(_("Timeout for responses") + ":</td><td>") html.number_input("timeout", settings["timeout"], size=2) - html.write(" sec</td></tr><tr><td>") + html.write(" %s</td></tr>" % _("sec")) + html.write("<tr><td>") html.write(_("Number of probes per hop") + ":</td><td>") html.number_input("probes", settings["probes"], size=2) - html.write('</td></tr></table>') + html.write('</td></tr>') + html.write("<tr><td>") + html.write(_("Maximum distance (TTL) to gateway") + ":</td><td>") + html.number_input("max_ttl", settings["max_ttl"], size=2) + html.write('</td></tr>') + html.write('</table>') html.write('</td></tr>') # Configuring parent @@ -2952,6 +2959,8 @@ def configure_gateway(state, site_id, folder, host, effective, gateway): gwcreat = False if gateway: + if len(gateway) != 3: + raise Exception("Gateway ist %r" % (gateway,)) gw_host, gw_ip, dns_name = gateway if not gw_host: if where == "nowhere": @@ -3021,7 +3030,8 @@ def configure_gateway(state, site_id, folder, host, effective, gateway): parents = [] if effective["parents"] == parents: - return _("Parents unchanged"), False, gwcreat + return _("Parents unchanged at %s") % \ + (parents and ",".join(parents) or _("none")), False, gwcreat if force_explicit: host["parents"] = parents

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2012