Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: #2033 FIX check_mk-zfs_arc_cache: add Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: 66a27660bb34af15c9f52916d89cc656f9b8f6f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66a27660bb34af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 21 10:09:37 2015 +0100 #2033 FIX check_mk-zfs_arc_cache: add Perf-O-Meter --- .werks/2033 | 9 +++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 11 ++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/2033 b/.werks/2033 new file mode 100644 index 0000000..4374816 --- /dev/null +++ b/.werks/2033 @@ -0,0 +1,9 @@ +Title: check_mk-zfs_arc_cache: add Perf-O-Meter +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1424509764 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 53c2b89..31432c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -182,6 +182,7 @@ NOTE: Please refer to the migration notes! * 2032 FIX: brocade.temp: use new generic WATO rule, add Perf-O-Meter... NOTE: Please refer to the migration notes! + * 2033 FIX: check_mk-zfs_arc_cache: add Perf-O-Meter Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 8c8abbc..749fe85 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -148,6 +148,12 @@ metric_info["pl"] = { "color" : "#ffc030", } +metric_info["hit_ratio"] = { + "title" : _("Cache Hit Ratio"), + "unit" : "ratio", + "color" : "#60c0c0", +} + metric_info["mem_used"] = { "title" : _("Used RAM"), "unit" : "bytes", @@ -397,7 +403,7 @@ check_metrics["check_mk-apc_inrow_temperature"] = {} check_metrics["check_mk-apc_symmetra_temp"] = {} check_metrics["check_mk-arris_cmts_temp"] = {} check_metrics["check_mk-bintec_sensors.temp"] = {} -check_metrics["check_mk-brocade.temp"] = {} +check_metrics["check_mk-brocade.temp"] = {} check_metrics["check_mk-brocade_mlx_temp"] = {} check_metrics["check_mk-carel_sensors"] = {} check_metrics["check_mk-casa_cpu_temp"] = {} @@ -473,6 +479,8 @@ check_metrics["check_mk-ups_socomec_outphase"] = {} check_metrics["check_mk-bluecoat_sensors"] = {} +check_metrics["check_mk-zfs_arc_cache"] = { "hit_ratio" : { "scale" : 0.01 }} + #. # .--Perf-O-Meters-------------------------------------------------------. # | ____ __ ___ __ __ _ | @@ -525,6 +533,7 @@ perfometer_info.append(("stacked", [ ( "logarithmic", ( "requests_per_second", 10, 5)), ( "logarithmic", ( "busy_workers", 10, 2))])) +perfometer_info.append(("linear", ( [ "hit_ratio" ], 1.0, None))) #. # .--Graphs--------------------------------------------------------------.

9 years, 4 months

Check_MK Git: check_mk: #2032 FIX brocade.temp: use new generic WATO rule, add Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: 17c09ff0afb1f9f4e6342c466ae816e89b9159f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17c09ff0afb1f9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 21 10:03:35 2015 +0100 #2032 FIX brocade.temp: use new generic WATO rule, add Perf-O-Meter The service description of this check has changed. Also you need to rediscover this check in order to make use of the new generic WATO rule for temperatures. --- .werks/2032 | 11 +++++++++++ ChangeLog | 2 ++ checks/brocade | 23 +++++++++++++---------- web/plugins/metrics/check_mk.py | 1 + 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.werks/2032 b/.werks/2032 new file mode 100644 index 0000000..041b6de --- /dev/null +++ b/.werks/2032 @@ -0,0 +1,11 @@ +Title: brocade.temp: use new generic WATO rule, add Perf-O-Meter +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1424509362 +Class: fix + +The service description of this check has changed. Also you need to +rediscover this check in order to make use of the new generic WATO rule +for temperatures. diff --git a/ChangeLog b/ChangeLog index 321e09a..53c2b89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -180,6 +180,8 @@ NOTE: Please refer to the migration notes! * 2031 FIX: brocade_mlx_temp: make configurable via new WATO rule, add Perf-O-Meter, add default levels... NOTE: Please refer to the migration notes! + * 2032 FIX: brocade.temp: use new generic WATO rule, add Perf-O-Meter... + NOTE: Please refer to the migration notes! Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/brocade b/checks/brocade index b68b729..2cba239 100644 --- a/checks/brocade +++ b/checks/brocade @@ -88,7 +88,7 @@ def check_brocade_power(item, _no_params, info): converted = brocade_sensor_convert(info, "Power") for snmp_item, name, value in converted: if item == snmp_item: - value = saveint(value) + value = int(value) if value != 1: return 2, "Error on supply %s" % name return 0, "No problems found" @@ -104,7 +104,9 @@ check_info["brocade.power"] = { 'snmp_scan_function' : brocade_scan, } -brocade_temp_default_levels = ( 30, 40 ) +factory_settings["brocade_temp_default_levels"] = { + "levels" : ( 35, 40 ) +} def inventory_brocade_temp(info): converted = brocade_sensor_convert(info, "SLOT") @@ -118,12 +120,13 @@ def check_brocade_temp(item, params, info): check_info["brocade.temp"] = { - "check_function" : check_brocade_temp, - "inventory_function" : inventory_brocade_temp, - "service_description" : "Temperature %s", - "has_perfdata" : True, - "group" : "hw_temperature", - "snmp_info" : brocade_info, - 'snmp_scan_function' : brocade_scan, - "includes" : [ "temperature.include" ], + "check_function" : check_brocade_temp, + "inventory_function" : inventory_brocade_temp, + "service_description" : "Temperature Ambient %s", + "has_perfdata" : True, + "group" : "temperature", + "snmp_info" : brocade_info, + 'snmp_scan_function' : brocade_scan, + "default_levels_variable" : "brocade_temp_default_levels", + "includes" : [ "temperature.include" ], } diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 2f63e61..8c8abbc 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -397,6 +397,7 @@ check_metrics["check_mk-apc_inrow_temperature"] = {} check_metrics["check_mk-apc_symmetra_temp"] = {} check_metrics["check_mk-arris_cmts_temp"] = {} check_metrics["check_mk-bintec_sensors.temp"] = {} +check_metrics["check_mk-brocade.temp"] = {} check_metrics["check_mk-brocade_mlx_temp"] = {} check_metrics["check_mk-carel_sensors"] = {} check_metrics["check_mk-casa_cpu_temp"] = {}

