Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

Dashboard: Fixed glitches in new style graph scaling when moving graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: 50138777e1b3aa0b02829bddea1336ecea4f1802 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50138777e1b3aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 2 09:50:56 2015 +0100 Dashboard: Fixed glitches in new style graph scaling when moving graphs --- web/htdocs/metrics.py | 17 +++++++++------ web/plugins/dashboard/dashlets.py | 43 +------------------------------------ 2 files changed, 11 insertions(+), 49 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 24e61e0..12b96c1 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1273,12 +1273,14 @@ def page_show_graph(): # height: title height size = (int(((float(html.var("width")) - 49 - 5)/html_size_per_ex)), int((float(html.var("height")) - 23)/html_size_per_ex)) - font_size = 11 - show_legend = True + font_size = 11 + show_legend = True + graph_id_prefix = "dashlet_" + html.var("id") else: - size = (30, 10) - font_size = 8 - show_legend = False + size = (30, 10) + font_size = 8 + show_legend = False + graph_id_prefix = "hover" if new_style_graphs_possible(): # FIXME HACK TODO We don't have the current perfata and check command @@ -1302,7 +1304,7 @@ def page_show_graph(): # Render all graphs (e.g. for the hover menu) htmlcode = render_time_graph(row, start_time, end_time, size=(30, 10), font_size=8, show_legend=False, show_controls=False, - graph_id_prefix="hover") + resizable=False, graph_id_prefix=graph_id_prefix) else: # render specific graph (e.g. for the dashlet) perf_data_string, check_command, graph_templates = find_possible_graphs(row) @@ -1317,7 +1319,8 @@ def page_show_graph(): htmlcode = render_graph_html(row["site"], host_name, service, perf_data_string, check_command, graph_template, start_time, end_time, size=size, - show_controls=False, show_legend=False) + show_controls=False, show_legend=False, + resizable=False, graph_id_prefix=graph_id_prefix) if htmlcode: html.write(htmlcode) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 161fd3c..660aa89 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -330,48 +330,6 @@ if (has_canvas_support()) { # | Renders a single performance graph | # '----------------------------------------------------------------------' -def make_graph_url(dashlet, what): - host = dashlet['context'].get('host') - if not host: - raise MKUserError('host', _('Missing needed host parameter.')) - - service = dashlet['context'].get('service') - if not service: - service = "_HOST_" - - # When the site is available via URL context, use it. Otherwise it is needed - # to check all sites for the requested host - if html.has_var('site'): - site = html.var('site') - else: - html.live.set_prepend_site(True) - query = "GET hosts\nFilter: name = %s\nColumns: name" % lqencode(host) - site = html.live.query_column(query)[0] - html.live.set_prepend_site(False) - - if not site: - base_url = defaults.url_prefix - else: - base_url = html.site_status[site]["site"]["url_prefix"] - - # New graphs which have been added via "add to visual" option don't have a timerange - # configured. So we assume the default timerange here by default. - timerange = dashlet.get('timerange', '1') - - # When the new style graphs can be rendered and this is not host graph, first - # try the new style graphing system for rendering the dashlets graph - import metrics - if metrics.new_style_graphs_possible() and service != "_HOST_": - return "show_graph.py?site=%s&host_name=%s&service=%s&source=%s&timerange=%s&what=dashlet" % \ - (site, host, service, dashlet['source'], timerange) - - # Fallback to PNP graph handling - base_url += "pnp4nagios/index.php/" - var_part = "?host=%s&srv=%s&source=%d&view=%s&theme=multisite" % \ - (pnp_cleanup(dashlet['context']['host']), pnp_cleanup(service), - dashlet['source'], timerange) - return base_url + what + var_part - def dashlet_graph(nr, dashlet): html.write('<div id="dashlet_graph_%d"></div>' % (nr)) @@ -463,6 +421,7 @@ function dashboard_render_graph(nr, site, host_name, service, source, timerange) +"&timerange="+encodeURIComponent(timerange) +"&width="+c_w +"&height="+c_h + +"&id="+nr +"&what=dashlet", { response_handler : handle_dashboard_render_graph_response, handler_data : nr,

