Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

#2446 FIX Active checks check_mail, check_mail_loop: did not work with POP3 protocol

by Andreas Boesl

Module: check_mk Branch: master Commit: f19663292a90a8afa1751c46317566fb6e415975 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f19663292a90a8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 3 15:22:12 2015 +0100 #2446 FIX Active checks check_mail, check_mail_loop: did not work with POP3 protocol Any mail checks through the POP3 protocol lead to an exception. This has been fixed. --- .werks/2446 | 11 +++++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_mail | 2 +- doc/treasures/active_checks/check_mail_loop | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/2446 b/.werks/2446 new file mode 100644 index 0000000..ce8140e --- /dev/null +++ b/.werks/2446 @@ -0,0 +1,11 @@ +Title: Active checks check_mail, check_mail_loop: did not work with POP3 protocol +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446560378 + +Any mail checks through the POP3 protocol lead to an exception. +This has been fixed. diff --git a/ChangeLog b/ChangeLog index 312d690..acb20d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 2672 FIX: mounts: ignore options that are allowed to change on btrfs filesystems... * 2445 FIX: ibm_svc_disks: fixed crash in case special agent reports too much data columns per line * 2734 FIX: cmctc.temp: fix exception of type UnicodeDecodeError + * 2446 FIX: Active checks check_mail, check_mail_loop: did not work with POP3 protocol... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/doc/treasures/active_checks/check_mail b/doc/treasures/active_checks/check_mail index 7c2ccf6..8ef4a4a 100755 --- a/doc/treasures/active_checks/check_mail +++ b/doc/treasures/active_checks/check_mail @@ -207,7 +207,7 @@ def fetch_mails(): num_messages = len(g_M.list()[1]) for i in range(num_messages): index = i+1 - lines = g_M.retr(index, 0)[1] + lines = g_M.retr(index)[1] mails[i] = email.message_from_string("".join(lines)) else: retcode, messages = g_M.search(None, 'NOT', 'DELETED') diff --git a/doc/treasures/active_checks/check_mail_loop b/doc/treasures/active_checks/check_mail_loop index c1a0634..c9702ee 100755 --- a/doc/treasures/active_checks/check_mail_loop +++ b/doc/treasures/active_checks/check_mail_loop @@ -238,7 +238,7 @@ def fetch_mails(): for i in range(num_messages): index = i+1 - lines = g_M.retr(index, 0)[1] + lines = g_M.retr(index)[1] mails[i] = email.message_from_string("".join(lines)) else:

8 years, 7 months

#2708 sap, sap_state: new sap_state service reports connection problems to sap hosts

by Sebastian Herbord

