Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

#2778 FIX Fixed correct scaling of sidebar on newer versions of Chrome browser

by Mathias Kettner

Module: check_mk Branch: master Commit: fff4b03b9b88871db08ca7cfad986b781ef39fe9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fff4b03b9b8887… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 27 10:41:43 2015 +0100 #2778 FIX Fixed correct scaling of sidebar on newer versions of Chrome browser --- .werks/2778 | 9 +++++++++ ChangeLog | 1 + web/htdocs/js/sidebar.js | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2778 b/.werks/2778 new file mode 100644 index 0000000..8c9cc7c --- /dev/null +++ b/.werks/2778 @@ -0,0 +1,9 @@ +Title: Fixed correct scaling of sidebar on newer versions of Chrome browser +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1448617270 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index cae7f8c..33cb10a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ * 2762 FIX: Fixed formating of check_http when using "clickable URL" option * 2772 FIX: Fixed possible exception in icon column when showing some actions in the column... * 2846 FIX: View refresh could reset checkboxes on views where "always show checkboxes" is enabled + * 2778 FIX: Fixed correct scaling of sidebar on newer versions of Chrome browser WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 2d64cf3..c17ec7a 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -408,7 +408,10 @@ function setSidebarHeight() { if (isWebkit()) { var oldcols = parent.document.body.cols.split(","); var oldwidth = parseInt(oldcols[0]); - var width = oHeader.clientWidth; + var width = parent.frames[0].pageWidth(); + // Note: previously this was "var width = oHeader.clientWidth;" and worked + // fine. It stopped working - probably with new Chrome versions. We do not + // know yet if the new way also works on old Chrome versions. var target_width = parseInt(oldwidth * 280.0 / width); var newcols = target_width.toString() + ",*"; parent.document.body.cols = newcols;

8 years, 7 months

#2803 netapp_api_volumes: clustered volumes now longer show the current node name in the service description

by Andreas Boesl

Module: check_mk Branch: master Commit: fa8a2b19401f49c23c2bda1421829a5aa44e9a8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa8a2b19401f49… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 26 15:51:03 2015 +0100 #2803 netapp_api_volumes: clustered volumes now longer show the current node name in the service description Previously, the volume checks went UNKNOWN on a cluster failover. The service description for clustered volumes has changed from "{node}.{volume_name}" to "{volume_name}". --- .werks/2803 | 10 ++++++++++ ChangeLog | 2 ++ agents/special/agent_netapp | 4 +++- checks/netapp_api_volumes | 9 +++++++-- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.werks/2803 b/.werks/2803 new file mode 100644 index 0000000..86d6bda --- /dev/null +++ b/.werks/2803 @@ -0,0 +1,10 @@ +Title: netapp_api_volumes: clustered volumes now longer show the current node name in the service description +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i4 +Date: 1448549213 +Class: feature + +Previously, the volume checks went UNKNOWN on a cluster failover. +The service description for clustered volumes has changed from "{node}.{volume_name}" to "{volume_name}". diff --git a/ChangeLog b/ChangeLog index 7701a7b..cae7f8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,8 @@ * 2840 barracuda_mail_latency, barracuda_mailqueues, barracuda_system_cpu_util: new checks for Barracuda SPAM Firewall Appliance... * 2865 fortigate_memory_base: added check for fortigate firewall memory usage... * 2841 emcvnx_writecache: the check monitors the write cache state of the storage processors of an EMC VNX Storage System + * 2803 netapp_api_volumes: clustered volumes now longer show the current node name in the service description... + NOTE: Please refer to the migration notes! * 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/special/agent_netapp b/agents/special/agent_netapp index fc2b14a..01f74ca 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -79,7 +79,7 @@ OPTIONS: user = None secret = None -opt_timeout = 60 +opt_timeout = 120 opt_debug = False opt_dump_xml = False opt_no_counters = [] @@ -519,12 +519,14 @@ if netapp_mode == "clustermode": "volume-state-attributes.state", "volume-id-attributes.name", "volume-id-attributes.node", + "volume-id-attributes.msid", "volume-inode-attributes.files-total", "volume-inode-attributes.files-used" ], config_rename = { "volume-space-attributes.size-available": "size-available", "volume-space-attributes.size-total" : "size-total", "volume-state-attributes.state" : "state", "volume-id-attributes.name" : "name", + "volume-id-attributes.msid" : "msid", "volume-id-attributes.node" : "node", "volume-inode-attributes.files-total" : "files-total", "volume-inode-attributes.files-used" : "files-used" }, diff --git a/checks/netapp_api_volumes b/checks/netapp_api_volumes index 6d88c59..6cb088c 100644 --- a/checks/netapp_api_volumes +++ b/checks/netapp_api_volumes @@ -36,9 +36,14 @@ def parse_netapp_api_volumes(info): tokens = element.split(" ", 1) volume[tokens[0]] = tokens[1] - # In clustermode the name is composed out of node.name + # Clustermode specific if "node" in volume: - name = "%s.%s" % (volume["node"], volume["name"]) + # There are cluster volumes and volumes which only exist on the node. + if "msid" not in volume: + name = "%s.%s" % (volume["node"], volume["name"]) + else: + name = volume["name"] + volumes[name] = volume return volumes

