Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: brocade.fan: No longer outputs perfdata, uses fan.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3d28ca161cf617cc4de9236911fb23788cf67ae5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d28ca161cf617… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 11 16:33:27 2015 +0100 brocade.fan: No longer outputs perfdata, uses fan.include --- checks/brocade | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/checks/brocade b/checks/brocade index 4940442..b68b729 100644 --- a/checks/brocade +++ b/checks/brocade @@ -55,7 +55,7 @@ brocade_info = ('.1.3.6.1.4.1.1588.2.1.1.1.1.22.1', [ 5, # swSensorInfo ]) -brocade_fan_default_levels = { "lower": (3000 , 2800 ) } +brocade_fan_default_levels = { "lower": (3000 , 2800) } def inventory_brocade_fan(info): converted = brocade_sensor_convert(info, "FAN") @@ -64,43 +64,20 @@ def inventory_brocade_fan(info): def check_brocade_fan(item, params, info): converted = brocade_sensor_convert(info, "FAN") if type(params) is tuple: # old format - warn, crit = params - else: # new format - warn, crit = params.get("lower") - if params.get("upper"): - upperwarn, uppercrit = params["upper"] - else: - upperwarn, uppercrit = ( None, None ) + params = { "lower" : params } for snmp_item, name, value in converted: if item == snmp_item: - state = 0 - label = "" - value = saveint(value) - perf = [ ('fan', value, warn, crit) ] - if value <= crit: - state = 2 - label = "(Levels below: %d/%d)" % (warn, crit) - elif value <= warn: - state = 1 - label = "(Levels below: %d/%d)" % (warn, crit) - elif uppercrit and value >= uppercrit: - state = 2 - label = "(Levels above: %d/%d)" % (upperwarn, uppercrit) - elif upperwarn and value >= upperwarn: - state = 1 - label = "(Levels above: %d/%d)" % (upperwarn, uppercrit) - return state, "Fans at %drpm %s " % (value, label), perf - return 3, "FAN not found" + return check_fan(int(value), params) check_info["brocade.fan"] = { "check_function" : check_brocade_fan, "inventory_function" : inventory_brocade_fan, "service_description" : "FAN %s", - "has_perfdata" : True, "group" : "hw_fans", "snmp_info" : brocade_info, 'snmp_scan_function' : brocade_scan, + "includes" : [ "fan.include" ], } def inventory_brocade_power(info):

9 years, 4 months

Check_MK Git: check_mk: fsc_fans: Now uses fan.include, no longer outputs performance data.

by Konstantin Büttner

Module: check_mk Branch: master Commit: 81c11b9bed10c5d2215c0d64fbcfa99ea326c2fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81c11b9bed10c5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 11 16:20:05 2015 +0100 fsc_fans: Now uses fan.include, no longer outputs performance data. --- checks/fsc_fans | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/checks/fsc_fans b/checks/fsc_fans index f86a8f4..03453aa 100644 --- a/checks/fsc_fans +++ b/checks/fsc_fans @@ -30,30 +30,13 @@ def inventory_fsc_fans(info): def check_fsc_fans(item, params, info): if type(params) == tuple: - low_warn, low_crit = params - up_warn, up_crit = None, None - else: - low_warn, low_crit = params['lower'] - up_warn, up_crit = params.get('upper', ( None, None)) + params = { 'lower' : params } for line in info: # , value1, value2 in info: name = line[0] if name != item: continue rpm = int(line[1]) - - perfdata = [ ( 'rpm', rpm, low_warn, low_crit, 0 ) ] - infotext = "%d RPM" % rpm - levels = "Warn/Crit Lower: %d/%d " % (low_warn, low_crit ) - if up_crit: - levels += "Upper: %d/%d" % ( up_warn, up_crit ) - if rpm < low_crit or (up_crit and rpm > up_crit): - return 2, infotext + levels, perfdata - elif rpm < low_warn or (up_warn and rpm > up_warn): - return 1, infotext + levels, perfdata - else: - return 0, infotext, perfdata - - return (3, "FAN %s not found in SNMP data" % item) + return check_fan(rpm, params) check_info["fsc_fans"] = { @@ -61,8 +44,8 @@ check_info["fsc_fans"] = { 'inventory_function': inventory_fsc_fans, 'group': "hw_fans", 'service_description': 'FSC %s', - 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.231.2.10.2.2.5.2.2.1', [16, 8]), 'snmp_scan_function': lambda oid: \ oid(".1.3.6.1.4.1.231.2.10.2.1.1.0"), + 'includes': [ 'fan.include' ], }

9 years, 4 months

Check_MK Git: check_mk: netscaler_health: now uses fan.include. Fixed bug in fan.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: d190b6a1d4e28652709bff2848b08718e59fab2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d190b6a1d4e286… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 11 16:05:50 2015 +0100 netscaler_health: now uses fan.include. Fixed bug in fan.include --- checks/fan.include | 4 ++-- checks/netscaler_health | 23 ++--------------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/checks/fan.include b/checks/fan.include index 02782be..76741ae 100644 --- a/checks/fan.include +++ b/checks/fan.include @@ -37,10 +37,10 @@ def check_fan(rpm, params): " and at or above %s/%s rpm)" % (warn_upper, crit_upper) # Note that None < int - if rpm < crit or rpm >= crit_upper: + if rpm < crit or crit_upper != None and rpm >= crit_upper: message += levelstext return 2, message - elif rpm < warn or rpm >= warn_upper: + elif rpm < warn or warn_upper != None and rpm >= warn_upper: message += levelstext return 1, message else: diff --git a/checks/netscaler_health b/checks/netscaler_health index c6b7624..b763197 100644 --- a/checks/netscaler_health +++ b/checks/netscaler_health @@ -74,27 +74,7 @@ def inventory_netscaler_health_fan(info): def check_netscaler_health_fan(item, params, info): for name, value in info: if name[:-5] == item: - value=int(value) - infotext = "speed is %d rpm" % value - - state = 0 - lower_warn, lower_crit = params["lower"] - upper_warn, upper_crit = params["upper"] - if lower_crit and value <= lower_crit: - state = 2 - infotext += " (lower levels at %d/%d rpm)" % (lower_warn, lower_crit) - elif lower_warn and value <= lower_warn: - state = 1 - infotext += " (lower levels at %d/%d rpm)" % (lower_warn, lower_crit) - elif upper_crit and value >= upper_crit: - state = 2 - infotext += " (upper levels at %d/%d rpm)" % (upper_warn, upper_crit) - elif upper_warn and value >= upper_warn: - state = 1 - infotext += " (upper levels at %d/%d rpm)" % (upper_warn, upper_crit) - - return state, infotext - + return check_fan(int(value), params) check_info["netscaler_health.fan"] = { "check_function" : check_netscaler_health_fan, @@ -104,6 +84,7 @@ check_info["netscaler_health.fan"] = { "snmp_info" : netscaler_health_info, "snmp_scan_function" : netscaler_health_scan, "default_levels_variable" : "netscaler_health_fan_default_levels", + "includes" : [ "fan.include" ], } #. # .--temp----------------------------------------------------------------.

9 years, 4 months

Check_MK Git: check_mk: temperature.include: Fixed device status handling for best case option

by Konstantin Büttner

Module: check_mk Branch: master Commit: 63081314b01860dd7f56f0c5c6f7bbcd25199633 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63081314b01860… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 11 15:34:52 2015 +0100 temperature.include: Fixed device status handling for best case option --- checks/temperature.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/temperature.include b/checks/temperature.include index b80bc99..5fc8166 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -208,7 +208,7 @@ def check_temperature(reading, params, dev_unit = "c", status = check_temp_levels(temp, warn, crit, warn_lower, crit_lower) if dev_status != None: if dlh == "best": - status = min(status, dev_status) + status = minn(status, dev_status) else: status = max(status, dev_status)

9 years, 4 months

Check_MK Git: check_mk: Updated man ibm_Svc_host to match new check behavior

by Sven Rueß

Module: check_mk Branch: master Commit: 2eddafc46a3f8e073f1cb345fc08de83ae54d44b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2eddafc46a3f8e… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Feb 11 09:13:49 2015 +0100 Updated man ibm_Svc_host to match new check behavior --- checkman/ibm_svc_host | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/checkman/ibm_svc_host b/checkman/ibm_svc_host index a4f0d8f..e915e35 100644 --- a/checkman/ibm_svc_host +++ b/checkman/ibm_svc_host @@ -4,16 +4,19 @@ catalog: hw/storagehw/ibm license: GPL distribution: check_mk description: - Checks the status of hosts an IBM SVC / Storwize V3700 / V7000 presents volumes - to. + Checks the status of hosts on IBM SVC / Storwize V3700 / V7000 presents volumes to. - If there are only hosts reporting status {active}, {online} or {inactive} - the check returns {OK}. If there are hosts reporting {degraded} status or - any unidentified status the check returns {WARN}. If some hosts report - {offline} status the check returns {CRIT}. + For every host category {active}, {inactive}, {degraded}, {offline}, {other} the + amount of hosts is compared to the configured limits. - It is also possible to overwrite the return state with {OK} by passing {'always_ok' : True } - as Parameter, or simply with the WATO Rule. + For host category {active} the check returns {CRIT} if the amount of hosts is + equal or below the critical limit. The check returns {WARN} if the amount of hosts + is above critical limit and equal or below warning level. Otherwise the check returns {OK}. + + For host categories {inactive}, {degraded}, {offline}, {other} the check return {CRIT} if + the amount of hosts is equal or above the critical limit. The check return {WARN} if + the amount of hosts is below critical limit and equal or above warning limit. Otherwise + the check return {OK}. Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring data from the device. Your monitoring user must be able to SSH to the device

9 years, 4 months

Check_MK Git: check_mk: fixed typos

by Andreas Boesl

Module: check_mk Branch: master Commit: 4bcb36cb8e2415ae43cfe8a9cf39b6cfd3c8c14b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bcb36cb8e2415… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 11 09:00:44 2015 +0100 fixed typos --- web/plugins/wato/check_parameters.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1ff25c4..c97454c 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4676,7 +4676,7 @@ register_check_parameters( ), ( "inactive_hosts", Tuple( - title = _("Absolute amout of inactive hosts"), + title = _("Absolute amount of inactive hosts"), elements = [ Integer(title = _("Warning at or above"), minvalue = 0, unit = _("inactive hosts")), Integer(title = _("Critical at or above"), minvalue = 0, unit = _("inactive hosts")), @@ -4685,7 +4685,7 @@ register_check_parameters( ), ( "degraded_hosts", Tuple( - title = _("Absolute amout of degraded hosts"), + title = _("Absolute amount of degraded hosts"), elements = [ Integer(title = _("Warning at or above"), minvalue = 0, unit = _("degraded hosts")), Integer(title = _("Critical at or above"), minvalue = 0, unit = _("degraded hosts")), @@ -4694,7 +4694,7 @@ register_check_parameters( ), ( "offline_hosts", Tuple( - title = _("Absolute amout of offline hosts"), + title = _("Absolute amount of offline hosts"), elements = [ Integer(title = _("Warning at or above"), minvalue = 0, unit = _("offline hosts")), Integer(title = _("Critical at or above"), minvalue = 0, unit = _("offline hosts")), @@ -4703,7 +4703,7 @@ register_check_parameters( ), ( "other_hosts", Tuple( - title = _("Absolute amout of other hosts"), + title = _("Absolute amount of other hosts"), elements = [ Integer(title = _("Warning at or above"), minvalue = 0, unit = _("other hosts")), Integer(title = _("Critical at or above"), minvalue = 0, unit = _("other hosts")),

9 years, 4 months

Check_MK Git: check_mk: #1949 ibm_svc_host / other license checks: now able to configure limits

by Sven Rueß

Module: check_mk Branch: master Commit: 8b05ba248fed078bd4f49f4937f36d84289a12b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b05ba248fed07… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Feb 11 08:43:20 2015 +0100 #1949 ibm_svc_host / other license checks: now able to configure limits The check ibm_svc_host now has configurable host limits via WATO. Old limits: <ul> <li>Check shows errors in case of degraded or offline hosts</li> <li>Check always is in a OK State</li> </ul> New limits: <ul> <li>Absolut amount of active hosts - Warning/Critical at or below</li> <li>Absolute amout of inactive hosts - Warning/Critical at or above</li> <li>Absolute amout of degraded hosts - Warning/Critical at or above</li> <li>Absolute amout of offline hosts - Warning/Critical at or above</li> <li>Absolute amout of other hosts - Warning/Critical at or above</li> </ul> This change has been made because it was not possible to configure limits without warning/critical states. Now all host categories can configured independently. --- .werks/1949 | 27 +++++++++++++ ChangeLog | 1 + checks/ibm_svc_host | 68 ++++++++++++++++++------------- web/plugins/wato/check_parameters.py | 74 +++++++++++++++++++++++++++------- 4 files changed, 127 insertions(+), 43 deletions(-) diff --git a/.werks/1949 b/.werks/1949 new file mode 100644 index 0000000..a15fa39 --- /dev/null +++ b/.werks/1949 @@ -0,0 +1,27 @@ +Title: ibm_svc_host / other license checks: now able to configure limits +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i1 +Date: 1423639361 +Class: feature + +The check ibm_svc_host now has configurable host limits via WATO. + +Old limits: +<ul> +<li>Check shows errors in case of degraded or offline hosts</li> +<li>Check always is in a OK State</li> +</ul> + +New limits: +<ul> +<li>Absolut amount of active hosts - Warning/Critical at or below</li> +<li>Absolute amout of inactive hosts - Warning/Critical at or above</li> +<li>Absolute amout of degraded hosts - Warning/Critical at or above</li> +<li>Absolute amout of offline hosts - Warning/Critical at or above</li> +<li>Absolute amout of other hosts - Warning/Critical at or above</li> +</ul> + +This change has been made because it was not possible to configure limits without +warning/critical states. Now all host categories can configured independently. diff --git a/ChangeLog b/ChangeLog index 6331393..d5e837f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -207,6 +207,7 @@ NOTE: Please refer to the migration notes! * 1934 WATO Web-API: Documentation is finally available... * 1935 WATO Web-API: Reduced number configurable role permissions... + * 1949 ibm_svc_host / other license checks: now able to configure limits... * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... * 1789 FIX: Fix preview of passive checks in WATO list of services diff --git a/checks/ibm_svc_host b/checks/ibm_svc_host index 84ef906..4f3cb5b 100644 --- a/checks/ibm_svc_host +++ b/checks/ibm_svc_host @@ -31,27 +31,16 @@ # 2:host105:2:2:online # 3:host106:2:2:online -factory_settings['ibm_svc_host_default_levels'] = { - 'always_ok' : False -} - def inventory_ibm_svc_host(info): return [(None, None)] - -def check_ibm_svc_host_state(state, aw_ok): - if aw_ok: - return 0 - else: - return state - def check_ibm_svc_host(item, params, info): degraded = 0 offline = 0 active = 0 inactive = 0 other = 0 - status = 0 + for line in info: if line[4] == 'degraded': degraded += 1 @@ -64,29 +53,52 @@ def check_ibm_svc_host(item, params, info): else: other +=1 - perfdata = [ ("active", active), - ("inactive", inactive), - ("degraded", degraded), - ("offline", offline), - ("other", other), - ] - yield 0, "%s hosts active, %s inactive" % (active, inactive), perfdata + if 'always_ok' in params: + # Old configuration rule + # This was used with only one parameter always_ok until version 1.2.7 + perfdata = [ ("active", active), + ("inactive", inactive), + ("degraded", degraded), + ("offline", offline), + ("other", other), + ] + yield 0, "%s active, %s inactive" % (active, inactive), perfdata - aw_ok = params['always_ok'] # Needed in function check_ibm_svc_host_state - if degraded > 0: - yield check_ibm_svc_host_state(1, aw_ok), "%s degraded" % degraded - if offline > 0: - yield check_ibm_svc_host_state(2, aw_ok), "%s offline" % offline - if other > 0: - yield check_ibm_svc_host_state(1, aw_ok), "%s in an unidentified state(!)" % other + if degraded > 0: + yield (not params['always_ok'] and 1 or 0), "%s degraded" % degraded + if offline > 0: + yield (not params['always_ok'] and 2 or 0), "%s offline" % offline + if other > 0: + yield (not params['always_ok'] and 1 or 0), "%s in an unidentified state" % other + else: + warn, crit = params.get('active_hosts', (None, None)) + + if crit != None and active <= crit: + yield 2, "%s active" % active + elif warn != None and active <= warn: + yield 1, "%s active" % active + else: + yield 0, "%s active" % active + for ident, value in [ ('inactive', inactive), + ('degraded', degraded), + ('offline', offline), + ('other', other), + ]: + warn, crit = params.get(ident+'_hosts', (None, None)) + + if crit != None and value >= crit: + state = 2 + if warn != None and value >= warn: + state = 1 + else: + state = 0 + yield state, "%s %s" % (value, ident), [ (ident, value, warn, crit) ] check_info["ibm_svc_host"] = { "check_function" : check_ibm_svc_host, "inventory_function" : inventory_ibm_svc_host, "service_description" : "Hosts", "has_perfdata" : True, - "default_levels_variable": "ibm_svc_host_default_levels", "group" : "ibm_svc_host", } - diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index fe041c7..1ff25c4 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4650,30 +4650,74 @@ register_check_parameters( "first" ) +def transform_ibm_svc_host(params): + if 'always_ok' in params: + if params['always_ok'] == False: + params = { 'degraded_hosts': (1,1), 'offline_hosts': (1,1), 'other_hosts': (1,1) } + else: + params = {} + return params register_check_parameters( subgroup_storage, "ibm_svc_host", _("IBM SVC: Options for SVC Hosts Check "), - Dictionary( - elements = [ - ( "always_ok", - DropdownChoice( - title = _("Override Service State"), - choices = [ - ( False, _("Check shows errors in case of degraded or offline hosts")), - ( True, _("Check always is in a OK State") ) - ], - ) - ) - ], - optional_keys = None, + Transform( + Dictionary( + elements = [ + ( "active_hosts", + Tuple( + title = _("Absolute amount of active hosts"), + elements = [ + Integer(title = _("Warning at or below"), minvalue = 0, unit = _("active hosts")), + Integer(title = _("Critical at or below"), minvalue = 0, unit = _("active hosts")), + ] + ), + ), + ( "inactive_hosts", + Tuple( + title = _("Absolute amout of inactive hosts"), + elements = [ + Integer(title = _("Warning at or above"), minvalue = 0, unit = _("inactive hosts")), + Integer(title = _("Critical at or above"), minvalue = 0, unit = _("inactive hosts")), + ] + ), + ), + ( "degraded_hosts", + Tuple( + title = _("Absolute amout of degraded hosts"), + elements = [ + Integer(title = _("Warning at or above"), minvalue = 0, unit = _("degraded hosts")), + Integer(title = _("Critical at or above"), minvalue = 0, unit = _("degraded hosts")), + ] + ), + ), + ( "offline_hosts", + Tuple( + title = _("Absolute amout of offline hosts"), + elements = [ + Integer(title = _("Warning at or above"), minvalue = 0, unit = _("offline hosts")), + Integer(title = _("Critical at or above"), minvalue = 0, unit = _("offline hosts")), + ] + ), + ), + ( "other_hosts", + Tuple( + title = _("Absolute amout of other hosts"), + elements = [ + Integer(title = _("Warning at or above"), minvalue = 0, unit = _("other hosts")), + Integer(title = _("Critical at or above"), minvalue = 0, unit = _("other hosts")), + ] + ), + ), + ] + ), + forth = transform_ibm_svc_host, ), None, - "first" + "dict", ) - register_check_parameters( subgroup_storage, "disk_io",

9 years, 4 months

Check_MK Git: check_mk: Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 0938c29b454f8cf031e544276e19c6bcc8debb0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0938c29b454f8c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 10 18:31:55 2015 +0100 Testcommit --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bb39807..6331393 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,4 @@ 1.2.7i1: - Core & Setup: * 1759 Packed RPM and DEB agent packages are now shipped with normal Check_MK package... * 1791 FIX: Fix problem where many bogus RRD files for Check_MK service would be created...

9 years, 4 months

Check_MK Git: check_mk: Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: f75ba2e9dd1e012357702bbe0a0ac504ea792d1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f75ba2e9dd1e01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 10 18:31:34 2015 +0100 Testcommit --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 6331393..bb39807 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 1.2.7i1: + Core & Setup: * 1759 Packed RPM and DEB agent packages are now shipped with normal Check_MK package... * 1791 FIX: Fix problem where many bogus RRD files for Check_MK service would be created...

9 years, 4 months

Check_MK Git: check_mk: #1942 FIX netapp_api_volumes: fixed exception when performance data generation was enabled

by Andreas Boesl

Module: check_mk Branch: master Commit: 5d440723052a3f7baa6402fd7dbe13e034d87e6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d440723052a3f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 10 16:47:17 2015 +0100 #1942 FIX netapp_api_volumes: fixed exception when performance data generation was enabled --- .werks/1942 | 10 ++++++++++ ChangeLog | 1 + checks/netapp_api_volumes | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1942 b/.werks/1942 new file mode 100644 index 0000000..02e3c39 --- /dev/null +++ b/.werks/1942 @@ -0,0 +1,10 @@ +Title: netapp_api_volumes: fixed exception when performance data generation was enabled +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423583184 + + diff --git a/ChangeLog b/ChangeLog index 70ecadd..6331393 100644 --- a/ChangeLog +++ b/ChangeLog @@ -157,6 +157,7 @@ * 1938 FIX: docsis_channels_upstream: fixed missing checks if channels had the same ChannelId... * 1940 FIX: ps: Fixed a rare crash on malformed agent output... * 1941 FIX: df.include: fixed exception on emtpy filesystems... + * 1942 FIX: netapp_api_volumes: fixed exception when performance data generation was enabled Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/netapp_api_volumes b/checks/netapp_api_volumes index 64de534..8640cd4 100644 --- a/checks/netapp_api_volumes +++ b/checks/netapp_api_volumes @@ -80,8 +80,9 @@ def check_netapp_api_volumes(item, params, parsed): for mode in ["read_", "write_", "other_"]: for field, factor, format_text in [ ("data", None, None), ("latency", 10000.0, "%s: %.2f ms")]: key = protocol + mode + field - value = int(volume.get("counters", {}).get(key)) + value = volume.get("counters", {}).get(key) if value != None: + value = int(value) try: timedif, delta = get_counter("netapp_api_volumes.%s.%s" % (item, key), now, value) perf.append( (key, delta) )

9 years, 4 months

← Newer
1
...
16
17
18
19
20
21
22
...
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