Module: check_mk Branch: master Commit: 9b3b675bbfdf5ed86ed0d4645115efefcdab69eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b3b675bbfdf5e… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Nov 3 15:03:17 2015 +0100 #2708 sap, sap_state: new sap_state service reports connection problems to sap hosts The new sap_state service will be discovered on the host(s) running the sap agent plugin, one service for each configured host. This service will report all problems preventing the system from reporting information about the sap instance. The remaining sap services will now not become "unknown", but keep their last state and turn stale after a while. --- .werks/2708 | 14 ++++++++++++++ ChangeLog | 1 + agents/plugins/mk_sap | 5 +++++ checkman/sap_state | 18 +++++++++++++++++ checks/sap | 19 ++++++++++++++---- checks/sap_state | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+), 4 deletions(-) diff --git a/.werks/2708 b/.werks/2708 new file mode 100644 index 0000000..bb7baee --- /dev/null +++ b/.werks/2708 @@ -0,0 +1,14 @@ +Title: sap, sap_state: new sap_state service reports connection problems to sap hosts +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1446559117 +Class: feature + +The new sap_state service will be discovered on the host(s) running the sap agent plugin, one service +for each configured host. +This service will report all problems preventing the system from reporting information about the sap +instance. +The remaining sap services will now not become "unknown", but keep their last state and turn stale +after a while. diff --git a/ChangeLog b/ChangeLog index 5bbea07..312d690 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 2444 lnx_if: now able to detect interfaces which "break" during runtime... * 2720 nullmailer_mailq: New check for monitoring the outgoing mail queue of Nullmailer... * 2707 winperf_processor: can now be configured to warn if a single cpu core exceeds a utilization threshold for a while... + * 2708 sap, sap_state: new sap_state service reports connection problems to sap hosts... * 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/plugins/mk_sap b/agents/plugins/mk_sap index 7303dac..146dcbc 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -468,11 +468,16 @@ try: for entry in cfg: try: check(entry) + sys.stdout.write('<<<sap_state:sep(9)>>>\n%s\tOK\n' % entry['ashost']) except sapnwrfc.RFCCommunicationError, e: sys.stderr.write('ERROR: Unable to connect (%s)\n' % e) + sys.stdout.write('<<<sap_state:sep(9)>>>\n%s\tUnable to connect (%s)\n' %\ + (entry['ashost'], e)) processed_all = False except Exception, e: sys.stderr.write('ERROR: Unhandled exception (%s)\n' % e) + sys.stdout.write('<<<sap_state:sep(9)>>>\n%s\tUnhandled exception (%s)\n' %\ + (entry['ashost'], e)) processed_all = False # Now check whether or not an old logfile needs to be removed. This can only diff --git a/checkman/sap_state b/checkman/sap_state new file mode 100644 index 0000000..3689db4 --- /dev/null +++ b/checkman/sap_state @@ -0,0 +1,18 @@ +title: SAP Host State +agents: linux +catalog: app/sap +license: GPL +distribution: check_mk +description: + This check reports the state of monitored sap hosts. It turns critical if + there is any communication error (including failed login). + Please note that this check appears on systems configured to monitor + sap instances, that is: the system with the mk_sap agent plugin, whereas + the other sap checks appear on a host named after the sap instance. + +item: + The item name is the hostname of the monitored system. + +inventory: + The check creates one item for each host configured in sap.cfg + diff --git a/checks/sap b/checks/sap index e508d72..8f165f4 100644 --- a/checks/sap +++ b/checks/sap @@ -41,7 +41,7 @@ def inventory_sap_dialog(info): return inv def check_sap_dialog(item, params, info): - # First xtract all infos + # First extract all infos dialog = {} for line in info: if line[0] == item and line[3].startswith('SAP CCMS Monitor Templates/Dialog Overview/'): @@ -51,7 +51,14 @@ def check_sap_dialog(item, params, info): dialog[key] = perfval, uom if not dialog: - return (3, 'Unable to find dialog monitoring data in agent output') + # this isn't perfect. Sap data is delivered as piggyback output. Potentially mulitple + # hosts can each send data for multiple sap instances. The data can also overlap. + # This means technically we may not get here and report then incomplete data if one host is + # down. + # And we would get here if the host isn't down if the item has simply disappeared from + # the output. + # There is no way inside this check to determine the host(s) that sent the data in info. + raise MKCounterWrapped("no output about sap dialogs in agent output") def perf_clean_key(s): return s.replace('(', '_').replace(')', '_').replace(' ', '_').replace('.', '_').rstrip('_') @@ -124,6 +131,7 @@ def sap_value_path_matches(path, pattern): def check_sap_value(item, params, info): status = None perfdata = [] + for line in info: if params.get('limit_item_levels'): this_path = '/'.join(line[3].split('/')[-params.get('limit_item_levels'):]) @@ -144,7 +152,7 @@ def check_sap_value(item, params, info): break if status is None: - return (3, 'Unable to find the required value in agent output') + raise MKCounterWrapped("no output about sap value in agent output") return (status, output, perfdata) @@ -199,7 +207,7 @@ def check_sap_value_groups( item, params, info ): backend = [] count_ok = 0 count_crit = 0 - state = 0 + state = None for line in info: path = line[3] if item in sap_groups_of_value( path, params ): @@ -215,6 +223,9 @@ def check_sap_value_groups( item, params, info ): else: count_ok += 1 + if state is None: + raise MKCounterWrapped("no output about sap value groups in agent output") + return state, "%s OK, %s Crit %s\n%s" % ( count_ok, count_crit, ", ".join(frontend), "\n".join(backend) ) diff --git a/checks/sap_state b/checks/sap_state new file mode 100644 index 0000000..a9aacc8 --- /dev/null +++ b/checks/sap_state @@ -0,0 +1,51 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + + +def inventory_sap_state(info): + for node, value in info: + yield node, None + + +def check_sap_state(item, _no_parameters, info): + def value_to_status(value): + if value == "OK": + return 0 + else: + return 2 + + for node, value in info: + if node == item: + return value_to_status(value), value + + +check_info['sap_state'] = { + "check_function" : check_sap_state, + "inventory_function" : inventory_sap_state, + "service_description" : "SAP State %s", + "has_perfdata" : True, +} +