8 years, 7 months

ucd_processes: Changed way to detect an error

by Bastian Kuhn

Module: check_mk Branch: master Commit: 03899e457dd615254bbae69d880f5afcba686ce1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03899e457dd615… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 26 14:52:59 2015 +0100 ucd_processes: Changed way to detect an error --- checks/ucd_processes | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/checks/ucd_processes b/checks/ucd_processes index f77c878..3c0e782 100644 --- a/checks/ucd_processes +++ b/checks/ucd_processes @@ -40,6 +40,10 @@ # .1.3.6.1.4.1.2021.2.1.5.2 1 --> UCD-SNMP-MIB::prCount.2 # .1.3.6.1.4.1.2021.2.1.5.3 1 --> UCD-SNMP-MIB::prCount.3 # .1.3.6.1.4.1.2021.2.1.5.4 1 --> UCD-SNMP-MIB::prCount.4 +# .1.3.6.1.4.1.2021.2.1.100.1 0 --> UCD-SNMP-MIB::prErrFlag.1 +# .1.3.6.1.4.1.2021.2.1.100.2 0 --> UCD-SNMP-MIB::prErrFlag.2 +# .1.3.6.1.4.1.2021.2.1.100.3 0 --> UCD-SNMP-MIB::prErrFlag.3 +# .1.3.6.1.4.1.2021.2.1.100.4 0 --> UCD-SNMP-MIB::prErrFlag.4 # .1.3.6.1.4.1.2021.2.1.101.1 --> UCD-SNMP-MIB::prErrMessage.1 # .1.3.6.1.4.1.2021.2.1.101.2 --> UCD-SNMP-MIB::prErrMessage.2 # .1.3.6.1.4.1.2021.2.1.101.3 --> UCD-SNMP-MIB::prErrMessage.3 @@ -51,11 +55,11 @@ def inventory_ucd_processes(info): def check_ucd_processes(item, _no_params, info): - for pr_name, pr_min_str, pr_max_str, pr_count_str, pr_err_msg in info: + for pr_name, pr_min_str, pr_max_str, pr_count_str, pr_err_flag, pr_err_msg in info: if pr_name.replace("-Processes", "") == item: state = 0 infotext = "Total: %s" % pr_count_str - if int(pr_min_str) <= int(pr_count_str) <= int(pr_max_str): + if int(pr_err_flag) == 0: state = 0 else: state = 2 @@ -76,6 +80,7 @@ check_info['ucd_processes'] = { "3", # prMin "4", # prMax "5", # prCount + "100", # prErrFlag "101", # prErrMessage ]), 'snmp_scan_function' : ucd_scan_function,

8 years, 7 months

new check emcvnx_writecache

by Simon Betz