9 years, 4 months

Check_MK Git: check_mk: netapp_api_temp: updated man page

by Mathias Kettner

Module: check_mk Branch: master Commit: 58eac179e0d4ea933ee0ebca0bc1de93af14d380 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58eac179e0d4ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 21 09:30:03 2015 +0100 netapp_api_temp: updated man page --- checkman/netapp_api_temp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/checkman/netapp_api_temp b/checkman/netapp_api_temp index 4dfd541..e2ee236 100644 --- a/checkman/netapp_api_temp +++ b/checkman/netapp_api_temp @@ -11,10 +11,11 @@ description: and the temperature sensors also belong to the filer. The checks reports {WARN}/{CRIT} when the configured levels reported by the NetApp filer, - (e.g. {temp-sensor-hi-critical}) have been breached. + (e.g. {temp-sensor-hi-critical}) have been breached. You also can override the levels + with the WATO rule set for tempereatures. inventory: - Two checks are created for a filer. {Temperature Shelfes Internal} and {Temperature Shelfs Ambient} + Two checks are created for a filer. {Temperature Internal Shelfes} and {Temperature Ambient Shelfs} perfdata: - The average temperature of all sensors combined. + The maximum temperature of all the sensors of the type in question.

9 years, 4 months

Check_MK Git: check_mk: Fixed ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: 0a925042645013338f163d2bcbaae8e7c5ae7f8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a925042645013… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 21 09:28:08 2015 +0100 Fixed ChangeLog ---

9 years, 4 months

Check_MK Git: check_mk: #2030 FIX netapp_api_temp: add Perf-O-Meter, make configurable via WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: e00340027776a63e1b000ee7ff3e10816a02a525 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e00340027776a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 21 08:56:24 2015 +0100 #2030 FIX netapp_api_temp: add Perf-O-Meter, make configurable via WATO Note: In order to make this check consistent with the other temperature checks the service name and the name of the performance variable had to be renamed. This means that you need to redo service discovery and that the RRD will be created new. --- .werks/2030 | 12 ++++++ ChangeLog | 2 + checks/brocade_mlx_temp | 72 ++++++++++------------------------ checks/netapp_api_temp | 60 +++++++++++++--------------- web/plugins/metrics/check_mk.py | 21 +++++++++- web/plugins/wato/check_parameters.py | 3 +- 6 files changed, 83 insertions(+), 87 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e003400277…

9 years, 4 months

Check_MK Git: check_mk: #2031 FIX brocade_mlx_temp: make configurable via new WATO rule, add Perf-O-Meter, add default levels

by Mathias Kettner