8 years, 7 months

#2734 FIX cmctc.temp: fix exception of type UnicodeDecodeError

by Mathias Kettner

Module: check_mk Branch: master Commit: 5f9f6a0dab983eba1403f5bb00a8e2a6d475e613 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f9f6a0dab983e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 3 14:43:43 2015 +0100 #2734 FIX cmctc.temp: fix exception of type UnicodeDecodeError --- .werks/2734 | 9 +++++++++ ChangeLog | 1 + checks/cmctc | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2734 b/.werks/2734 new file mode 100644 index 0000000..3bdf4fc --- /dev/null +++ b/.werks/2734 @@ -0,0 +1,9 @@ +Title: cmctc.temp: fix exception of type UnicodeDecodeError +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1446558200 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 6349a05..5bbea07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 2698 FIX: ups_capacity: fixed missing battery time and fuel information * 2672 FIX: mounts: ignore options that are allowed to change on btrfs filesystems... * 2445 FIX: ibm_svc_disks: fixed crash in case special agent reports too much data columns per line + * 2734 FIX: cmctc.temp: fix exception of type UnicodeDecodeError Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/cmctc b/checks/cmctc index a661ba3..52017c3 100644 --- a/checks/cmctc +++ b/checks/cmctc @@ -55,7 +55,7 @@ def check_cmctc_temp(item, params, info): } status, current, crit, low, warn = map(int, line[2:7]) descr = line[7] - info_text = "%s at %d°C" % (descr, current) + info_text = u"%s at %d°C" % (descr, current) if params: warn, crit = params if current >= crit:

8 years, 7 months

windows agent: fixed two more cases of variables being used as printf format

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8661d935a54becaf35cc61a3644646f15f8e41a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8661d935a54bec… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Nov 2 16:31:52 2015 +0100 windows agent: fixed two more cases of variables being used as printf format --- agents/windows/Configuration.cc | 4 ++-- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 831488 -> 831488 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 831488 -> 831488 bytes agents/windows/check_mk_agent.exe | Bin 750592 -> 750592 bytes agents/windows/check_mk_agent.msi | Bin 1840128 -> 1840128 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 750592 -> 750592 bytes agents/windows/install_agent-64.exe | Bin 383962 -> 383970 bytes agents/windows/install_agent.exe | Bin 375181 -> 375168 bytes 9 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index 818dea8..02f4aed 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -892,10 +892,10 @@ bool Configuration::handleScriptConfigVariable(char *var, char *value, script_ty memset(tmp, 0, sizeof(*tmp)); if (user) - snprintf(tmp->user, sizeof(tmp->user), user); + snprintf(tmp->user, sizeof(tmp->user), "%s", user); tmp->type = type; - snprintf(tmp->path, sizeof(tmp->path), value); + snprintf(tmp->path, sizeof(tmp->path), "%s", value); _script_includes.add(tmp); return true; } diff --git a/agents/windows/build_version b/agents/windows/build_version index ff39c77..d27f552 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -622 +624 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 84b4ab2..2127098 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 757f3d3..c632fcb 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 247a8db..8a04fce 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 861e75f..4535103 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index dab3ac6..c2ae79c 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 75cc9d7..c88dc76 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 40fd66d..bf1b664 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 7 months

