Checkmk git commits April 2014

checkmk-commits@lists.checkmk.com

6 participants
180 discussions

Check_MK Git: check_mk: Fixed recent exception in hosts availabilty

by Mathias Kettner

Module: check_mk Branch: master Commit: 0821dc30fae1a7231d95878e56840d4283e20a94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0821dc30fae1a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 9 15:24:03 2014 +0200 Fixed recent exception in hosts availabilty --- web/plugins/views/availability.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index b32b9b8..8a88dd4 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -161,7 +161,7 @@ def render_availability(view, datasource, filterheaders, display_options, html.write(avoptions_html) if not html.has_user_errors(): - if tl_aggr: + if timeline and tl_aggr: if not html.has_var("aggr_group"): raise MKGeneralException("Missing GET variable <tt>aggr_group</tt>") aggr_group = html.var("aggr_group")

10 years, 5 months

Check_MK Git: check_mk: Fixed inline comment

by Mathias Kettner

Module: check_mk Branch: master Commit: c300ced696b4b3ff94cd733eb28b64d785cca5b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c300ced696b4b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 9 15:22:01 2014 +0200 Fixed inline comment --- checks/brocade_fcport | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/brocade_fcport b/checks/brocade_fcport index c5188a2..55178cd 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -49,7 +49,7 @@ factory_settings["brocade_fcport_default_levels"] = { "rxcrcs": (3.0, 20.0), # allowed percentage of CRC errors "rxencoutframes": (3.0, 20.0), # allowed percentage of Enc-OUT Frames "notxcredits": (3.0, 20.0), # allowed percentage of No Tx Credits - "c3discards": (3.0, 20.0), # allowed percentage of CRC errors + "c3discards": (3.0, 20.0), # allowed percentage of C3 discards "assumed_speed": 2.0, # used, if speed not available in SNMP data }

10 years, 5 months

Check_MK Git: check_mk: Small update of manpage of brocade_fcport

by Mathias Kettner

Module: check_mk Branch: master Commit: 338bc0d16ab2eaa26a798fbaa6962b5a412832b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=338bc0d16ab2ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 9 15:21:40 2014 +0200 Small update of manpage of brocade_fcport --- checkman/brocade_fcport | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/checkman/brocade_fcport b/checkman/brocade_fcport index 4f52495..8e5b950 100644 --- a/checkman/brocade_fcport +++ b/checkman/brocade_fcport @@ -17,12 +17,16 @@ description: {[3]} An error counter exceeds its configured levels (CRC errors, Enc-OUT frames, no Tx credits, C3 discards) - {Averaging}: This check supports averaging on all counters. Averaging is + Averaging: This check supports averaging on all counters. Averaging is turned on but setting the check parameter {"average"} to a number of minutes. In that case the check produces additional performance data for each parameter and all warning/error levels are only applied on the averaged value, not on the current one. This is especially helpful when using levels on the throughput. + Note: The counters CRC errors and Enc-OUT are represented as percentages in + relation to the number of received frames. C3 discards and no Tx credits are + in relation to the number of sent frames. + item: The item is the port-number as two-digit or three-digit string (on switches with 100 or more ports) as printed on the switch (note: the SNMP-index of

10 years, 5 months

Check_MK Git: check_mk: f5_bigip_cluster: fixed inventory function

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8242786b8d2d30fda29ce09c5e839e3dd786cbcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8242786b8d2d30… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Apr 9 14:40:55 2014 +0200 f5_bigip_cluster: fixed inventory function --- checks/f5_bigip_cluster | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/f5_bigip_cluster b/checks/f5_bigip_cluster index 34f5e32..874379d 100644 --- a/checks/f5_bigip_cluster +++ b/checks/f5_bigip_cluster @@ -35,8 +35,8 @@ def inventory_f5_bigip_cluster(info): # run inventory unless we found a device in unconfigured state - # don't need to loop over the input as there's only one status. - if len(info) == 1 and not info[0][0].startswith("-1"): + # don't need to loop over the input as there's only one status + if len(info) == 1 and not ( info[0][0].startswith("-1") or info[0][0] == '' ): return [(None, None)] return []

10 years, 5 months

Check_MK Git: check_mk: FIX windows_updates: now handles situations with forced reboot and no limits correctly

by Götz Golla

Module: check_mk Branch: master Commit: 1689da10fefe030eb743a9e1ff50f05c847f6599 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1689da10fefe03… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Apr 9 13:04:22 2014 +0200 FIX windows_updates: now handles situations with forced reboot and no limits correctly --- .werks/604 | 9 +++++++++ ChangeLog | 3 ++- checks/windows_updates | 15 +++++++++++---- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/604 b/.werks/604 new file mode 100644 index 0000000..6a130a7 --- /dev/null +++ b/.werks/604 @@ -0,0 +1,9 @@ +Title: windows_updates: now handles situations with forced reboot and no limits correctly +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1397041383 + + diff --git a/ChangeLog b/ChangeLog index d064fba..2033f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,10 +22,11 @@ * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used... - * 0603 FIX: cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks * 0803 FIX: agent_ibmsvc: raw data for System Info Check and License Check now in correct format... * 0788 FIX: oracle_tablespaces: now able to bear None values as warn/crit levels... * 0789 FIX: oracle_tablespaces: fixed bug when using dynamic filesystem levels... + * 0603 FIX: cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks + * 0604 FIX: windows_updates: now handles situations with forced reboot and no limits correctly Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/windows_updates b/checks/windows_updates index 031d0da..1a6c153 100644 --- a/checks/windows_updates +++ b/checks/windows_updates @@ -98,15 +98,22 @@ def check_windows_updates(_unused, params, info): hour, minute, second = map(int, time.split(":")) force_date = datetime.datetime( year, month, day, hour, minute, second) now = datetime.datetime.now() - diff_warn = datetime.timedelta(seconds=force_warn) - diff_crit = datetime.timedelta(seconds=force_crit) nix = datetime.timedelta(seconds=0) + # check if force_date is in the future if force_date - now > nix: + if force_crit: + diff_crit = datetime.timedelta(seconds=force_crit) + else: + diff_crit = None + if force_warn: + diff_warn = datetime.timedelta(seconds=force_warn) + else: + diff_warn = None sym = "" - if diff_crit > force_date - now: + if diff_crit and diff_crit > force_date - now: status = 2 sym = "(!!)" - elif diff_warn > force_date - now: + elif diff_warn and diff_warn > force_date - now: if status < 1: status = 1 sym = "(!)"

10 years, 5 months

Check_MK Git: check_mk: windows_tasks: output last and next run time

by Mathias Kettner

Module: check_mk Branch: master Commit: ff354002d0d69998e33459267a327e6fc1bc328f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff354002d0d699… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 9 12:54:03 2014 +0200 windows_tasks: output last and next run time --- .werks/879 | 8 ++++++++ ChangeLog | 3 ++- checks/windows_tasks | 29 ++++++++++++++++++----------- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/.werks/879 b/.werks/879 new file mode 100644 index 0000000..58ea5db --- /dev/null +++ b/.werks/879 @@ -0,0 +1,8 @@ +Title: windows_tasks: output last and next run time +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1397040831 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d064fba..b4f7ed5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,14 +18,15 @@ * 0602 cmciii.humidity: new check for Rittals CMC III humidity sensors * 0829 oracle_tablespaces: improved formatting of levels text in check output... * 0757 Linux multipath check can now use the alias instead of the UUID as item... + * 0879 windows_tasks: output last and next run time * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used... - * 0603 FIX: cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks * 0803 FIX: agent_ibmsvc: raw data for System Info Check and License Check now in correct format... * 0788 FIX: oracle_tablespaces: now able to bear None values as warn/crit levels... * 0789 FIX: oracle_tablespaces: fixed bug when using dynamic filesystem levels... + * 0603 FIX: cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/windows_tasks b/checks/windows_tasks index 7aec0c7..46aca6b 100644 --- a/checks/windows_tasks +++ b/checks/windows_tasks @@ -25,17 +25,18 @@ # Boston, MA 02110-1301 USA. # Example output from agent: -#TaskName : \WebShopPictureUpload -#Last Run Time : 17.10.2013 23:00:00 -#Next Run Time : 18.10.2013 23:00:00 -#Last Result : 0 -#Scheduled Task State : Enabled +# <<<windows_tasks:sep(58)>>> +# TaskName : \WebShopPictureUpload +# Last Run Time : 17.10.2013 23:00:00 +# Next Run Time : 18.10.2013 23:00:00 +# Last Result : 0 +# Scheduled Task State : Enabled # -#TaskName : \OfficeSoftwareProtectionPlatform\SvcRestartTask -#Last Run Time : N/A -#Next Run Time : Disabled -#Last Result : 1 -#Scheduled Task State : Disabled +# TaskName : \OfficeSoftwareProtectionPlatform\SvcRestartTask +# Last Run Time : N/A +# Next Run Time : Disabled +# Last Result : 1 +# Scheduled Task State : Disabled def windows_tasks_convert(info): @@ -43,7 +44,7 @@ def windows_tasks_convert(info): last_task = False for line in info: name = line[0].strip() - value = "".join(line[1:]).strip() + value = ":".join(line[1:]).strip() if last_task and name != "TaskName": data[last_task][name] = value @@ -73,6 +74,12 @@ def check_windows_tasks(item, _no_params, info): msg.append("Task not Enabled(!!)") state = 2 + if "Last Run Time" in values: + msg.append("last run time: %s" % values["Last Run Time"]) + + if "Next Run Time" in values: + msg.append("next run time: %s" % values["Next Run Time"]) + return state, ", ".join(msg) return 3, "Task not found on server"

10 years, 5 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 77fddf6d30e1cfaf279de11cccdb80abb787ff3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77fddf6d30e1cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 9 12:53:45 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 180bd24..a80d499 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -879 +889

10 years, 5 months

Check_MK Git: check_mk: FIX cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks

by Götz Golla

Module: check_mk Branch: master Commit: ae0278abc1d669e74c84203c67a3afe84e8a6482 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae0278abc1d669… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Apr 9 12:07:06 2014 +0200 FIX cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks --- .werks/603 | 8 ++++++++ ChangeLog | 1 + checks/cmciii | 2 +- web/plugins/perfometer/check_mk.py | 6 ++++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/603 b/.werks/603 new file mode 100644 index 0000000..6fb6acb --- /dev/null +++ b/.werks/603 @@ -0,0 +1,8 @@ +Title: cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1397037965 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 6f647db..9eb594a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used... + * 0603 FIX: cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/cmciii b/checks/cmciii index d608b54..c14fb41 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -199,7 +199,7 @@ cmciii_snmp_info = [ ] ] -cmciii_scan = lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0") +cmciii_scan = lambda oid: ".1.3.6.1.4.1.2606.7" in oid(".1.3.6.1.2.1.1.2.0") # .--psm current---------------------------------------------------------. # | _ | diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 6e18c5c..8bf89ba 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -286,6 +286,7 @@ perfometers["check_mk-hitachi_hnas_temp"] = perfometer_temperature perfometers["check_mk-dell_poweredge_temp"] = perfometer_temperature perfometers["check_mk-dell_chassis_temp"] = perfometer_temperature perfometers["check_mk-innovaphone_temp"] = perfometer_temperature +perfometers["check_mk-cmciii.temp"] = perfometer_temperature def perfometer_temperature_multi(row, check_command, perf_data): display_value = -1 @@ -769,11 +770,12 @@ def perfometer_cmc_lcp(row, check_command, perf_data): perfometers["check_mk-cmc_lcp"] = perfometer_cmc_lcp -def perfometer_carel_uniflair_cooling(row, check_command, perf_data): +def perfometer_humidity(row, check_command, perf_data): humidity = float(perf_data[0][1]) return "%3.1f%%" % humidity, perfometer_linear(humidity, '#6f2') -perfometers['check_mk-carel_uniflair_cooling'] = perfometer_carel_uniflair_cooling +perfometers['check_mk-carel_uniflair_cooling'] = perfometer_humidity +perfometers['check_mk-cmciii.humidity'] = perfometer_humidity def perfometer_eaton(row, command, perf): return u"%s°C" % str(perf[0][1]), perfometer_linear(float(perf[0][1]), 'silver')

10 years, 5 months

Check_MK Git: check_mk: ibm_svc_mdiskgrp: free capacity of 0 bytes was not handled correctly

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: bcb9ccc88c583995f40836856b0504d05db3a565 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcb9ccc88c5839… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 8 16:14:43 2014 +0200 ibm_svc_mdiskgrp: free capacity of 0 bytes was not handled correctly --- checks/ibm_svc_mdiskgrp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/ibm_svc_mdiskgrp b/checks/ibm_svc_mdiskgrp index c28ba6d..dda631a 100644 --- a/checks/ibm_svc_mdiskgrp +++ b/checks/ibm_svc_mdiskgrp @@ -51,6 +51,8 @@ def ibm_svc_mdiskgrp_to_mb(size): size = int(float(size.replace("PB", ""))) * 1024 * 1024 * 1024 elif size.endswith("EB"): size = int(float(size.replace("EB", ""))) * 1024 * 1024 * 1024 * 1024 + else: + size = int(float(size)) return size def inventory_ibm_svc_mdiskgrp(info):

10 years, 5 months

Check_MK Git: check_mk: Linux multipath check can now use the alias instead of the UUID as item

by Mathias Kettner

Module: check_mk Branch: master Commit: cff9d866636c5e555e10e137bec995796161797c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cff9d866636c5e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 8 12:20:55 2014 +0200 Linux multipath check can now use the alias instead of the UUID as item If you have set useful aliasses for you Linux multipath devices then you can now have Check_MK use these instead of the UUIDs for the service description. This makes alerting, BI aggregates and other stuff easier. The configuration is via a new rule set <i>Linux Multipath Inventory</i>. If you are now using WATO then please refer to the check's man page for details. --- .werks/757 | 12 ++++++++++++ ChangeLog | 1 + checkman/multipath | 13 ++++++++++++- checks/multipath | 18 ++++++++++++++++-- web/plugins/wato/check_parameters.py | 19 +++++++++++++++++++ 5 files changed, 60 insertions(+), 3 deletions(-) diff --git a/.werks/757 b/.werks/757 new file mode 100644 index 0000000..5bc19d1 --- /dev/null +++ b/.werks/757 @@ -0,0 +1,12 @@ +Title: Linux multipath check can now use the alias instead of the UUID as item +Level: 2 +Component: checks +Version: 1.2.5i3 +Date: 1396952369 +Class: feature + +If you have set useful aliasses for you Linux multipath devices then you can +now have Check_MK use these instead of the UUIDs for the service description. +This makes alerting, BI aggregates and other stuff easier. The configuration +is via a new rule set <i>Linux Multipath Inventory</i>. If you are now using +WATO then please refer to the check's man page for details. diff --git a/ChangeLog b/ChangeLog index 05ade8e..91d1403 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ NOTE: Please refer to the migration notes! * 0802 ibm_svc_nodestats.iops, ibm_svc_systemstats.iops: new checks for IO operations/sec on IBM SVC / V7000 devices * 0602 cmciii.humidity: new check for Rittals CMC III humidity sensors + * 0757 Linux multipath check can now use the alias instead of the UUID as item... * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/multipath b/checkman/multipath index 0543f80..7b4a13d 100644 --- a/checkman/multipath +++ b/checkman/multipath @@ -24,9 +24,20 @@ item: alias as item. inventory: - One check for each multipath device is created. + One check for each multipath device is created. Via {iventory_multipath_rules} + you can specify wether an alias should be used as item instead of the UUID. + +examples: + # Use the alias as item if one is being set + inventory_multipath_rules = [ + ( {'use_alias': True}, [], ALL_HOSTS ), + ] + [parameters] numpaths(int): The only parameter is the number of expected paths. This is not a tuple but a simple integer value. +[configuration] +inventory_multipath_rules(ruleset): A dictionary ruleset with currently the only possible + key being {use_alias}. See section inventory for details. diff --git a/checks/multipath b/checks/multipath index 6457f69..5247647 100644 --- a/checks/multipath +++ b/checks/multipath @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Configuration for using alias instead of UUID +inventory_multipath_rules = [] # Output from multipath -l has the following format: @@ -252,11 +254,17 @@ def parse_multipath_output(info, only_uuid = None): # Get list of UUIDs of all multipath devices # Length of UUID is 360a9800043346937686f456f59386741 def inventory_multipath(info): + settings = host_extra_conf_merged(g_hostname, inventory_multipath_rules) + inventory = [] parsed = parse_multipath_output(info) for uuid, info in parsed.items(): # take current number of paths as target value - inventory.append( (uuid, " ".join(info['luns']), info['numpaths']) ) + if "alias" in info and settings.get("use_alias"): + item = info["alias"] + else: + item = uuid + inventory.append( (item, info['numpaths']) ) return inventory # item is UUID (e.g. '360a9800043346937686f456f59386741') or alias (e.g. 'mpath0') @@ -269,9 +277,15 @@ def check_multipath(item, target_numpaths, info): return (3, "no map with uuid/alias %s" % item) mmap = parsed.values()[0] + # If the item is the alias, then show the UUID in the plugin output. + # If the item is the UUID, then vice versa. alias = mmap.get('alias') - if alias: + uuid = mmap.get('uuid') + + if item == uuid and alias: aliasinfo = "(%s) " % alias + elif item == alias and uuid: + aliasinfo = "(%s) " % uuid else: aliasinfo = "" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2d2c845..3b6d28f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3437,6 +3437,25 @@ register_check_parameters( "first" ) +register_rule( + "checkparams/" + subgroup_storage, + varname = "inventory_multipath_rules", + title = _("Linux Multipath Inventory"), + valuespec = Dictionary( + elements = [ + ("use_alias", Checkbox( + title = _("Use the multipath alias as service name, if one is set"), + label = _("use alias"), + help = _("If a multipath device has an alias then you can use that for specifying " + "the device instead of the UUID. The alias will then be part of the service " + "description. The UUID will be output in the pluging outpout.")) + ), + ], + help = _('This rule controls the inventory of Multipath devices on Linux.'), + ), + match = 'dict', +) + register_check_parameters( subgroup_storage, "multipath_count",

10 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2014