8 years, 8 months

get rid of os.system calls in automation delete-host

by Andreas Boesl

Module: check_mk Branch: master Commit: 13a22fe4ebc261099516c834b4dd5e8b28fea455 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13a22fe4ebc261… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 2 09:18:48 2015 +0100 get rid of os.system calls in automation delete-host --- modules/automation.py | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index bdacd59..cac3402 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -355,26 +355,38 @@ def automation_analyse_service(args): def automation_delete_host(args): hostname = args[0] - # the inventory_archive as well as the perfdata is kept - # we do not want to loose historic data for accidently deleted hosts + # the inventory_archive as well as the performance data is kept + # we do not want to loose any historic data for accidently deleted hosts + + # single files for path in [ "%s/%s" % (precompiled_hostchecks_dir, hostname), "%s/%s.py" % (precompiled_hostchecks_dir, hostname), "%s/%s.mk" % (autochecksdir, hostname), - "%s/%s" % (logwatch_dir, hostname), "%s/%s" % (counters_directory, hostname), "%s/%s" % (tcp_cache_dir, hostname), "%s/persisted/%s" % (var_dir, hostname), "%s/piggyback/%s" % (tmp_dir, hostname), "%s/inventory/%s" % (var_dir, hostname), "%s/inventory/%s.gz" % (var_dir, hostname)]: - os.system("rm -rf '%s'" % path) + if os.path.exists(path): + os.unlink(path) + + # files from snmp devices + for filename in os.listdir(tcp_cache_dir): + if filename.startswith("%s." % hostname): + os.unlink("%s/%s" % (tcp_cache_dir, filename)) + + # softlinks for baked agents. obsolete packages are removed upon next bake action + for folder in os.listdir("%s/agents" % var_dir): + if os.path.exists("%s/%s" % (folder, hostname)): + os.unlink("%s/%s" % (folder, hostname)) + + # logwatch folders + if os.path.exists("%s/%s" % (logwatch_dir, hostname)): + import shutil + shutil.rmtree("%s/%s" % (logwatch_dir, hostname)) - import glob - for path in [ "%s/%s.*" % (tcp_cache_dir, hostname), - "%s/agents/*/%s" % (var_dir, hostname) ]: # only remove bakery symlinks - for filename in glob.glob(path): - os.unlink(filename) def automation_restart(job = "restart", use_rushd = True):

8 years, 8 months

#2719 FIX Events Check: Links to EC were broken when using regular expressions as application

by Lars Michelsen

Module: check_mk Branch: master Commit: 6cfb92c0c9583ed5d893562ad1d9fc8bf4edf340 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cfb92c0c9583e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 2 08:42:44 2015 +0100 #2719 FIX Events Check: Links to EC were broken when using regular expressions as application When using a regular expression to find Event Console events for an "Events" service, the icon linking from the service to the Event Console linked to a view which did not show the corrent amount of events. --- .werks/2719 | 12 ++++++++++++ ChangeLog | 1 + mkeventd/web/plugins/icons/mkeventd.py | 13 ++++++++----- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.werks/2719 b/.werks/2719 new file mode 100644 index 0000000..20ee254 --- /dev/null +++ b/.werks/2719 @@ -0,0 +1,12 @@ +Title: Events Check: Links to EC were broken when using regular expressions as application +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446450077 + +When using a regular expression to find Event Console events for an "Events" service, the +icon linking from the service to the Event Console linked to a view which did not show +the corrent amount of events. diff --git a/ChangeLog b/ChangeLog index 5389ea8..f9e481b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ Event Console: * 2733 Visibility of Event Console events more flexible now... + * 2719 FIX: Events Check: Links to EC were broken when using regular expressions as application... HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... diff --git a/mkeventd/web/plugins/icons/mkeventd.py b/mkeventd/web/plugins/icons/mkeventd.py index f25eac3..34005f3 100644 --- a/mkeventd/web/plugins/icons/mkeventd.py +++ b/mkeventd/web/plugins/icons/mkeventd.py @@ -78,17 +78,20 @@ def paint_mkeventd(what, row, tags, custom_vars): if getattr(config, 'mkeventd_distributed', False): url_prefix = site['url_prefix'] + 'check_mk/' - title = _('Events of Host %s') % (row["host_name"]) - url = 'view.py?' + html.urlencode_vars([ + url_vars = [ ("view_name", "ec_events_of_monhost"), ("site", row["site"]), ("host", row["host_name"]), - ]) + ] + + title = _('Events of Host %s') % (row["host_name"]) if len(args) >= 2: - app = args[1].strip('\'') + app = args[1].strip('\'').replace("\\\\", "\\") title = _('Events of Application "%s" on Host %s') % (app, host) - url += '&event_application=' + app + url_vars.append(("event_application", app)) + + url = 'view.py?' + html.urlencode_vars(url_vars) return 'mkeventd', title, url_prefix + url