windows_tasks: Added missing exit codes to be considered okay

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7fead30e82d7db4319af369ba1dd5ba548161e4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fead30e82d7db… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Nov 2 17:19:00 2015 +0100 windows_tasks: Added missing exit codes to be considered okay --- checks/windows_tasks | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/checks/windows_tasks b/checks/windows_tasks index b3c551d..7df08bb 100644 --- a/checks/windows_tasks +++ b/checks/windows_tasks @@ -41,6 +41,20 @@ # A list of all task state can be found here: # http://msdn.microsoft.com/en-us/library/aa383604%28VS.85%29.aspx + +# From here: http://systemcentercore.com/?GetElement=Custom.TaskScheduler2.Task.LastResu… + +# Windows Scheduled Task Last Result Monitor. +#The monitor checks the last result code (exit code) of a scheduled task. +#Anything other than the following values is considered a warning condition for an enabled scheduled task. +#- '0' +#- '1' (for tasks containing a popup action) +#- '267009': currently running +#- '267014': was terminated by user +#- '267045': queued +#- '-2147216609': instance of this task already running -> being taken care of by the separate monitor +#- '-2147750687': task already running -> being taken care of by the separate monitor + def windows_tasks_convert(info): data = {} last_task = False @@ -67,16 +81,20 @@ def check_windows_tasks(item, _no_params, info): state = 0 label = "" msg = [] - if last_result not in [ 0, 0x00041301, 0x00041325, 0x00041306, 0x8004131F ]: # RUNNING, QUEUED, CANCELD, Instance RUNNING + if last_result not in [ 0, 1, 267009, 267014, 267045, -2147216609, -2147750687 ]: state = 2 label = "(!!)" msg.append("Service in state: %s%s" % ( last_result, label ) ) - if last_result == 0x00041301: + if last_result == 267009: msg[-1] += " (currently running)" - elif last_result == 0x00041325: + elif last_result == 267014: + msg[-1] += " (terminated by user)" + elif last_result == 267045: msg[-1] += " (queued)" - elif last_result == 0x8004131F: + elif last_result == -2147216609: msg[-1] += " (an instance of the task already running)" + elif last_result == -2147750687: + msg[-1] += " (task already running)" if values['Scheduled Task State'] != 'Enabled': msg.append("Task not Enabled(!!)")

8 years, 8 months

netapp_api_snapshots: fixed broken check/agent output

by Andreas Boesl

