Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64249 discussions

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. 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

Check_MK Git: check_mk: Parentscan: persist user settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8b06eb7a57ac48729b8843279e6183d311c4d82d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b06eb7a57ac48… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 29 21:50:12 2012 +0200 Parentscan: persist user settings --- web/htdocs/wato.py | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2a40898..6e23d8e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2817,6 +2817,19 @@ 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) + + # Start interactive progress interactive_progress( items, @@ -2853,7 +2866,7 @@ def mode_parentscan(phase): html.write("<table class=form>") - settings = { + settings = config.load_user_file("parentscan", { "where" : "subfolder", "alias" : _("Created by parent scan"), "recurse" : True, @@ -2861,7 +2874,7 @@ def mode_parentscan(phase): "timeout" : 8, "probes" : 2, "force_explicit" : False, - } + }) # Selection html.write("<tr><td class=legend>" + _("Selection") + "</td><td class=content>")

12 years, 4 months

Check_MK Git: check_mk: First untested version of gateway creation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3054680769dc279d5d5601c1d8f5fd5c57873410 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3054680769dc27… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 29 13:15:03 2012 +0200 First untested version of gateway creation --- modules/check_mk.py | 22 ++++---- web/htdocs/wato.py | 164 +++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 151 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3054680769…

12 years, 4 months