8 years, 8 months

#2718 FIX Fixed agent timeouts not resulting in a crash report anympore

by Lars Michelsen

Module: check_mk Branch: master Commit: ef322440e607d7f9768ede2d06db9d4bccd3f897 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef322440e607d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 2 08:36:19 2015 +0100 #2718 FIX Fixed agent timeouts not resulting in a crash report anympore When an agents takes too long to respond, this results in a timeout exception which was handled as "crash". This has been changed to output a proper error message. --- .werks/2718 | 12 ++++++++++++ ChangeLog | 1 + modules/discovery.py | 16 ++++++++++++---- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.werks/2718 b/.werks/2718 new file mode 100644 index 0000000..e1f3ca6 --- /dev/null +++ b/.werks/2718 @@ -0,0 +1,12 @@ +Title: Fixed agent timeouts not resulting in a crash report anympore +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446449712 + +When an agents takes too long to respond, this results in a timeout +exception which was handled as "crash". This has been changed to output +a proper error message. diff --git a/ChangeLog b/ChangeLog index 6c0b8ac..5389ea8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 2682 FIX: Fixed exception Error creating configuration: global name 'extra_host_attributes' is not defined * 2443 FIX: Fixed quoting of ! in classical nagios checks configured via WATO... + * 2718 FIX: Fixed agent timeouts not resulting in a crash report anympore... Checks & Agents: * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... diff --git a/modules/discovery.py b/modules/discovery.py index ee09c5d..d40bfab 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -299,14 +299,22 @@ def check_discovery(hostname, ipaddress=None): output += "\n" except (MKSNMPError, MKAgentError), e: - output = "Discovery failed: %s" % e + output = "Discovery failed: %s\n" % e # Honor rule settings for "Status of the Check_MK service". In case of # a problem we assume a connection error here. spec = exit_code_spec(hostname) status = spec.get("connection", 1) - except SystemExit, e: - raise e + except MKCheckTimeout: + if opt_keepalive: + raise + else: + output = "Discovery failed: Timed out\n" + spec = exit_code_spec(hostname) + status = spec.get("timeout", 2) + + except SystemExit: + raise except Exception, e: output = create_crash_dump(hostname, "discovery", None, None, "Check_MK Discovery", [])\ @@ -596,7 +604,7 @@ def discover_services(hostname, check_types, use_caches, do_snmp_scan, on_error, try: for item, paramstring in discover_check_type(hostname, ipaddress, check_type, use_caches, on_error): discovered_services.append((check_type, item, paramstring)) - except (KeyboardInterrupt, MKAgentError, MKSNMPError): + except (KeyboardInterrupt, MKAgentError, MKSNMPError, MKCheckTimeout): raise except Exception, e: if opt_debug:

8 years, 8 months

#2444 lnx_if: now able to detect interfaces which "break" during runtime

by Andreas Boesl