Module: check_mk Branch: master Commit: a017c054631e765dbdac0b9567ae4231f963a93f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a017c054631e76… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 2 16:43:31 2015 +0100 netapp_api_snapshots: fixed broken check/agent output --- agents/special/agent_netapp | 10 +++++++--- checks/netapp_api_snapshots | 15 +++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index a0e9d5b..a5c6ca2 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -620,17 +620,21 @@ else: config_report = ["name", "size-total", "size-available"]) # Snapshot info + print "<<<netapp_api_snapshots:sep(9)>>>" for volume in volumes.children_get(): name = volume.child_get_string("name") volume_snapshots_reserved = server.invoke("snapshot-get-reserve", "volume", name) - dict_reserved = create_dict(volume_snapshots_reserved) - dict_reserved["size-total"] = volume.child_get_string("size-total") + + dict_reserved = {} + dict_reserved["size-total"] = volume.child_get_string("size-total") + dict_reserved["percent-reserved"] = volume_snapshots_reserved.child_get_string("percent-reserved") + dict_reserved["blocks-reserved"] = volume_snapshots_reserved.child_get_string("blocks-reserved") print format_dict(dict_reserved, prefix = "volume_snapshot %s" % name, as_line = True) volume_snapshots = server.invoke("snapshot-list-info", "target-name", name, "target-type", "volume") print format_config(volume_snapshots.child_get("snapshots"), "volume_snapshot", name, - report = ["volume_snapshot", "percentage-of-total-blocks", "cumulative-total"]) + config_report = ["volume_snapshot", "percentage-of-total-blocks", "cumulative-total"]) # Protocols diff --git a/checks/netapp_api_snapshots b/checks/netapp_api_snapshots index ed5fd58..405a39b 100644 --- a/checks/netapp_api_snapshots +++ b/checks/netapp_api_snapshots @@ -41,18 +41,25 @@ def check_netapp_api_snapshots(item, _no_params, parsed): snapshot_total = int(data[-1]["cumulative-total"]) * 1024.0 size_total = int(data[0]["size-total"]) - reserved_percent = snapshot_total / size_total reserved_bytes = int(data[0]["blocks-reserved"]) * 1024.0 + if not reserved_bytes: + yield 0, "Used snapshot space: %s" % get_bytes_human_readable(snapshot_total),[("bytes", snapshot_total)] + yield 1, "No snapshot reserve configured" + return + + used_percent = snapshot_total / reserved_bytes * 100.0 + volume_total = size_total + reserved_bytes + state = 0 - if reserved_percent > 100: + if used_percent > 100: state = 2 - yield state, "Reserve used: %.1f%% (%s)" % (reserved_percent, + yield state, "Reserve used: %.1f%% (%s)" % (used_percent, get_bytes_human_readable(snapshot_total)) yield 0, "Total Reserve: %s%% (%s) of %s" % (data[0]["percent-reserved"], get_bytes_human_readable(reserved_bytes), - get_bytes_human_readable(size_total)),\ + get_bytes_human_readable(volume_total)),\ [("bytes", snapshot_total, 0, 0, 0, reserved_bytes)] check_info["netapp_api_snapshots"] = {

8 years, 8 months

#2722 FIX Fixed some icon links from views opening in dashlet frames instead of the whole page

by Lars Michelsen

Module: check_mk Branch: master Commit: ab0c461aab224d7ff0e5c946fa3aa8bc1136ef7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab0c461aab224d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 2 16:26:47 2015 +0100 #2722 FIX Fixed some icon links from views opening in dashlet frames instead of the whole page e.g. the "crashed checks" icon was providing a link which opened the crashed check page inside a dashlet when clicked on the icon within a dashlet view. --- .werks/2722 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/2722 b/.werks/2722 new file mode 100644 index 0000000..22153da --- /dev/null +++ b/.werks/2722 @@ -0,0 +1,10 @@ +Title: Fixed some icon links from views opening in dashlet frames instead of the whole page +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1446477951 +Class: fix + +e.g. the "crashed checks" icon was providing a link which opened the crashed check page +inside a dashlet when clicked on the icon within a dashlet view. diff --git a/ChangeLog b/ChangeLog index f6bdea3..6349a05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * 2691 FIX: Fixed exception in host address painter when displaying hosts/services of older sites * 2670 FIX: Fix problem that no site is configured when user has deleted only site... * 2717 FIX: Fixed broken webserver level authentication integration (e.g. basic, kerberos)... + * 2722 FIX: Fixed some icon links from views opening in dashlet frames instead of the whole page... WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e571785..4533379 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2557,7 +2557,7 @@ def ajax_popup_action_menu(): url = 'javascript:void(0)' target = "" - if target_frame != "_self": + if target_frame and target_frame != "_self": target = " target=\"%s\"" % target_frame html.write('<a href="%s"%s%s>' % (url, target, onclick)) @@ -2581,4 +2581,4 @@ def sanitize_action_url(url_spec): if type(url_spec) == tuple: return url_spec else: - return (url_spec, "_self") + return (url_spec, None)