Module: check_mk Branch: master Commit: dfc1bc39d772060ace4e165a5aa352d1b1516cd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfc1bc39d77206… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 26 13:03:06 2015 +0100 new check emcvnx_writecache --- checkman/emcvnx_writecache | 20 +++++++++++++++++ checks/emcvnx_writecache | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/checkman/emcvnx_writecache b/checkman/emcvnx_writecache new file mode 100644 index 0000000..95f5ff7 --- /dev/null +++ b/checkman/emcvnx_writecache @@ -0,0 +1,20 @@ +title: EMC VNX Storage: Write Cache State +agents: emc +catalog: hw/storagehw/emc +license: GPL +distribution: check_mk +description: + This check monitors the write cache state of storage processors of an + EMC VNX storage system. + + The information is retrieved by the special agent agent_emcvnx which uses + EMC's command line tool naviseccli. + + The state is OK, if the write cache state of a storage processor is enabled, + otherwise it will be CRIT. + +item: + The storage processor identifier. + +inventory: + One service per storage processor is created. diff --git a/checks/emcvnx_writecache b/checks/emcvnx_writecache new file mode 100644 index 0000000..99e2b8f --- /dev/null +++ b/checks/emcvnx_writecache @@ -0,0 +1,51 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 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. + +# <<<emcvnx_writecache>>> +# SPA Write Cache State Enabled +# SPB Write Cache State Enabled + + +def inventory_emcvnx_writecache(info): + return [ (line[0], None) for line in info ] + + +def check_emcvnx_writecache(item, params, info): + map_state = { + "Enabled" : (0, "enabled"), + "Disabled" : (2, "disabled"), + } + for line in info: + if line[0] == item: + state, state_readable = map_state.get(line[-1], (3, "unknown")) + return state, "State: %s" % state_readable + + +check_info['emcvnx_writecache'] = { + 'inventory_function' : inventory_emcvnx_writecache, + 'check_function' : check_emcvnx_writecache, + 'service_description' : 'Write Cache State %s', +}

8 years, 7 months

#2841 emcvnx_writecache: the check monitors the write cache state of the storage processors of an EMC VNX Storage System

by Simon Betz

Module: check_mk Branch: master Commit: 2d4c8fa4393f37c4a834ae6cbfe2d6aebf126653 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d4c8fa4393f37… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 26 13:02:42 2015 +0100 #2841 emcvnx_writecache: the check monitors the write cache state of the storage processors of an EMC VNX Storage System --- .werks/2841 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_emcvnx | 1 + web/plugins/wato/datasource_programs.py | 1 + 4 files changed, 12 insertions(+) diff --git a/.werks/2841 b/.werks/2841 new file mode 100644 index 0000000..1601cb4 --- /dev/null +++ b/.werks/2841 @@ -0,0 +1,9 @@ +Title: emcvnx_writecache: the check monitors the write cache state of the storage processors of an EMC VNX Storage System +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1448539266 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 993396e..7701a7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ * 2839 raritan_px_sensors, raritan_px_sensors.binary, raritan_px_sensors.humidity: monitors the temperature, contact and humidity of Raritan PX Devices * 2840 barracuda_mail_latency, barracuda_mailqueues, barracuda_system_cpu_util: new checks for Barracuda SPAM Firewall Appliance... * 2865 fortigate_memory_base: added check for fortigate firewall memory usage... + * 2841 emcvnx_writecache: the check monitors the write cache state of the storage processors of an EMC VNX Storage System * 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/special/agent_emcvnx b/agents/special/agent_emcvnx index c077417..c652be8 100755 --- a/agents/special/agent_emcvnx +++ b/agents/special/agent_emcvnx @@ -109,6 +109,7 @@ naviseccli_options = { "raidgroups" : {"cmd_option" : "getall -rg", "active" : False, "sep" : None}, # "agent-info" : {"cmd_option" : "-sp", "active" : False, "sep" : None}, "sp_util" : {"cmd_option" : "getcontrol -cbt", "active" : False, "sep" : 58}, + "writecache" : {"cmd_option" : "getcache -wst", "active" : False, "sep" : None}, } for o,a in opts: diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index f9d3756..7d53096 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -318,6 +318,7 @@ register_rule(group, ( "raidgroups", _("RAID Groups") ), ( "agent", _("Model and Revsion") ), ( "sp_util", _("Storage Processor Utilization") ), + ( "writecache", _("Write Cache State") ), ], default_value = [ "disks", "hba", "hwstatus", ], allow_empty = False,