Module: check_mk Branch: master Commit: d1797f0e2f526c3d6c0802bfb08efacd22bedb21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1797f0e2f526c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 21 09:27:22 2015 +0100 #2031 FIX brocade_mlx_temp: make configurable via new WATO rule, add Perf-O-Meter, add default levels This check has been converted to be consistent with all other temperature checks. Please redo the service discovery. --- .werks/2031 | 10 ++++++++++ ChangeLog | 2 ++ checks/brocade_mlx_temp | 25 ++++++++++++++----------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/.werks/2031 b/.werks/2031 new file mode 100644 index 0000000..f34d729 --- /dev/null +++ b/.werks/2031 @@ -0,0 +1,10 @@ +Title: brocade_mlx_temp: make configurable via new WATO rule, add Perf-O-Meter, add default levels +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1424507184 +Class: fix + +This check has been converted to be consistent with all other temperature checks. Please redo +the service discovery. diff --git a/ChangeLog b/ChangeLog index 286b2e4..5ee6e7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -177,6 +177,8 @@ * 2028 FIX: hyperv_vms: new plugin that allows spaces in VM names... * 2030 FIX: netapp_api_temp: add Perf-O-Meter, make configurable via WATO... NOTE: Please refer to the migration notes! + * 2031 FIX: brocade_mlx_temp: make configurable via new WATO rule, add Perf-O-Meter, add default levels... + NOTE: Please refer to the migration notes! Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/brocade_mlx_temp b/checks/brocade_mlx_temp index f6792e5..32d6fb8 100644 --- a/checks/brocade_mlx_temp +++ b/checks/brocade_mlx_temp @@ -24,8 +24,9 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -brocade_mlx_temperature_default_levels = (105, 110) - +factory_settings["brocade_mlx_temperature_default_levels"] = { + "levels" : (105, 110) +} def parse_brocade_mlx_temp(info): parsed = {} @@ -42,7 +43,7 @@ def parse_brocade_mlx_temp(info): def inventory_brocade_mlx_temp(parsed): for item in parsed: - yield item, "brocade_mlx_temperature_default_levels" + yield item, {} def check_brocade_mlx_temp(item, params, parsed): @@ -51,12 +52,14 @@ def check_brocade_mlx_temp(item, params, parsed): check_info["brocade_mlx_temp"] = { - "parse_function" : parse_brocade_mlx_temp, - "check_function" : check_brocade_mlx_temp, - "inventory_function" : inventory_brocade_mlx_temp, - "service_description" : "Temperature %s", - "snmp_info" : ('.1.3.6.1.4.1.1991.1.1.2.13.1.1', [ 3, 4 ]), # descr, temperature - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1991.1."), - "has_perfdata" : True, - "group" : "hw_temperature", + "parse_function" : parse_brocade_mlx_temp, + "check_function" : check_brocade_mlx_temp, + "inventory_function" : inventory_brocade_mlx_temp, + "service_description" : "Temperature %s", + "snmp_info" : ('.1.3.6.1.4.1.1991.1.1.2.13.1.1', [ 3, 4 ]), # descr, temperature + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1991.1."), + "has_perfdata" : True, + "default_levels_variable" : "brocade_mlx_temperature_default_levels", + "group" : "temperature", + "includes" : [ "temperature.include" ], }

9 years, 4 months

Check_MK Git: check_mk: simplified ibm_svc_mdisk check

by Andreas Boesl