Module: check_mk Branch: master Commit: 74270edd44c15a13657609c16100c717ed49dc24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74270edd44c15a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sun Nov 1 16:19:42 2015 +0100 #2444 lnx_if: now able to detect interfaces which "break" during runtime Previously the check lnx_if used the output of the ethtool command to determine if an interface is up or down. There was a fallback in case ethtool was not available, or did not report valid data at all (happens on broken interfaces). However, these fallback could not detect interfaces which break during runtime. The linux agent now reports additional information collected with the ip link command. In case the ethtool information is missing the lnx_if check will now use the data from ip link instead. --- .werks/2444 | 16 ++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 8 ++++ checks/lnx_if | 88 ++++++++++++++++++++++++++++++++++--------- 4 files changed, 95 insertions(+), 18 deletions(-) diff --git a/.werks/2444 b/.werks/2444 new file mode 100644 index 0000000..f8b3d42 --- /dev/null +++ b/.werks/2444 @@ -0,0 +1,16 @@ +Title: lnx_if: now able to detect interfaces which "break" during runtime +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1446390568 +Class: feature + +Previously the check lnx_if used the output of the ethtool command to determine if +an interface is up or down. There was a fallback in case ethtool was not available, +or did not report valid data at all (happens on broken interfaces). +However, these fallback could not detect interfaces which break during runtime. + +The linux agent now reports additional information collected with the ip link command. +In case the ethtool information is missing the lnx_if check will now use the +data from ip link instead. diff --git a/ChangeLog b/ChangeLog index 71bce4c..6c0b8ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * 2671 df: avoid duplicate items for btrfs that is mounted several times... NOTE: Please refer to the migration notes! * 2441 NetApp 7Mode: Now able to monitor reserved snapshot space for volumes + * 2444 lnx_if: now able to detect interfaces which "break" during runtime... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 811147c..d8f2488 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -235,6 +235,14 @@ cat /proc/uptime # New variant: Information about speed and state in one section +if type ip > /dev/null +then + echo '<<<lnx_if>>>' + echo "[start_iplink]" + ip link + echo "[end_iplink]" +fi + echo '<<<lnx_if:sep(58)>>>' sed 1,2d /proc/net/dev if type ethtool > /dev/null diff --git a/checks/lnx_if b/checks/lnx_if index 15e2e93..7f75e19 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -26,6 +26,15 @@ # Example output from agent: +# <<<lnx_if>>> +# [start_iplink] +# 1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN mode DEFAULT group default +# link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 +# 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP mode DEFAULT group default qlen 1000 +# link/ether 00:27:13:b4:a9:ec brd ff:ff:ff:ff:ff:ff +# 3: eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DORMANT group default qlen 1000 +# link/ether 00:21:6a:10:8e:b8 brd ff:ff:ff:ff:ff:ff +# [end_iplink] # <<<lnx_if:sep(58)>>> # lo: 4520 54 0 0 0 0 0 0 4520 54 0 0 0 0 0 0 # eth0: 0 0 0 0 0 0 0 0 1710 5 0 0 0 0 0 0 @@ -44,6 +53,7 @@ # Auto-negotiation: on # Link detected: yes + check_includes['lnx_if'] = [ "if.include" ] linux_nic_check = "lnx_if" @@ -52,21 +62,54 @@ def if_lnx_convert_to_if64(info): nic_info = {} current_nic = None index = 0 - for line in info: - # Be careful! On clustered hosts we have more than one perf-counters section - # and ethtool section. This needs to be handled. Sadly we have no section - # headers. Try to detect it by data format. - if line[0].startswith('['): - current_nic = line[0][1:-1] - index += 1 - nic_info[current_nic]['index'] = index - elif len(line) == 2 and len(line[1].split()) >= 16: - # This looks like a perf-counter line - nic = line[0] - nic_info[nic] = { "counters": map(int, line[1].split()) } - else: - # ethtool data line - nic_info[current_nic][line[0].strip()] = ":".join(line[1:]).strip() + lines = iter(info) + try: + iplink_stats = {} + while True: + line = lines.next() + + # This extra info from 'ip link' is used as fallback in case ethtool is missing + if line[0].startswith("[start_iplink]"): + iplink_stats = {} + while True: + line = lines.next() + if line[0].startswith("[end_iplink]"): + line = lines.next() + break + # Each interface in this block is represented by two lines + status_info = line + link_info = lines.next() # currently unused + try: + nic_name = status_info[1][:-1] + iplink_stats.setdefault(nic_name, { "extra_info": status_info[2][1:-1].split(",") }) + iplink_stats[nic_name].update(dict(zip(status_info[3::2], status_info[4::2]))) + except: # In case of parse errors we simply ignore these lines + pass + + # Be careful! On clustered hosts we have more than one perf-counters section + # and ethtool section. This needs to be handled. Sadly we have no section + # headers. Try to detect it by data format. + if line[0].startswith('['): + current_nic = line[0][1:-1] + index += 1 + nic_info[current_nic]['index'] = index + # The iplink_stats are only used within the perf-counters + # The (optional) ethtool section invalidates this info, otherwise it would + # be incorrectly reused in a followup section of another cluster node + # When the ethtool section is missing the data is also reset by the next [start_iplink] + iplink_stats = {} + elif len(line) == 2 and len(line[1].split()) >= 16: + # This looks like a perf-counter line + nic = line[0] + nic_info[nic] = { "counters": map(int, line[1].split()) } + if nic in iplink_stats: + nic_info[nic]['iplink_stats'] = iplink_stats[nic] + else: + # ethtool data line + nic_info[current_nic][line[0].strip()] = ":".join(line[1:]).strip() + + except StopIteration: + pass # if index is 0 we either have found no nics or no information # from ethtool is present. In the latter case we continue and @@ -130,10 +173,19 @@ def if_lnx_convert_to_if64(info): # No information from ethtool. We consider interfaces up # if they have been used at least some time since the # system boot. - if ifInOctets > 0: - ifOperStatus = 1 # assume up + iplink_stats = attr.get("iplink_stats") + if iplink_stats: + if "UP" in iplink_stats.get("extra_info", []) or iplink_stats.get("state") == "UP": + ifOperStatus = 1 + elif iplink_stats.get("state") == "DOWN": + ifOperStatus = 2 + else: + ifOperStatus = 4 else: - ifOperStatus = 4 # unknown (NIC has never been used) + if ifInOctets > 0: + ifOperStatus = 1 # assume up + else: + ifOperStatus = 4 # unknown (NIC has never been used) if attr.get("Address"): ifPhysAddress = "".join([chr(int(x, 16)) for x in attr.get("Address", "").split(":")])