8 years, 8 months

Cleaned up garbled HTML code after view dashlet reload

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f45bcc0df64f075e7bb27eece5a0daec22c1419 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f45bcc0df64f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 2 16:20:56 2015 +0100 Cleaned up garbled HTML code after view dashlet reload --- web/htdocs/js/checkmk.js | 8 ++++++-- web/plugins/dashboard/dashlets.py | 10 ++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index efd7095..8b0bcab 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1068,7 +1068,7 @@ function do_reload(url) // Enforce specific display_options to get only the content data. // All options in "opts" will be forced. Existing upper-case options will be switched. var display_options = getUrlParam('display_options'); - // Removed 'w' to reflect original rengering mechanism during reload + // Removed 'w' to reflect original rendering mechanism during reload // For example show the "Your query produced more than 1000 results." message // in views even during reload. var opts = [ 'h', 't', 'b', 'f', 'c', 'o', 'd', 'e', 'r', 'u' ]; @@ -1091,7 +1091,11 @@ function do_reload(url) if(real_display_options !== '') params['display_options'] = real_display_options; - params['_do_actions'] = getUrlParam('_do_actions') + params['_do_actions'] = getUrlParam('_do_actions'); + + // For dashlet reloads add a parameter to mark this request as reload + if (window.location.href.indexOf("dashboard_dashlet.py") != -1) + params["_reload"] = "1"; call_ajax(makeuri(params), { response_handler : handle_content_reload, diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 660aa89..4b62454 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -590,8 +590,14 @@ def dashlet_view(nr, dashlet): import bi # FIXME: Cleanup? bi.reset_cache_status() # needed for status icon - html.set_var('display_options', 'HRSIXL') - html.set_var('_display_options', 'HRSIXL') + is_reload = html.has_var("_reload") + + display_options = "SIXL" + if not is_reload: + display_options += "HR" + + html.set_var('display_options', display_options) + html.set_var('_display_options', display_options) html.add_body_css_class('dashlet') import views # FIXME: HACK, clean this up somehow

8 years, 8 months

windows agent: improve the chance to find the powershell interpreter

by Sebastian Herbord

Module: check_mk Branch: master Commit: 065c19d5d63312afa3d245f4941c225591d4a4e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=065c19d5d63312… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Nov 2 15:41:39 2015 +0100 windows agent: improve the chance to find the powershell interpreter --- agents/windows/check_mk_agent-64.exe | Bin 830464 -> 831488 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 830464 -> 831488 bytes agents/windows/check_mk_agent.cc | 11 ++++++++++- agents/windows/check_mk_agent.exe | Bin 748544 -> 750592 bytes agents/windows/check_mk_agent.msi | Bin 1837056 -> 1840128 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 748544 -> 750592 bytes agents/windows/install_agent-64.exe | Bin 383220 -> 383962 bytes agents/windows/install_agent.exe | Bin 374150 -> 375181 bytes 8 files changed, 10 insertions(+), 1 deletion(-) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index f83c9b5..84b4ab2 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 5449d1f..757f3d3 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 6e57734..a30c8d9 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2255,7 +2255,16 @@ char *add_interpreter(char *path, char *newpath) // 1.) The powershell interpreter needs to be in PATH // 2.) The execution policy needs to allow the script execution // -> Get-ExecutionPolicy / Set-ExecutionPolicy - snprintf(newpath, 256, "powershell.exe -NoLogo -ExecutionPolicy RemoteSigned \"& \'%s\'\"", path); + // + // actually, microsoft always installs the powershell interpreter to the same + // directory (independent of the version) so even if it's not in the path, + // we have a good chance with this fallback. + char dummy; + ::SearchPathA(NULL, "powershell.exe", NULL, 1, &dummy, NULL); + const char *interpreter = ::GetLastError() != ERROR_FILE_NOT_FOUND + ? "powershell.exe" + : "C:\\Windows\\System32\\WindowsPowershell\\v1.0\\powershell.exe"; + snprintf(newpath, 256, "%s -NoLogo -ExecutionPolicy RemoteSigned \"& \'%s\'\"", interpreter, path); return newpath; } else if (!strcmp(path + strlen(path) - 3, ".pl")) { diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 89c6e01..247a8db 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 6dbd461..861e75f 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 899773f..dab3ac6 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 872653f..75cc9d7 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 5b14680..40fd66d 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 8 months