Module: check_mk Branch: master Commit: eb92c7d34a2f981c9d41fa83fea1f0aa0eea895d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb92c7d34a2f98… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 20 17:07:17 2015 +0100 simplified ibm_svc_mdisk check --- checks/ibm_svc_mdisk | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/checks/ibm_svc_mdisk b/checks/ibm_svc_mdisk index e3b2da7..4f2cc73 100644 --- a/checks/ibm_svc_mdisk +++ b/checks/ibm_svc_mdisk @@ -59,35 +59,9 @@ def check_ibm_svc_mdisk(item, params, info): mdisk_status = line[2] mdisk_mode = line[3] - if mdisk_status == "online": - if 'online_state' in params: - yield params['online_state'], "Status: %s" % mdisk_status - elif mdisk_status == "degraded": - if 'degraded_state' in params: - yield params['degraded_state'], "Status: %s" % mdisk_status - elif mdisk_status == "offline": - if 'offline_state' in params: - yield params['offline_state'], "Status: %s" % mdisk_status - elif mdisk_status == "excluded": - if 'excluded_state' in params: - yield params['excluded_state'], "Status: %s" % mdisk_status - else: - yield 1, "Status: %s" % mdisk_status + yield params.get("%s_state" % mdisk_status, 1), "Status: %s" % mdisk_status + yield params.get("%s_mode" % mdisk_mode, 1), "Mode: %s" % mdisk_status - if mdisk_mode == "managed": - if 'managed_mode' in params: - yield params['managed_mode'], "Mode: %s" % mdisk_mode - elif mdisk_mode == "array": - if 'array_mode' in params: - yield params['array_mode'], "Mode: %s" % mdisk_mode - elif mdisk_mode == "image": - if 'image_mode' in params: - yield params['image_mode'], "Mode: %s" % mdisk_mode - elif mdisk_mode == "unmanaged": - if 'unmanaged_mode' in params: - yield params['unmanaged_mode'], "Mode: %s" % mdisk_mode - else: - yield 1, "Mode: %s" % mdisk_mode check_info["ibm_svc_mdisk"] = { "check_function" : check_ibm_svc_mdisk,

9 years, 4 months

Check_MK Git: check_mk: #2013 FIX stulz_pump: Fixed exception during checking for some devices

by Lars Michelsen

Module: check_mk Branch: master Commit: 86dff54911642973202e61a2abb9002a4dc2d3e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86dff549116429… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 20 15:50:11 2015 +0100 #2013 FIX stulz_pump: Fixed exception during checking for some devices --- .werks/2013 | 10 ++++++++++ ChangeLog | 1 + checks/stulz_pump | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/2013 b/.werks/2013 new file mode 100644 index 0000000..5506d9f --- /dev/null +++ b/.werks/2013 @@ -0,0 +1,10 @@ +Title: stulz_pump: Fixed exception during checking for some devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424443762 + + diff --git a/ChangeLog b/ChangeLog index 79b3e3d..8bb201f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -175,6 +175,7 @@ * 2006 FIX: services: Add WATO rule for configuring parameters of discovered checks... * 2007 FIX: md: Handle rebuild of RAID 5 correctly, handle sitatuation of replacement correctly... * 2028 FIX: hyperv_vms: new plugin that allows spaces in VM names... + * 2013 FIX: stulz_pump: Fixed exception during checking for some devices Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/stulz_pump b/checks/stulz_pump index a715af1..86bd808 100644 --- a/checks/stulz_pump +++ b/checks/stulz_pump @@ -32,10 +32,10 @@ def inventory_stulz_pump(info): return inventory def check_stulz_pump(item, _no_params, info): - for pump_id, pump_status in info[0]: + for index, (pump_id, pump_status) in enumerate(info[0]): pump_id = pump_id.replace('.1', '') if pump_id == item: - pump_rpm = info[1][int(pump_id)-1][0] + pump_rpm = info[1][index][0] perfdata = [ ('rpm', pump_rpm+"%", None, None, 0, 100) ] if pump_status == '1': state = 0

9 years, 4 months

Check_MK Git: check_mk: Fixed print statement

by Lars Michelsen

Module: check_mk Branch: master Commit: f46a9144f4b09e7ad0480357077f8b89f304324d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f46a9144f4b09e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 20 15:36:32 2015 +0100 Fixed print statement --- checks/esx_vsphere_datastores | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index 3f2c2b8..ce2c373 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -37,7 +37,6 @@ def esx_vsphere_datastores_parse(info): stores = {} for line in info: - print line if line[0].startswith('['): name = line[0][1:-1] store = {}

9 years, 4 months

Check_MK Git: check_mk: #2012 FIX Piggyback hostname translation can now deal correctly with umlauts

by Lars Michelsen

Module: check_mk Branch: master Commit: ec31d4b85ced81a4f225c5693ebe19aa81faa9c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec31d4b85ced81… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 20 15:33:12 2015 +0100 #2012 FIX Piggyback hostname translation can now deal correctly with umlauts --- .werks/2012 | 10 ++++++++++ ChangeLog | 1 + checks/esx_vsphere_datastores | 1 + modules/check_mk_base.py | 8 ++++++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/2012 b/.werks/2012 new file mode 100644 index 0000000..7c51d72 --- /dev/null +++ b/.werks/2012 @@ -0,0 +1,10 @@ +Title: Piggyback hostname translation can now deal correctly with umlauts +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424442762 + + diff --git a/ChangeLog b/ChangeLog index 195c66e..79b3e3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 1882 FIX: Fixed exception "filesystem_levels" not defined when compiling config for nagios * 1977 FIX: Dramatically reduced size of Check_MK check helper processes... * 1982 FIX: Fixed exception during checking regular checking when having checks without discovery function + * 2012 FIX: Piggyback hostname translation can now deal correctly with umlauts Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index ce2c373..3f2c2b8 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -37,6 +37,7 @@ def esx_vsphere_datastores_parse(info): stores = {} for line in info: + print line if line[0].startswith('['): name = line[0][1:-1] store = {} diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7d502a0..33eb289 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -604,6 +604,11 @@ def translate_piggyback_host(sourcehost, backedhost): if translation.get("drop_domain") and not backedhost[0].isdigit(): backedhost = backedhost.split(".", 1)[0] + # To make it possible to match umlauts we need to change the backendhost + # to a unicode string which can then be matched with regexes etc. + # We assume the incoming name is correctly encoded in UTF-8 + backedhost = backedhost.decode('utf-8') + # 3. Regular expression conversion if "regex" in translation: regex, subst = translation.get("regex") @@ -622,8 +627,7 @@ def translate_piggyback_host(sourcehost, backedhost): backedhost = to_host break - return backedhost - + return backedhost.encode('utf-8') # change back to UTF-8 encoded string def read_cache_file(relpath, max_cache_age):

9 years, 4 months

← Newer
1
...
8
9
10
11
12
13
14
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015