8 years, 8 months

update werk 2442: required "import glob"

by Andreas Boesl

Module: check_mk Branch: master Commit: 1ff68613bf1095337625d4a9551fdc0014c75e11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ff68613bf1095… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sun Nov 1 15:50:23 2015 +0100 update werk 2442: required "import glob" --- modules/automation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/automation.py b/modules/automation.py index 471e6a1..bdacd59 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -370,6 +370,7 @@ def automation_delete_host(args): "%s/inventory/%s.gz" % (var_dir, hostname)]: os.system("rm -rf '%s'" % path) + import glob for path in [ "%s/%s.*" % (tcp_cache_dir, hostname), "%s/agents/*/%s" % (var_dir, hostname) ]: # only remove bakery symlinks for filename in glob.glob(path):

8 years, 8 months

fixed still broken sidebar header :)

by Andreas Boesl

Module: check_mk Branch: master Commit: 9f0f6c1f7c7cbfb7bb595b4bb6d498b363bd7b53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f0f6c1f7c7cbf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sun Nov 1 15:43:43 2015 +0100 fixed still broken sidebar header :) --- web/htdocs/sidebar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index a111825..0f6c779 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -160,7 +160,7 @@ def save_user_config(user_config): def get_check_mk_edition_title(): if not defaults.omd_root: return "Raw" - version_link = os.readlink(defaults.omd_root) + version_link = os.readlink("%s/version" % defaults.omd_root) if version_link.endswith(".cee.demo"): return "Enterprise (Demo)" elif "cee" in version_link:

8 years, 8 months

#2443 FIX Fixed quoting of ! in classical nagios checks configured via WATO

by Andreas Boesl