Check_MK Git: check_mk: First working version of basic parent scan

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d7351c703b2f6ac6e372d55234035a1d0b69065 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d7351c703b2f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 29 21:26:52 2012 +0200 First working version of basic parent scan --- modules/check_mk.py | 24 ++++++++++++++++++++---- web/htdocs/wato.py | 41 ++++++++++++++++++++++++----------------- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index d04ea0d..25ebc7c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3844,9 +3844,12 @@ def do_scan_parents(hosts): for host, (gw, state, message) in zip(chunk, gws): if gw: - gateway, gateway_ip = gw + gateway, gateway_ip, dns_name = gw if not gateway: # create artificial host - gateway = "gw-%s" % (gateway_ip.replace(".", "-")) + if dns_name: + gateway = dns_name + else: + gateway = "gw-%s" % (gateway_ip.replace(".", "-")) if gateway not in gateway_hosts: gateway_hosts.add(gateway) parent_hosts.append("%s|parent|ping" % gateway) @@ -4001,12 +4004,17 @@ def scan_parents_of(hosts, silent=False): gateway = ip_to_hostname(route) if opt_verbose: sys.stdout.write("%s(%s) " % (gateway, gateway_ip)) - gateways.append( ((gateway, gateway_ip), "gateway", "") ) + + # Try to find DNS name of host via reverse DNS lookup + dns_name = ip_to_dnsname(gateway_ip) + gateways.append( ((gateway, gateway_ip, dns_name), "gateway", "") ) dot(tty_green, 'G') return gateways # find hostname belonging to an ip address. We must not use -# reverse DNS but the Check_MK mechanisms +# reverse DNS but the Check_MK mechanisms, since we do not +# want to find the DNS name but the name of a matching host +# from all_hosts def ip_to_hostname(ip): global ip_to_hostname_cache if ip_to_hostname_cache == None: @@ -4018,6 +4026,14 @@ def ip_to_hostname(ip): pass return ip_to_hostname_cache.get(ip) +def ip_to_dnsname(ip): + try: + dnsname, aliaslist, addresslist = socket.gethostbyaddr(ip) + return dnsname + except: + return None + + # +----------------------------------------------------------------------+ # | ____ _ __ _ | diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 658bbc6..2a40898 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2796,17 +2796,13 @@ def mode_parentscan(phase): entries += recurse_hosts(f, recurse, select) return entries - # 'all' not set -> only inventorize checked hosts + # '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 - if html.get_checkbox("only_failed"): - filterfunc = lambda host: host.get("inventory_failed") - else: - filterfunc = None - items = [] - for hostname in get_hostnames_from_checkboxes(filterfunc): + for hostname in get_hostnames_from_checkboxes(): host = g_folder[".hosts"][hostname] if include_host(g_folder, host, select): items.append("%s|%s" % (g_folder[".path"], hostname)) @@ -2814,7 +2810,7 @@ def mode_parentscan(phase): # all host in this folder, maybe recursively else: complete_folder = True - entries = recurse_hosts(g_folder, html.get_checkbox("recurse"), html.get_checkbox("only_failed")) + entries = recurse_hosts(g_folder, html.get_checkbox("recurse"), html.var("select")) items = [] for hostname, folder in entries: items.append("%s|%s" % (folder[".path"], hostname)) @@ -2844,7 +2840,7 @@ def mode_parentscan(phase): # Mode of action html.write("") if not complete_folder: - html.write(_("You have selected %d hosts for parent scan. ") % len(hostnames)) + html.write(_("You have selected %d hosts for parent scan. ") % len(items)) html.write("" + _("The parent scan will try to detect the last gateway " "on layer 3 (IP) before a host. This will be done by " @@ -2871,7 +2867,7 @@ def mode_parentscan(phase): html.write("<tr><td class=legend>" + _("Selection") + "</td><td class=content>") if complete_folder: html.checkbox("recurse", settings["recurse"], label=_("Include all subfolders")) - html.write(" ") + html.write(" ") html.radiobutton("select", "noexplicit", settings["select"] == "noexplicit", _("Skip hosts with explicit parent definitions (even if empty)") + " ") html.radiobutton("select", "no", settings["select"] == "no", @@ -2943,8 +2939,7 @@ def configure_gateway(state, site_id, folder, host, effective, gateway): gwcreat = False if gateway: - gw_host, gw_ip = gateway - parents = [ gw_host ] + gw_host, gw_ip, dns_name = gateway if not gw_host: if where == "nowhere": return _("No host %s configured, parents not set") % gw_ip, \ @@ -2956,6 +2951,7 @@ def configure_gateway(state, site_id, folder, host, effective, gateway): elif where == "subfolder": if "parents" in g_folder[".folders"]: gw_folder = g_folder[".folders"]["parents"] + load_hosts(gw_folder) else: gw_folder = { ".name" : "parents", @@ -2971,14 +2967,18 @@ def configure_gateway(state, site_id, folder, host, effective, gateway): g_folder[".folders"]["parent"] = gw_folder elif where == "there": gw_folder = folder + load_hosts(gw_folder) # Create gateway host - if site_id: + if dns_name: + gw_host = dns_name + elif site_id: gw_host = "gw-%s-%s" % (site_id, gw_ip.replace(".", "-")) else: gw_host = "gw-%s" % (gw_ip.replace(".", "-")) + new_host = { - "name" : gw_host, + ".name" : gw_host, "ipaddress" : gw_ip, ".folder" : gw_folder, } @@ -2992,12 +2992,18 @@ def configure_gateway(state, site_id, folder, host, effective, gateway): if e["site"] != site_id: new_host["site"] = site_id + gw_folder[".hosts"][new_host[".name"]] = new_host save_folder(gw_folder) + save_hosts(gw_folder) + mark_affected_sites_dirty(gw_folder, gw_host) + reload_folder(gw_folder) call_hook_folder_created(gw_folder) - log_pending(AFFECTED, new_folder, "new-folder", _("Created new folder %s") % gw_folder[".path"]) + log_pending(AFFECTED, gw_folder, "new-folder", _("Created new folder %s") % gw_folder[".path"]) gwcreat = True + parents = [ gw_host ] + else: parents = [] @@ -3017,8 +3023,9 @@ def configure_gateway(state, site_id, folder, host, effective, gateway): if parents: message = _("Set parents to %s") % ",".join(parents) else: - return _("Removed parents") + message = _("Removed parents") + mark_affected_sites_dirty(folder, host[".name"]) save_hosts(folder) log_pending(AFFECTED, folder, "set-gateway", message) return message, True, gwcreat @@ -6391,7 +6398,7 @@ def mode_edit_site(phase): docu_url = "http://mathias-kettner.de/checkmk_multisite_modproxy.html" html.write(_("URL prefix The URL prefix will be prepended to links of addons like PNP4Nagios " "or the classical Nagios GUI when a link to such applications points to a host or " - "service on that site. You can either use an absole URL prefix like <tt>http://some.host/mysite/</tt> " + "service on that site. You can either use an absolute URL prefix like <tt>http://some.host/mysite/</tt> " "or a relative URL like <tt>/mysite/</tt>. When using relative prefixes you needed a mod_proxy " "configuration in your local system apache that proxies such URLs ot the according remote site. " "Please refer to the <a target=_blank href='%s'>online documentation</a> for details. "