8 years, 7 months

cleaned up fortigate_memory_base a bit

by Sebastian Herbord

Module: check_mk Branch: master Commit: 7c350426efb2fd9d693f2116420e943e39e2802d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c350426efb2fd… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Nov 26 10:26:36 2015 +0100 cleaned up fortigate_memory_base a bit --- checks/fortigate_memory_base | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/checks/fortigate_memory_base b/checks/fortigate_memory_base index 77e0a95..894be44 100644 --- a/checks/fortigate_memory_base +++ b/checks/fortigate_memory_base @@ -24,33 +24,37 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -fortigate_memory_base_default_levels = (70, 80) + +fortigate_memory_base_default_levels = (70, 80) # taken from fortigate_memory + def inventory_fortigate_memory_base(info): if info: return [(None, "fortigate_memory_base_default_levels")] + def check_fortigate_memory_base(item, params, info): if type(params) == dict: + # accept values from "memory" wato rule params = params["levels"] warn, crit = map(abs, params) percent = int(info[0][0]) - state = 0 - icon = '' - if percent >= warn: - state = 1 - icon = "(!)" + if percent >= crit: state = 2 - icon = "(!!)" + elif percent >= warn: + state = 1 + else: + state = 0 - capacity = int(info[0][1]) * 1024 + capacity = int(info[0][1]) * 1024 # value from device is in kb, we need bytes used = (percent * capacity) / 100 perf = [("mem_used", used, (warn * capacity) / 100, (crit * capacity) / 100, 0, capacity)] - return state, "%d%%%s (warn/crit at %d%%/%d%%)" % (percent, icon, warn, crit), perf + return state, "%d%% (warn/crit at %d%%/%d%%)" % (percent, warn, crit), perf + check_info["fortigate_memory_base"] = { "check_function" : check_fortigate_memory_base,

8 years, 7 months

#2865 fortigate_memory_base: added check for fortigate firewall memory usage

by Sebastian Herbord

Module: check_mk Branch: master Commit: 32fe024949b2627519ab45600a006f1bb0bd4c7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32fe024949b262… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Nov 26 08:43:40 2015 +0100 #2865 fortigate_memory_base: added check for fortigate firewall memory usage The fortigate_memory check uses data provided by a more "generic" fortinet mib, this one uses the fortigate mib. Apparently a device provides only one of the two mibs so there shouldn't be a collision. --- .werks/2865 | 11 +++++++ ChangeLog | 1 + checkman/fortigate_memory_base | 20 +++++++++++++ checks/fortigate_memory_base | 65 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+) diff --git a/.werks/2865 b/.werks/2865 new file mode 100644 index 0000000..00f4144 --- /dev/null +++ b/.werks/2865 @@ -0,0 +1,11 @@ +Title: fortigate_memory_base: added check for fortigate firewall memory usage +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1448523674 +Class: feature + +The fortigate_memory check uses data provided by a more "generic" fortinet mib, this one uses the +fortigate mib. Apparently a device provides only one of the two mibs so there shouldn't be a +collision. diff --git a/ChangeLog b/ChangeLog index 1b8143f..993396e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * 2838 raritan_px_outlets: monitors the voltage, current, power, apparent power and energy of Raritan PX Devices * 2839 raritan_px_sensors, raritan_px_sensors.binary, raritan_px_sensors.humidity: monitors the temperature, contact and humidity of Raritan PX Devices * 2840 barracuda_mail_latency, barracuda_mailqueues, barracuda_system_cpu_util: new checks for Barracuda SPAM Firewall Appliance... + * 2865 fortigate_memory_base: added check for fortigate firewall memory usage... * 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/checkman/fortigate_memory_base b/checkman/fortigate_memory_base new file mode 100644 index 0000000..b5cd642 --- /dev/null +++ b/checkman/fortigate_memory_base @@ -0,0 +1,20 @@ +title: FortiGate firewalls: RAM Usage +agents: snmp +catalog: hw/network/fortinet +license: GPL +distribution: check_mk +description: + This check monitors the used memory on fortigate firewalls + which support the FORTINET-FORTIGATE-MIB. +inventory: + One service will be created + +[parameters] +warning (int): Minimum memory usage in percent for warning level +crit (int): Minimum memory usage in percent for critical level + +[configuration] +fortigate_memory_base_default_levels = (int, int): The default levels for all checks of this kind. + +perfdata: + current memory usage diff --git a/checks/fortigate_memory_base b/checks/fortigate_memory_base new file mode 100644 index 0000000..77e0a95 --- /dev/null +++ b/checks/fortigate_memory_base @@ -0,0 +1,65 @@ +#!/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. + +fortigate_memory_base_default_levels = (70, 80) + +def inventory_fortigate_memory_base(info): + if info: + return [(None, "fortigate_memory_base_default_levels")] + +def check_fortigate_memory_base(item, params, info): + if type(params) == dict: + params = params["levels"] + + warn, crit = map(abs, params) + + percent = int(info[0][0]) + state = 0 + icon = '' + if percent >= warn: + state = 1 + icon = "(!)" + if percent >= crit: + state = 2 + icon = "(!!)" + + capacity = int(info[0][1]) * 1024 + used = (percent * capacity) / 100 + + perf = [("mem_used", used, (warn * capacity) / 100, (crit * capacity) / 100, 0, capacity)] + return state, "%d%%%s (warn/crit at %d%%/%d%%)" % (percent, icon, warn, crit), perf + +check_info["fortigate_memory_base"] = { + "check_function" : check_fortigate_memory_base, + "inventory_function" : inventory_fortigate_memory_base, + "service_description" : "Memory usage", + "has_perfdata" : True, + "group" : "memory", + "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0"), + "snmp_info" : ( ".1.3.6.1.4.1.12356.101.4.1", [4, # fgSysMemUsage + 5]), # fgSysMemCapacity +} +