windows agent: simplified some handle management using raii

by Sebastian Herbord

Module: check_mk Branch: master Commit: c4ae3d49b48b6ddedbe9566c0187019f779897e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4ae3d49b48b6d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Nov 2 15:35:51 2015 +0100 windows agent: simplified some handle management using raii --- agents/windows/Makefile | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 45 +++++++++++++------------------------- agents/windows/types.h | 32 +++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 32 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 67c21e1..b1e8af7 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -27,7 +27,7 @@ SHELL = /bin/bash VERSION = 1.2.7i4 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres -COPTIONS = -s -O2 -Wall -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO +COPTIONS = -s -O2 -Wall -Wformat=2 -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO # for debug builds # COPTIONS = -O0 -Wall -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -ggdb -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO MKDIR = mkdir -p diff --git a/agents/windows/build_version b/agents/windows/build_version index 60ac764..ff39c77 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -620 +622 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 0672b92..85d086e 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -258,6 +258,7 @@ void debug(char *text) #define debug(C) #endif + void verbose(const char *format, ...) { if (!verbose_mode) @@ -1284,8 +1285,8 @@ bool find_eventlogs(SOCKET &out) bool ExtractProcessOwner(HANDLE hProcess_i, string& csOwner_o) { // Get process token - HANDLE hProcessToken = NULL; - if (!OpenProcessToken(hProcess_i, TOKEN_READ, &hProcessToken) || !hProcessToken) + WinHandle hProcessToken; + if (!OpenProcessToken(hProcess_i, TOKEN_READ, hProcessToken.ptr()) || !hProcessToken) return false; // First get size needed, TokenUser indicates we want user information from given token @@ -1322,7 +1323,6 @@ bool ExtractProcessOwner(HANDLE hProcess_i, string& csOwner_o) WideCharToMultiByte(CP_UTF8, 0, (WCHAR*) &szUser, -1, info, sizeof(info), NULL, NULL); csOwner_o += info; - CloseHandle( hProcessToken ); delete [] pUserToken; return true; } @@ -1330,7 +1330,6 @@ bool ExtractProcessOwner(HANDLE hProcess_i, string& csOwner_o) delete [] pUserToken; } } - CloseHandle( hProcessToken ); return false; } @@ -1510,12 +1509,11 @@ void section_ps(SOCKET &out) { crash_log("<<<ps>>>"); output(out, "<<<ps:sep(9)>>>\n"); - HANDLE hProcessSnap; PROCESSENTRY32 pe32; process_entry_t process_perfdata = get_process_perfdata(); - hProcessSnap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + WinHandle hProcessSnap(CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0)); if (hProcessSnap != INVALID_HANDLE_VALUE) { pe32.dwSize = sizeof(PROCESSENTRY32); @@ -1526,7 +1524,7 @@ void section_ps(SOCKET &out) { string user = "unknown"; DWORD dwAccess = PROCESS_QUERY_INFORMATION | PROCESS_VM_READ; - HANDLE hProcess = OpenProcess(dwAccess, FALSE, pe32.th32ProcessID); + WinHandle hProcess(OpenProcess(dwAccess, FALSE, pe32.th32ProcessID)); if (NULL == hProcess) continue; @@ -1575,11 +1573,8 @@ void section_ps(SOCKET &out) usermodetime.QuadPart, kernelmodetime.QuadPart, processHandleCount, pe32.cntThreads, pe32.szExeFile); - - CloseHandle(hProcess); } while (Process32Next(hProcessSnap, &pe32)); } - CloseHandle(hProcessSnap); process_perfdata.clear(); // The process snapshot doesn't show the system idle process (used to determine the number of cpu cores) @@ -2320,8 +2315,8 @@ int launch_program(script_container* cont) SECURITY_DESCRIPTOR sd; // security information for pipes PROCESS_INFORMATION pi; - HANDLE script_stdout,read_stdout; // pipe handles - HANDLE script_stderr,read_stderr; + WinHandle script_stdout, read_stdout; // pipe handles + WinHandle script_stderr,read_stderr; // initialize security descriptor (Windows NT) if (IsWinNT()) @@ -2336,10 +2331,10 @@ int launch_program(script_container* cont) sa.nLength = sizeof(SECURITY_ATTRIBUTES); sa.bInheritHandle = true; // allow inheritable handles - if (!CreatePipe(&read_stdout,&script_stdout,&sa,0)) // create stdout pipe + if (!CreatePipe(read_stdout.ptr(),script_stdout.ptr(),&sa,0)) // create stdout pipe return 1; - if (!CreatePipe(&read_stderr,&script_stderr,&sa,0)) // create stderr pipe + if (!CreatePipe(read_stderr.ptr(),script_stderr.ptr(),&sa,0)) // create stderr pipe return 1; //set startupinfo for the spawned process @@ -2355,13 +2350,8 @@ int launch_program(script_container* cont) // spawn the child process if (!CreateProcess(NULL,cont->path,NULL,NULL,TRUE,CREATE_NEW_CONSOLE, - NULL,NULL,&si,&pi)) - { - CloseHandle(script_stdout); - CloseHandle(read_stdout); - - CloseHandle(script_stderr); - CloseHandle(read_stderr); + NULL,NULL,&si,&pi)) { + crash_log("failed to spawn process %s: %s", cont->path, get_win_error_as_string().c_str()); return 1; } @@ -2443,10 +2433,6 @@ int launch_program(script_container* cont) CloseHandle(cont->job_object); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - CloseHandle(script_stdout); - CloseHandle(read_stdout); - CloseHandle(script_stderr); - CloseHandle(read_stderr); return exit_code; } @@ -2573,10 +2559,10 @@ void output_external_programs(SOCKET &out, script_type type) cont->buffer_work[2] = '\n'; } - if (cont->max_age == 0) + if (cont->max_age == 0) { cont->buffer = cont->buffer_work; - else - { + } + else { // Determine chache_info text char cache_info[32]; snprintf(cache_info, sizeof(cache_info), ":cached(%d,%d)", (int)cont->buffer_time, cont->max_age); @@ -3271,8 +3257,7 @@ void output_crash_log(SOCKET &out) FILE *f = fopen(g_crash_log, "r"); char line[1024]; while (0 != fgets(line, sizeof(line), f)) { - output(out, "W "); - output(out, line); + output(out, "W %s", line); } ReleaseMutex(crashlogMutex); fclose(f); diff --git a/agents/windows/types.h b/agents/windows/types.h index 8a720ae..5249832 100644 --- a/agents/windows/types.h +++ b/agents/windows/types.h @@ -296,4 +296,36 @@ private: }; +// wrapper for windows handles that automatically closes the +// handle on leaving scope +class WinHandle { +public: + + WinHandle(HANDLE hdl = INVALID_HANDLE_VALUE) + : _handle(hdl) + {} + + ~WinHandle() { + if (_handle != INVALID_HANDLE_VALUE) { + ::CloseHandle(_handle); + } + } + + WinHandle &operator=(HANDLE hdl) { + if (_handle != INVALID_HANDLE_VALUE) { + ::CloseHandle(_handle); + } + _handle = hdl; + return *this; + } + + operator HANDLE() const { return _handle; } + + HANDLE *ptr() { return &_handle; } + +private: + HANDLE _handle; +}; + + #endif // types_h

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