Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1724 FIX emc_datadomain_temps: convert to new standard check output, add PNP template

by Mathias Kettner

Module: check_mk Branch: master Commit: 7b8447ec7f0a9dec074272fffb6f4d9d3217a919 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b8447ec7f0a9d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 10:16:42 2014 +0100 #1724 FIX emc_datadomain_temps: convert to new standard check output, add PNP template --- .werks/1724 | 9 +++++++++ ChangeLog | 1 + checks/emc_datadomain_temps | 7 ++++--- pnp-templates/template-temperature.php | 6 ++++-- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.werks/1724 b/.werks/1724 new file mode 100644 index 0000000..3944218 --- /dev/null +++ b/.werks/1724 @@ -0,0 +1,9 @@ +Title: emc_datadomain_temps: convert to new standard check output, add PNP template +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418116579 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index f770d56..d101aa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -137,6 +137,7 @@ * 1695 FIX: brocade_vdx_status: Is now not bein inventorized anymore for devices not supporting the check * 1722 FIX: lnx_thermal: fix invalid zero temperature if mode file is missing * 1696 FIX: cisco_temp_sensor: Value reported of check was not always correct (precision was wrong)... + * 1724 FIX: emc_datadomain_temps: convert to new standard check output, add PNP template Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/emc_datadomain_temps b/checks/emc_datadomain_temps index f62c4b4..e889635 100644 --- a/checks/emc_datadomain_temps +++ b/checks/emc_datadomain_temps @@ -45,9 +45,10 @@ def check_emc_datadomain_temps(item, _no_params, info): dev_state = line[4] dev_state_str = state_table.get(dev_state, ("Unknown",3))[0] dev_state_rc = state_table.get(dev_state, ("Unknown",3))[1] - infotext = "%s Temperature %sC Status %s" % ( dev_descr, dev_temp, dev_state_str ) - perfdata = [('temp', dev_temp+"C" )] - return dev_state_rc, infotext,perfdata + yield 0, "Temperature: %s °C (%s)" % (dev_temp, dev_descr), [('temp', dev_temp)] + if dev_state_rc != 0: + yield dev_state_rc, dev_state_str + check_info["emc_datadomain_temps"] = { "check_function" : check_emc_datadomain_temps, diff --git a/pnp-templates/template-temperature.php b/pnp-templates/template-temperature.php index a6fb205..5d693d2 100644 --- a/pnp-templates/template-temperature.php +++ b/pnp-templates/template-temperature.php @@ -31,6 +31,8 @@ $def[1] .= "GPRINT:var1:LAST:\"%2.0lfC\" "; $def[1] .= "LINE1:var1#000080:\"\" "; $def[1] .= "GPRINT:var1:MAX:\"(Max\: %2.0lfC,\" "; $def[1] .= "GPRINT:var1:AVERAGE:\"Avg\: %2.0lfC)\" "; -$def[1] .= "HRULE:$WARN[1]#FFFF00:\"Warning\: $WARN[1]C\" "; -$def[1] .= "HRULE:$CRIT[1]#FF0000:\"Critical\: $CRIT[1]C\" "; +if ($WARN[1] != "") { + $def[1] .= "HRULE:$WARN[1]#FFFF00:\"Warning\: $WARN[1]C\" "; + $def[1] .= "HRULE:$CRIT[1]#FF0000:\"Critical\: $CRIT[1]C\" "; +} ?>

9 years, 9 months

Check_MK Git: check_mk: Fix exception when rendering flapping icon

by Mathias Kettner