8 years, 7 months

check_mk.agent_update: never go crit, only warn

by Mathias Kettner

Module: check_mk Branch: master Commit: ff9f73426e65505129649f2e0254a3173cf8aa13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff9f73426e6550… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 25 17:17:40 2015 +0100 check_mk.agent_update: never go crit, only warn --- checks/check_mk | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/checks/check_mk b/checks/check_mk index 42de18d..04664ee 100644 --- a/checks/check_mk +++ b/checks/check_mk @@ -147,22 +147,21 @@ def check_cmk_agent_update(_no_item, _no_params, info): now = time.time() if parsed["error"] != "None": - yield 2, "error: %s" % parsed["error"] + yield 1, "error: %s" % parsed["error"] else: yield 0, "no errors" try: last_check = float(parsed["last_check"]) age = now - last_check - warn, crit = (3600 * 24, 2 * 3600 * 24) - if age > crit: - state = 2 - elif age > warn: + # Currently there is no crit level + warn = 2 * 3600 * 24 + if age > warn: state = 1 else: state = 0 if state: - levels_text = " (warn/crit at %s/%s)" % (get_age_human_readable(warn), get_age_human_readable(crit)) + levels_text = " (warn at %s)" % (get_age_human_readable(warn)) else: levels_text = "" yield state, "last update check: " + get_timestamp_human_readable(parsed["last_check"]) + levels_text

8 years, 7 months

New function for logging in a virtual super user

by Mathias Kettner