12 years, 4 months

Check_MK Git: check_mk: Intermediate state of parent scan via WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59de4b3681f18a06dfe249f04400b4865b3cf109 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59de4b3681f18a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 29 10:50:09 2012 +0200 Intermediate state of parent scan via WATO --- web/htdocs/images/icon_parentscan.png | Bin 0 -> 4733 bytes web/htdocs/wato.py | 230 +++++++++++++++++++++++++++++++++ 2 files changed, 230 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=59de4b3681…

12 years, 4 months

Check_MK Git: check_mk: New automation for parent scanning via WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 44f2097bb784902d8c5d2d87129ab95b3d6f42f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44f2097bb78490… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 29 09:16:58 2012 +0200 New automation for parent scanning via WATO --- modules/automation.py | 16 ++++++++++++ modules/check_mk.py | 63 +++++++++++++++++++++++++++++++----------------- 2 files changed, 57 insertions(+), 22 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 3a3240e..a6e72cb 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -55,6 +55,8 @@ def do_automation(cmd, args): result = automation_restart("reload") elif cmd == "restart": result = automation_restart("restart") + elif cmd == "scan-parents": + result = automation_scan_parents(args) else: raise MKAutomationError("Automation command '%s' is not implemented." % cmd) @@ -521,3 +523,17 @@ def automation_get_check_information(): if check["group"]: checks[check_type]["group"] = check["group"] return checks + +def automation_scan_parents(args): + hostnames = args + 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) + return gateways + except Exception, e: + raise MKAutomationError(str(e)) + + diff --git a/modules/check_mk.py b/modules/check_mk.py index 4243f45..1a91103 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3842,7 +3842,7 @@ def do_scan_parents(hosts): gws = scan_parents_of(chunk) - for host, gw in zip(chunk, gws): + for host, (gw, message) in zip(chunk, gws): if gw: gateway, gateway_ip = gw if not gateway: # create artificial host @@ -3874,7 +3874,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): +def scan_parents_of(hosts, silent=False): nagios_ip = lookup_ipaddress(monitoring_host) os.putenv("LANG", "") os.putenv("LC_ALL", "") @@ -3887,36 +3887,51 @@ def scan_parents_of(hosts): sys.stdout.flush() try: ip = lookup_ipaddress(host) + command = "traceroute -m 15 -n -w 3 %s" % ip + if opt_debug: + sys.stderr.write("Running '%s'\n" % command) + procs.append( (host, ip, os.popen(command) ) ) except: - sys.stderr.write("%s: cannot resolve host name\n" % host) - ip = None - command = "traceroute -m 15 -n -w 3 %s" % ip - if opt_debug: - sys.stderr.write("Running '%s'\n" % command) - procs.append( (host, ip, os.popen(command) ) ) + procs.append( (host, None, os.popen( + "echo 'ERROR: cannot resolve host name'"))) - # Now all run and we begin to read the answers + # Output marks with status of each single scan def dot(color, dot='o'): - sys.stdout.write(tty_bold + color + dot + tty_normal) - sys.stdout.flush() + if not silent: + sys.stdout.write(tty_bold + color + dot + tty_normal) + sys.stdout.flush() + # Now all run and we begin to read the answers. For each host + # we add a pair to gateways: the gateway and a diagnostig output gateways = [] for host, ip, proc in procs: lines = [l.strip() for l in proc.readlines()] exitstatus = proc.close() if exitstatus: dot(tty_red, '*') - gateways.append(None) + gateways.append((None, "Traceroute failed with exit code %d" % (exitstatus & 255))) continue - if len(lines) == 0: + if len(lines) == 1 and lines[0].startswith("ERROR:"): + message = lines[0][6:].strip() + if opt_verbose: + sys.stderr.write("%s: %s\n" % (host, message)) + dot(tty_red, "D") + gateways.append((None, message)) + continue + + elif len(lines) == 0: if opt_debug: raise MKGeneralException("Cannot execute %s. Is traceroute installed? Are you root?" % command) else: dot(tty_red, '!') + continue + elif len(lines) < 2: - sys.stderr.write("%s: %s\n" % (host, ' '.join(lines))) - gateways.append(None) + if not silent: + sys.stderr.write("%s: %s\n" % (host, ' '.join(lines))) + gateways.append((None, "The output of traceroute seem truncated:\n%s" % + ("".join(lines)))) dot(tty_blue) continue @@ -3943,11 +3958,13 @@ def scan_parents_of(hosts): elif route == '*': routes.append(None) # No answer from this router else: - sys.stderr.write("%s: invalid output line from traceroute: '%s'\n" % (host, line)) + if not silent: + sys.stderr.write("%s: invalid output line from traceroute: '%s'\n" % (host, line)) if len(routes) == 0: - sys.stderr.write("%s: incomplete output from traceroute. No routes found.\n" % host) - gateways.append(None) + error = "incomplete output from traceroute. No routes found." + sys.stderr.write("%s: %s\n" % (host, error)) + gateways.append((None, error)) dot(tty_red) continue @@ -3957,7 +3974,7 @@ def scan_parents_of(hosts): # this in monitoring_host. elif len(routes) == 1: if ip == nagios_ip: - gateways.append(None) # We are the monitoring host + gateways.append((None, "")) # We are the monitoring host dot(tty_white, 'N') else: gateways.append( (monitoring_host, nagios_ip) ) @@ -3972,8 +3989,10 @@ def scan_parents_of(hosts): route = r break if not route: - sys.stderr.write("%s: No usable routing information\n" % host) - gateways.append(None) + error = "No usable routing information" + if not silent: + sys.stderr.write("%s: %s\n" % (host, error)) + gateways.append((None, error)) dot(tty_blue) continue @@ -3982,7 +4001,7 @@ def scan_parents_of(hosts): gateway = ip_to_hostname(route) if opt_verbose: sys.stdout.write("%s(%s) " % (gateway, gateway_ip)) - gateways.append( (gateway, gateway_ip) ) + gateways.append( ((gateway, gateway_ip), "") ) dot(tty_green, 'G') return gateways