Module: check_mk Branch: master Commit: f4ca95d3463514c8d8540434525bb8b5961b0b0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4ca95d3463514… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 10:11:26 2014 +0100 Fix exception when rendering flapping icon --- web/plugins/icons/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 1b4af8d..06b9ae0 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -425,7 +425,7 @@ def paint_flapping(what, row, tags, custom_vars): title = _("This host is flapping") else: title = _("This service is flapping") - return htm.render_icon('flapping', title) + return html.render_icon('flapping', title) multisite_icons.append({ 'columns': [ 'is_flapping' ],

9 years, 9 months

Check_MK Git: check_mk: drbd: fix exception in inventory in certain situations

by Mathias Kettner

Module: check_mk Branch: master Commit: e0c6e19e7946dbc25c37b385b4c2efae2e541938 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0c6e19e7946db… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 10:09:20 2014 +0100 drbd: fix exception in inventory in certain situations --- checks/drbd | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/checks/drbd b/checks/drbd index 2b4dfe1..962a1c9 100644 --- a/checks/drbd +++ b/checks/drbd @@ -191,9 +191,12 @@ def inventory_drbd(info, checktype): continue if checktype == 'drbd': - levels = { "roles_inventory": parsed['ro'], - "diskstates_inventory": parsed['ds'] - } + if 'ro' not in parsed or 'ds' not in parsed: + continue + levels = { + "roles_inventory": parsed['ro'], + "diskstates_inventory": parsed['ds'], + } elif checktype == 'drbd.net': levels = "drbd_net_default_levels" elif checktype == 'drbd.disk': @@ -416,7 +419,7 @@ def check_drbd_stats(item, params, info): if key in parsed: output += '%s: %s, ' % (label, parsed[key]) else: - parsed[key] = 0 # perfdata must always have same number of entries + parsed[key] = '0' # perfdata must always have same number of entries if parsed[key].isdigit(): perfdata.append(('%s' % label.replace(" ", "_"), parsed[key])) return (0, output.rstrip(', '), perfdata)

9 years, 9 months

Check_MK Git: check_mk: #1730 FIX apc_symmetra: Fixed exception when last diagnose date was not known

by Lars Michelsen

Module: check_mk Branch: master Commit: db3f4898b2233a9ffadad1d3e9543c134f06f8ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db3f4898b2233a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 10:49:05 2014 +0100 #1730 FIX apc_symmetra: Fixed exception when last diagnose date was not known --- .werks/1730 | 9 +++++++++ ChangeLog | 1 + checks/apc_symmetra | 21 ++++++++++----------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.werks/1730 b/.werks/1730 new file mode 100644 index 0000000..d83d1db --- /dev/null +++ b/.werks/1730 @@ -0,0 +1,9 @@ +Title: apc_symmetra: Fixed exception when last diagnose date was not known +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418118509 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index f36b86b..611d2c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -140,6 +140,7 @@ * 1727 FIX: cisco_secure: Fixed inventory exception when port security is not enabled * 1728 FIX: cisco_temp_perf: Not inventorized anymore for hosts supporting cisco_temp_sensor * 1729 FIX: apc_symmetra_test: Cleaned up check, fixed exception when self test date is zero + * 1730 FIX: apc_symmetra: Fixed exception when last diagnose date was not known Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/apc_symmetra b/checks/apc_symmetra index cc3f4ca..752b6f5 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -85,10 +85,10 @@ def check_apc(item, params, info): AdvOutputCurrent, AdvBatteryRunTimeRemaining, AdvTestCalibrationResults, AdvOutputLoad \ = [ saveint(x) for x in info[0][:13] ] - LastDiagnosticsDate = info[0][-1] + last_diag_date = info[0][-1] RunTimeRemaining = AdvBatteryRunTimeRemaining / 100 - delay_after_test, alt_crit_capacity = None, None + alt_crit_capacity = None # convert old format tuple to dict if type(params) is tuple: params = { "levels": params } @@ -96,14 +96,13 @@ def check_apc(item, params, info): # new format with up to 6 params in dict crit_capacity, crit_sys_temp, crit_batt_curr, crit_voltage = params['levels'] if params.get("post_calibration_levels"): - delay_after_test = params['post_calibration_levels']['additional_time_span'] - alt_crit_capacity = params['post_calibration_levels']['altcapacity'] - month, day, year = map(saveint, LastDiagnosticsDate.split('/')) - last_diag_date = datetime.date( year, month, day) - today = datetime.date.today() - diag_diff = today - last_diag_date - oneday = datetime.timedelta(days=1) - delay = datetime.timedelta(minutes=delay_after_test) + if last_diag_date != 'Unknown' and len(last_diag_date) in [8, 10]: + year_format = len(last_diag_date) == 8 and '%y' or '%Y' + last_ts = time.mktime(time.strptime(last_diag_date, '%m/%d/'+year_format)) + diff_sec = time.time() - last_ts + + allowed_delay_sec = 86400 + params['post_calibration_levels']['additional_time_span'] + alt_crit_capacity = params['post_calibration_levels']['altcapacity'] single_states = [] @@ -148,7 +147,7 @@ def check_apc(item, params, info): state = 0 infotxt = "capacity %d%% (crit at " % AdvBatteryCapacity - if alt_crit_capacity != None and diag_diff < oneday + delay: + if alt_crit_capacity != None and diff_sec < allowed_delay_sec: infotxt += "%d%% in delay after calib.)" % alt_crit_capacity if AdvBatteryCapacity <= alt_crit_capacity: state = 2

9 years, 9 months

Check_MK Git: check_mk: #1729 FIX apc_symmetra_test: Cleaned up check, fixed exception when self test date is zero

by Lars Michelsen

Module: check_mk Branch: master Commit: 1fd758e94b0392bfe5c18c57cf800a4442211ba4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fd758e94b0392… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 10:39:00 2014 +0100 #1729 FIX apc_symmetra_test: Cleaned up check, fixed exception when self test date is zero --- .werks/1729 | 9 +++++++++ ChangeLog | 1 + checks/apc_symmetra_test | 37 ++++++++++++++----------------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.werks/1729 b/.werks/1729 new file mode 100644 index 0000000..92358e0 --- /dev/null +++ b/.werks/1729 @@ -0,0 +1,9 @@ +Title: apc_symmetra_test: Cleaned up check, fixed exception when self test date is zero +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418117821 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c84e5a0..f36b86b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -139,6 +139,7 @@ * 1696 FIX: cisco_temp_sensor: Value reported of check was not always correct (precision was wrong)... * 1727 FIX: cisco_secure: Fixed inventory exception when port security is not enabled * 1728 FIX: cisco_temp_perf: Not inventorized anymore for hosts supporting cisco_temp_sensor + * 1729 FIX: apc_symmetra_test: Cleaned up check, fixed exception when self test date is zero Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/apc_symmetra_test b/checks/apc_symmetra_test index 25f297e..35d2fd1 100644 --- a/checks/apc_symmetra_test +++ b/checks/apc_symmetra_test @@ -52,53 +52,44 @@ # ::= { upsAdvTest 4 } # -import datetime -# What the F**k! Importing of module is absolutely discouraged in checks. -# Also we use time in check_mk, not datetime. - -ups_test_default = ( 0, 0 ) +ups_test_default = (0, 0) def check_apc_test(item, params, info): - warn, crit = params + days_warn, days_crit = params if not info: return 3, "Data Missing" - line = info[0] - DiagnosticsResults = saveint(line[0]) - LastDiagnosticsDate = line[1] + last_result = int(info[0][0]) + last_date = info[0][1] - if LastDiagnosticsDate == 'Unknown': + if last_date == 'Unknown' or len(last_date) not in [8, 10]: return 3, "Date of last self test is unknown" - month, day, year = map(saveint, LastDiagnosticsDate.split('/')) - last_diag_date = datetime.date( year, month, day) - today = datetime.date.today() - diag_diff = today - last_diag_date - dcrit = datetime.timedelta(days=crit) - dwarn = datetime.timedelta(days=warn) + year_format = len(last_date) == 8 and '%y' or '%Y' + last_ts = time.mktime(time.strptime(last_date, '%m/%d/'+year_format)) + days_diff = (time.time() - last_ts) / 86400 diagnostic_status_text = { 1:"OK", 2:"failed", 3:"invalid", 4:"in progress" } state = 0 diag_label = "" - if DiagnosticsResults == 2: + if last_result == 2: state = 2 diag_label = "(!!)" - elif DiagnosticsResults == 3: + elif last_result == 3: state = 1 diag_label = "(!)" time_label = "" - if crit != 0 and diag_diff >= dcrit: + if days_crit and days_diff >= days_crit: state = 2 time_label = "(!!)" - elif warn != 0 and diag_diff >= dwarn: + elif days_warn and days_diff >= days_warn: state = max(state, 1) time_label = "(!)" - ResultsDetail = "Result of self test: %s%s, Date of last test: %s%s" \ - % (diagnostic_status_text.get(DiagnosticsResults), diag_label, LastDiagnosticsDate, time_label) + return state, "Result of self test: %s%s, Date of last test: %s%s" % \ + (diagnostic_status_text.get(last_result, '-'), diag_label, last_date, time_label) - return (state, ResultsDetail ) def inventory_apc_test(info): if info:

9 years, 9 months

Check_MK Git: check_mk: #1728 FIX cisco_temp_perf: Not inventorized anymore for hosts supporting cisco_temp_sensor

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ac0e5961b9e80adea4d36de40e0277ba6fc49d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ac0e5961b9e80… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 10:02:30 2014 +0100 #1728 FIX cisco_temp_perf: Not inventorized anymore for hosts supporting cisco_temp_sensor --- .werks/1728 | 9 +++++++++ ChangeLog | 1 + checks/cisco_temp_perf | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/1728 b/.werks/1728 new file mode 100644 index 0000000..558cda8 --- /dev/null +++ b/.werks/1728 @@ -0,0 +1,9 @@ +Title: cisco_temp_perf: Not inventorized anymore for hosts supporting cisco_temp_sensor +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418115734 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index be00b28..c84e5a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -138,6 +138,7 @@ * 1722 FIX: lnx_thermal: fix invalid zero temperature if mode file is missing * 1696 FIX: cisco_temp_sensor: Value reported of check was not always correct (precision was wrong)... * 1727 FIX: cisco_secure: Fixed inventory exception when port security is not enabled + * 1728 FIX: cisco_temp_perf: Not inventorized anymore for hosts supporting cisco_temp_sensor Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index 8547190..899990f 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -91,8 +91,9 @@ check_info['cisco_temp_perf'] = { "service_description" : "Temperature %s", "has_perfdata" : True, "snmp_scan_function" : - lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ - oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None, + lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() \ + and oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None \ + and oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") == None, "snmp_info" : ( ".1.3.6.1.4.1.9.9.13.1.3.1", [2, 3, 4, 6, OID_END ] ), # CISCO-SMI "group" : "temperature_auto",

9 years, 9 months

Check_MK Git: check_mk: #1727 FIX cisco_secure: Fixed inventory exception when port security is not enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 047b2175bd34df90f8404ae9332a053a5a8b155b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=047b2175bd34df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 09:44:12 2014 +0100 #1727 FIX cisco_secure: Fixed inventory exception when port security is not enabled --- .werks/1727 | 9 +++++++++ ChangeLog | 1 + checks/cisco_secure | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1727 b/.werks/1727 new file mode 100644 index 0000000..cab7e98 --- /dev/null +++ b/.werks/1727 @@ -0,0 +1,9 @@ +Title: cisco_secure: Fixed inventory exception when port security is not enabled +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418114616 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index f770d56..be00b28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -137,6 +137,7 @@ * 1695 FIX: brocade_vdx_status: Is now not bein inventorized anymore for devices not supporting the check * 1722 FIX: lnx_thermal: fix invalid zero temperature if mode file is missing * 1696 FIX: cisco_temp_sensor: Value reported of check was not always correct (precision was wrong)... + * 1727 FIX: cisco_secure: Fixed inventory exception when port security is not enabled Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/cisco_secure b/checks/cisco_secure index 898082d..04317c6 100644 --- a/checks/cisco_secure +++ b/checks/cisco_secure @@ -31,7 +31,9 @@ def parse_cisco_secure(info): names = dict([ (l[0], ( l[1], l[2] )) for l in info[0]] ) for num, enabled, status, violationCount, lastmac in info[1]: mac = ":".join(["%02s" % hex(ord(m))[2:] for m in lastmac]).replace(' ', '0') - parsed.append(( names[num][0], int(names[num][1]), int(enabled), int(status), int(violationCount), mac )) + # violationCount is initialized with 0 when security is enabled. When not, the + # value is reported as empty string. saveint() makes life easier here. + parsed.append((names[num][0], int(names[num][1]), int(enabled), int(status), saveint(violationCount), mac)) return parsed

9 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: b17b29d44cca87392d642ed454766c1ab39ff8cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b17b29d44cca87… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 09:43:30 2014 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 57bf58c..c439d95 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1727 +1747

9 years, 9 months

Check_MK Git: check_mk: #1722 FIX lnx_thermal: fix invalid zero temperature if mode file is missing

by Mathias Kettner

Module: check_mk Branch: master Commit: 08b23bcc0e7b204303c234e36a05552559274be1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08b23bcc0e7b20… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 09:25:24 2014 +0100 #1722 FIX lnx_thermal: fix invalid zero temperature if mode file is missing --- .werks/1722 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 1 + checks/lnx_thermal | 4 ++-- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/1722 b/.werks/1722 new file mode 100644 index 0000000..36978e2 --- /dev/null +++ b/.werks/1722 @@ -0,0 +1,9 @@ +Title: lnx_thermal: fix invalid zero temperature if mode file is missing +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418113501 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 51a278d..49b5371 100644 --- a/ChangeLog +++ b/ChangeLog @@ -132,6 +132,7 @@ * 1713 FIX: check_fstab_mounts: now correctly ignores swap space... * 1716 FIX: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now * 1721 FIX: dell_om_mem: Handle formerly unhandled situations with multiple errors... + * 1722 FIX: lnx_thermal: fix invalid zero temperature if mode file is missing Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 5f925e1..0a6eca1 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -586,6 +586,7 @@ if ls /sys/class/thermal/thermal_zone* >/dev/null 2>&1; then echo '<<<lnx_thermal>>>' for F in /sys/class/thermal/thermal_zone*; do echo -n "${F##*/} " + if [ ! -e $F/mode ] ; then echo -n "- " ; fi cat $F/{mode,type,temp,trip_point_*} | tr \\n " " echo done diff --git a/checks/lnx_thermal b/checks/lnx_thermal index 6ccde87..22ad645 100644 --- a/checks/lnx_thermal +++ b/checks/lnx_thermal @@ -42,11 +42,11 @@ def check_lnx_thermal(item, params, info): tp_reached = [] # convert values from millidegree - cur = saveint(line[3]) / 1000 + cur = int(line[3]) / 1000 # parse trip points if len(line) > 4: - trip_points = dict(zip(line[5::2], map(lambda x: saveint(x) / 1000, line[4::2]))) + trip_points = dict(zip(line[5::2], map(lambda x: int(x) / 1000, line[4::2]))) for tp_num, (tp_name, level) in enumerate(trip_points.items()): # ignore active cooling device trip points (means enabling a fan or similar) if tp_name == 'active':

9 years, 9 months

Check_MK Git: check_mk: #1723 New check API function get_average() as more intelligent replacement for get_counter()

by Mathias Kettner

Module: check_mk Branch: master Commit: 53d5359286d6e89055b800b905c5c1f289bdd6e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53d5359286d6e8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 09:33:55 2014 +0100 #1723 New check API function get_average() as more intelligent replacement for get_counter() The function <tt>get_counter()</tt> is now deprecated in the programming of checks. There is a new function called <tt>get_rate()</tt> that should be used as a replacement. F+: def get_rate(countername, this_time, this_val, allow_negative=False, onwrap=SKIP): ... return rate F-: The call syntax is almostthe same - just with the new optional parameter <tt>onwrap</tt>. Important however: now just the rate (counter steps per second) is being returned. The formerly additional return value <tt>timedif</tt> has been dropped since it is of no real use. So the return type has changed from tuple to float. The most imporant change - however - is in the handling of counter wraps. A <i>counter wrap</i> happens in three situations: <ul> <li>When the counter is seen for the first time (initialization)</li> <li>When the previous value of the counter is larger than the new one</li> <li>When the time difference since the last counter update was less than one second</li> </ul> Wraps usually happen when a device reboots or when the valid range of the counter is exceeded and it wraps through again to zero. The old function <tt>get_counter()</tt> used to raise an exception of type <tt>MKCounterWrapped</tt>. This exception was handeld by the main core of Check_MK, which skipped that check for one cycle. The problem were checks with more than one counter: at the point of initialization the code of the check wasaborted after the first of these counters had been initialized. If you had 10 counters, you would need 10 check cycles until the first time a check result would be returned. So in order to avoid that the check had to catch the <tt>MKCounterWrapped</tt> itself and handle this situation - very ugly. The new function <tt>get_rate</tt> implements a different approach. Per default no exception is raised in case of a counter wrap, but simply the value <tt>0.00</tt> is being returned. But Check_MK keeps record of this wrap event. After the check function has completed (and all counters are handled), Check_MK creates <i>one final</i> <tt>MKCounterWrapped</tt> exception, so that the (invalid) check result is being skipped as it should be. This way the check programmers' burden is a reduced a bit because now even if the check has several counters he does not need to catch counter wraps. In order to give the check more flexibility there are two other behaviours, that can be selected by the optional argument <tt>onwrap</tt>: <table> <tr><th>onwrap</th><th>behaviour</th></tr> <tr><td class=tt>SKIP</td><td>Skip result of check, after all counters are handled (default)</td></tr> <tr><td class=tt>RAISE</td><td>Immediately raise a <tt>MKCounterWrapped</tt> exception (legacy behaviour)</td></tr> <tr><td class=tt>ZERO</td><td>Ignore the wrap and return a rate of 0.0 (be careful!)</td></tr> </table> Note: Using <tt>ZERO</tt> is generally <i>not</i> a good idea. This can make a service jump from CRIT to OK from now and then and generate bogus notifications. H2:get_average() The function <tt>get_average()</tt> has also been converted, but this time without renaming it. So this change is incompatible. This should not harm too much since the function is rarely used. <tt>get_average()</tt> now also just returns one value - the average - and also has the new parameter <tt>onwrap</tt> with the same three options. --- .werks/1723 | 68 ++++++++++++++++++++++++++++++++++++++++++++++ ChangeLog | 1 + checks/diskstat.include | 12 ++++---- modules/automation.py | 3 ++ modules/check_mk_base.py | 67 +++++++++++++++++++++++++++++++-------------- 5 files changed, 125 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=53d5359286…

9 years, 9 months

← Newer
1
...
20
21
22
23
24
25
26
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014