Module: check_mk Branch: master Commit: 816dfab3acb841a3f3c2c564ba667538efbeb7f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=816dfab3acb841… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 25 17:02:36 2015 +0100 New function for logging in a virtual super user This is needed for pages without authentication that do Livestatus queries --- web/htdocs/config.py | 28 ++++++++++++++++++++++++++++ web/htdocs/livestatus.py | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 0ed491c..3a399d1 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -276,6 +276,34 @@ def login(u): # load current on/off-switching states of sites read_site_config() +# Login a user that has all permissions. This is needed for making +# Livestatus queries from unauthentiated page handlers +def login_super_user(): + global user_id + user_id = None + + global user_role_ids + user_role_ids = [] + + global user_baserole_ids + user_baserole_ids = [ "admin" ] + + global user_baserole_id + user_baserole_id = "admin" + + # Prepare user object + global user, user_alias + user = { "roles" : "admin" } + user_alias = "Superuser for unauthenticated pages" + + # Prepare cache of already computed permissions + global user_permissions + user_permissions = {} + + # All sites are enabled + global user_siteconf + user_siteconf = {} + def set_user_confdir(user_id): global user_confdir user_confdir = config_dir + "/" + user_id.encode("utf-8") diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index fb6865c..e5c75ae 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -386,7 +386,7 @@ class SingleSiteConnection(BaseConnection, Helpers): def set_auth_user(self, domain, user): if user: self.auth_users[domain] = user - else: + elif domain in self.auth_users: del self.auth_users[domain] # Switch future request to new authorization domain

8 years, 7 months

fixed a bug introduced in 2f0d9872ab8232ab6e0c1a92a6a2c7f2cfe961ec, causing missing memory info in ps section

by Sebastian Herbord

Module: check_mk Branch: master Commit: 99652b77cd35ad18f6773c6812f39774653dba5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99652b77cd35ad… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Nov 25 16:58:00 2015 +0100 fixed a bug introduced in 2f0d9872ab8232ab6e0c1a92a6a2c7f2cfe961ec, causing missing memory info in ps section --- agents/windows/Makefile | 3 ++- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 5881061 -> 5939364 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 5881061 -> 5939364 bytes agents/windows/check_mk_agent.cc | 8 ++++++-- agents/windows/check_mk_agent.exe | Bin 4657243 -> 4700679 bytes agents/windows/check_mk_agent.msi | Bin 10869248 -> 10972160 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 4657243 -> 4700679 bytes agents/windows/install_agent-64.exe | Bin 1390774 -> 1401623 bytes agents/windows/install_agent.exe | Bin 1265926 -> 1272825 bytes agents/windows/wmitest.exe | Bin 1448856 -> 0 bytes 11 files changed, 9 insertions(+), 4 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 51d40ca..c46113a 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -124,6 +124,7 @@ check_mk_agent-64.exe.versioned: %.exe: %.unversioned.exe %.exe.versioned + true # ----------------------------------------------------------------------------- # NSIS installer will be removed and replaced by multiarch MSI installer @@ -156,7 +157,7 @@ nowin.exe: nowin.cc $(CXX) -o $@ $< clean: - rm -f *.o *~ svn-*.tmp *.rc *.res obj/*.o obj64/*.o + rm -f *.o *.exe *~ svn-*.tmp *.rc *.res obj/*.o obj64/*.o make -C msibuild clean mrproper: clean diff --git a/agents/windows/build_version b/agents/windows/build_version index a5b667a..2da17b6 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -675 +677 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d8eb90d..22226f9 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 d707d11..cbeff7b 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 14401a2..1047595 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1120,7 +1120,7 @@ bool ExtractProcessOwner(HANDLE hProcess_i, string& csOwner_o) process_entry_t get_process_perfdata() { - map<ULONGLONG, process_entry> process_info; + process_entry_t process_info; PerfCounterObject counterObject(230); // process base number @@ -1132,7 +1132,7 @@ process_entry_t get_process_perfdata() std::vector<process_entry> entries(instances.size()); // one instance = one process - // output counters + // gather counters for (const PerfCounter &counter : counterObject.counters()) { std::vector<ULONGLONG> values = counter.values(instances); for (std::size_t i = 0; i < values.size(); ++i) { @@ -1148,6 +1148,10 @@ process_entry_t get_process_perfdata() } } } + + for (const process_entry &entry : entries) { + process_info[entry.process_id] = entry; + } } return process_info; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 5edcf77..02df19d 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 b835efd..e8ce49b 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 9ca668c..65aa652 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 4cead7c..488dc08 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 9baa705..1ed96ae 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/wmitest.exe b/agents/windows/wmitest.exe deleted file mode 100755 index ce6fc2b..0000000 Binary files a/agents/windows/wmitest.exe and /dev/null differ

8 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015