12 years, 5 months

Check_MK Git: check_mk: make host_extra_conf["parents"] have precedence

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fec8bb40437c9cd4c533ec5bc8939e8307afae0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fec8bb40437c9c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 29 08:35:25 2012 +0200 make host_extra_conf["parents"] have precedence --- ChangeLog | 3 +++ modules/check_mk.py | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4fdc4d..6cb2349 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Core: * FIX: fixed SNMP info declaration in checks: could be garbled up in rare cases + * avoid duplicate parents definition, when using 'parents' and + extra_host_conf["parents"] at the same time. The later one has + precedence. Multisite: * Logwatch: Colorizing OK state blocks correctly diff --git a/modules/check_mk.py b/modules/check_mk.py index a1b0c66..4243f45 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1507,8 +1507,12 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write(" contact_groups\t\t%s\n" % ",".join(cgrs)) contactgroups_to_define.update(cgrs) + # Get parents manually defined via extra_host_conf["parents"]. Only honor + # variable "parents" and implicit parents if this setting is empty + extra_conf_parents = host_extra_conf(hostname, extra_host_conf.get("parents", [])) + # Parents for non-clusters - if not is_clust: + if not extra_conf_parents and not is_clust: parents_list = parents_of(hostname) if len(parents_list) > 0: outfile.write(" parents\t\t\t%s\n" % (",".join(parents_list))) @@ -1522,13 +1526,13 @@ def create_nagios_hostdefs(outfile, hostname): node_ips = [ lookup_ipaddress(h) for h in nodes ] alias = "cluster of %s" % ", ".join(nodes) outfile.write(" _NODEIPS\t\t\t%s\n" % " ".join(node_ips)) - outfile.write(" parents\t\t\t%s\n" % ",".join(nodes)) + if not extra_conf_parents: + outfile.write(" parents\t\t\t%s\n" % ",".join(nodes)) # Host check uses (service-) IP address if available if ip: outfile.write(" check_command\t\t\tcheck-mk-ping\n") - # Output alias, but only if it's not define in extra_host_conf aliases = host_extra_conf(hostname, extra_host_conf.get("alias", [])) if len(aliases) == 0:

12 years, 5 months