Module: check_mk Branch: master Commit: f3a2e5003b35664ca71f72c5b60778b2cd379873 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3a2e5003b3566… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sun Nov 1 13:47:23 2015 +0100 #2443 FIX Fixed quoting of ! in classical nagios checks configured via WATO Any ! character configured in the WATO rule Classical active and passive Monitoring checks or through the command line via custom_checks was incorrectly quoted. Nagios truncated the command at the !, which lead to unwanted results. --- .werks/2443 | 11 +++++++++++ ChangeLog | 1 + modules/nagios.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2443 b/.werks/2443 new file mode 100644 index 0000000..5eebfb4 --- /dev/null +++ b/.werks/2443 @@ -0,0 +1,11 @@ +Title: Fixed quoting of ! in classical nagios checks configured via WATO +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i4 +Date: 1446381757 +Class: fix + +Any ! character configured in the WATO rule Classical active and passive Monitoring checks +or through the command line via custom_checks was incorrectly quoted. Nagios truncated the command +at the !, which lead to unwanted results. diff --git a/ChangeLog b/ChangeLog index 57faf12..71bce4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.7i4: Core & Setup: * 2682 FIX: Fixed exception Error creating configuration: global name 'extra_host_attributes' is not defined + * 2443 FIX: Fixed quoting of ! in classical nagios checks configured via WATO... Checks & Agents: * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... diff --git a/modules/nagios.py b/modules/nagios.py index f369af0..7f51276 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -559,7 +559,7 @@ define service { continue if command_line: - command_line = autodetect_plugin(command_line).replace("\\", "\\\\") + command_line = autodetect_plugin(command_line).replace("\\", "\\\\").replace("!", "\\!") if "freshness" in entry: freshness = " check_freshness\t\t1\n" + \

8 years, 8 months

#2442 WATO remove host: improved cleanup of obsolete host files

by Andreas Boesl

Module: check_mk Branch: master Commit: 74991bc6a2dfaa82c7f5965454725a1b1f9e5d5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74991bc6a2dfaa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sun Nov 1 13:25:52 2015 +0100 #2442 WATO remove host: improved cleanup of obsolete host files Deleting a host in WATO will now also remove the following files <ul> <li>Persisted data</li> <li>Piggyback data</li> <li>Inventory data</li> <li>Agent Bakery symlinks</li> </ul> To prevent the loss of historic files, any performance data and the archived inventory data is not deleted. --- .werks/2442 | 19 +++++++++++++++++++ ChangeLog | 1 + modules/automation.py | 25 ++++++++++++++++++------- web/htdocs/wato.py | 17 +++++++++++++---- 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/.werks/2442 b/.werks/2442 new file mode 100644 index 0000000..ef63e06 --- /dev/null +++ b/.werks/2442 @@ -0,0 +1,19 @@ +Title: WATO remove host: improved cleanup of obsolete host files +Level: 1 +Component: wato +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446380193 + +Deleting a host in WATO will now also remove the following files +<ul> +<li>Persisted data</li> +<li>Piggyback data</li> +<li>Inventory data</li> +<li>Agent Bakery symlinks</li> +</ul> + +To prevent the loss of historic files, any performance data and the +archived inventory data is not deleted. diff --git a/ChangeLog b/ChangeLog index 5735b9d..57faf12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 2717 FIX: Fixed broken webserver level authentication integration (e.g. basic, kerberos)... WATO: + * 2442 WATO remove host: improved cleanup of obsolete host files... * 2666 FIX: Fix search for global configuration variables: ignore case now * 2715 FIX: Fixed visibility of BI aggregations in editor * 2716 FIX: Fixed error reporting on disabled checks page in case of broken man pages diff --git a/modules/automation.py b/modules/automation.py index 6b8f8e3..471e6a1 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -354,16 +354,27 @@ def automation_analyse_service(args): def automation_delete_host(args): hostname = args[0] + + # the inventory_archive as well as the perfdata is kept + # we do not want to loose historic data for accidently deleted hosts for path in [ - "%s/%s" % (precompiled_hostchecks_dir, hostname), - "%s/%s.py" % (precompiled_hostchecks_dir, hostname), - "%s/%s.mk" % (autochecksdir, hostname), - "%s/%s" % (logwatch_dir, hostname), - "%s/%s" % (counters_directory, hostname), - "%s/%s" % (tcp_cache_dir, hostname), - "%s/%s.*" % (tcp_cache_dir, hostname)]: + "%s/%s" % (precompiled_hostchecks_dir, hostname), + "%s/%s.py" % (precompiled_hostchecks_dir, hostname), + "%s/%s.mk" % (autochecksdir, hostname), + "%s/%s" % (logwatch_dir, hostname), + "%s/%s" % (counters_directory, hostname), + "%s/%s" % (tcp_cache_dir, hostname), + "%s/persisted/%s" % (var_dir, hostname), + "%s/piggyback/%s" % (tmp_dir, hostname), + "%s/inventory/%s" % (var_dir, hostname), + "%s/inventory/%s.gz" % (var_dir, hostname)]: os.system("rm -rf '%s'" % path) + for path in [ "%s/%s.*" % (tcp_cache_dir, hostname), + "%s/agents/*/%s" % (var_dir, hostname) ]: # only remove bakery symlinks + for filename in glob.glob(path): + os.unlink(filename) + def automation_restart(job = "restart", use_rushd = True): # make sure, Nagios does not inherit any open diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 23e4e87..8778a59 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1687,6 +1687,17 @@ def move_hosts_to(hostnames, path): def move_host_to(hostname, target_filename): return move_hosts_to([hostname], target_filename) + +def delete_host_files(site_id, hostname): + check_mk_automation(site_id, "delete-host", [hostname]) + if not site_is_local(site_id): + # Delete inventory data from remote sites (not the archive) + for filename in [ "%s/inventory/%s" % (defaults.var_dir, hostname), + "%s/inventory/%s.gz" % (defaults.var_dir, hostname) ]: + if os.path.exists(filename): + os.unlink(filename) + log_pending(AFFECTED, hostname, "delete-host", _("Deleted host %s") % hostname) + def delete_hosts_after_confirm(hosts): c = wato_confirm(_("Confirm deletion of %d hosts") % len(hosts), _("Do you really want to delete the %d selected hosts?") % len(hosts)) @@ -1697,10 +1708,9 @@ def delete_hosts_after_confirm(hosts): for delname in hosts: mark_affected_sites_dirty(g_folder, delname) host = g_folder[".hosts"][delname] - # check_mk_automation(host[".siteid"], "delete-host", [delname]) + delete_host_files(host[".siteid"], delname) del g_folder[".hosts"][delname] g_folder["num_hosts"] -= 1 - log_pending(AFFECTED, delname, "delete-host", _("Deleted host %s") % delname) save_folder_and_hosts(g_folder) call_hook_hosts_changed(g_folder) @@ -2212,12 +2222,11 @@ def delete_host_after_confirm(delname): raise MKUserError(None, _("Cannot delete host. Hosts in this folder are locked")) mark_affected_sites_dirty(g_folder, delname) - log_pending(AFFECTED, delname, "delete-host", _("Deleted host %s") % delname) host = g_folder[".hosts"][delname] del g_folder[".hosts"][delname] g_folder["num_hosts"] -= 1 save_folder_and_hosts(g_folder) - check_mk_automation(host[".siteid"], "delete-host", [delname]) + delete_host_files(host[".siteid"], delname) call_hook_hosts_changed(g_folder) return "folder" elif c == False: # not yet confirmed

8 years, 8 months

updated .gitignore

by Andreas Boesl

Module: check_mk Branch: master Commit: 56b820eba5eec090613a4785f15a8a0b5c97efb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56b820eba5eec0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Oct 31 16:51:22 2015 +0100 updated .gitignore --- agents/windows/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/windows/.gitignore b/agents/windows/.gitignore index 7bf4d4e..4272239 100644 --- a/agents/windows/.gitignore +++ b/agents/windows/.gitignore @@ -8,4 +8,5 @@ success.log *.rc tests state +log .ycm_extra_conf.py

8 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015