Check_MK Git: check_mk: WATO: configure parents of hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: de1803410c61c7912902dc8ccc4981027e9314c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de1803410c61c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Apr 28 18:30:52 2012 +0200 WATO: configure parents of hosts Still some code in modules/check_mk.py is neccessary in order to avoid duplicate parent definitions --- ChangeLog | 2 + web/htdocs/check_mk.css | 6 ++++- web/htdocs/valuespec.py | 2 +- web/htdocs/wato.css | 1 - web/htdocs/wato.py | 4 +- web/plugins/wato/builtin_attributes.py | 36 ++++++++++++++++++++++++++++--- 6 files changed, 42 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2797dad..e4fdc4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,8 @@ * New button "Recursive Inventory" on folder: Allows to do a recursive inventory over all hosts. Also allows to selectively retry only hosts that have failed in a previous inventory. + * You can configure parents now (via a host attribute, no rules are + neccessary). * 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/check_mk.css b/web/htdocs/check_mk.css index f867b5f..21cda92 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -390,9 +390,13 @@ table.valuespec_listof option[selected] { font-weight: bold; } +div.listofstrings > div { + margin-bottom: 2px; +} + div.listofstrings.horizontal > div { float: left; - margin-right: 5px; + margin-right: 2px; } table.listchoice { diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ec9953d..2bb608c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -266,7 +266,7 @@ class TextAscii(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._label = kwargs.get("label") - self._size = kwargs.get("size", 30) + self._size = kwargs.get("size", 25) self._strip = kwargs.get("strip", True) self._allow_empty = kwargs.get("allow_empty", True) self._none_is_empty = kwargs.get("none_is_empty", False) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 826c4bf..864949c 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -488,7 +488,6 @@ table.validationerror img { margin-top: 10px; margin-bottom: 10px; padding: 5px 8px; - width: 834px; -moz-border-radius: 3px; background-image: url("images/form_background.png"); background-repeat: repeat; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 95d3b54..fbb7fd2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -72,7 +72,7 @@ # ".total_hosts" -> recursive number of hosts, computed on demand by # num_hosts_in() # ".siteid" -> This attribute is mandatory for host objects and optional for folder -# objects. In case of hosts and single WATO setup it is always none. +# objects. In case of hosts and single WATO setup it is always None. # # # g_folder -> The folder object representing the folder the user is @@ -3707,7 +3707,7 @@ class Attribute: # A simple text attribute. It is stored in # a Python unicode string class TextAttribute(Attribute): - def __init__(self, name, title, help = None, default_value="", mandatory=False, allow_empty=True, size=20): + def __init__(self, name, title, help = None, default_value="", mandatory=False, allow_empty=True, size=25): Attribute.__init__(self, name, title, help, default_value) self._mandatory = mandatory self._allow_empty = allow_empty diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 1ec9c75..3f8311f 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -46,18 +46,46 @@ declare_host_attribute(TextAttribute("ipaddress", _("IP address"), show_in_table = True, show_in_folder = False) +# Attribute for configuring parents class ParentsAttribute(ValueSpecAttribute): def __init__(self): ValueSpecAttribute.__init__(self, "parents", - ListOfStrings( - title = _("Parents"), - help = _("Hier kommt die Hilfe."), - orientation = "horizontal")) + ListOfStrings( + title = _("Parents"), + help = _("Parents are used to configure the reachability of hosts by the " + "monitoring server. A host is considered to be unreachable if all " + "of its parents are unreachable or down. Unreachable hosts will not be " + "actively monitored. Clusters automatically configure all " + "of their nodes as parents, but only if you do not configure parents " + "manually. 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) + def nagios_name(self): + return "parents" + declare_host_attribute(ParentsAttribute(), show_in_table = True, show_in_folder = True) + +def validate_host_parents(effective_host): + for parentname in effective_host["parents"]: + parent_folder = find_host(parentname) + if not parent_folder: + raise MKUserError(None, _("You defined the non-existing host '%s' as a parent.") % parentname) + # In case of distributed wato check also if site of host and parent + # are the same. + if is_distributed(): + parent = effective_attributes(parent_folder[".hosts"][parentname], parent_folder) + if effective_host["site"] != parent["site"]: + raise MKUserError(None, _("The parent '%s' is monitored on site '%s' while the host itself " + "is monitored on site '%s'. Both must be monitored on the same site. Remember: The parent/child " + "relation is used to describe the reachability of hosts by one monitoring daemon.") % + (parentname, parent["site"], effective_host["site"])) + +api.register_hook('validate-host', validate_host_parents) +

12 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits