Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: bugfix for last change in brocade check

by Götz Golla

Module: check_mk Branch: master Commit: daf5482b2f421316a845225c7010cbc3d2b7c6ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daf5482b2f4213… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Oct 23 18:32:46 2013 +0200 bugfix for last change in brocade check --- checks/brocade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/brocade b/checks/brocade index 98d2757..255a240 100644 --- a/checks/brocade +++ b/checks/brocade @@ -71,10 +71,10 @@ def check_brocade_fan(item, params, info): label = "" value = saveint(value) perf = [ ('fan', value, warn, crit) ] - if value <= crit or ( uppercrit and value >= uppercrit ): + if value <= crit: state = 2 label = "(Levels below: %d/%d)" % (warn, crit) - elif value <= warn or ( upperwarn and value >= upperwarn ): + elif value <= warn: state = 1 label = "(Levels below: %d/%d)" % (warn, crit) elif uppercrit and value >= uppercrit:

10 years, 11 months

Check_MK Git: check_mk: WATO integration of check genu_fan with lower and upper limits for fan speed

by Götz Golla

Module: check_mk Branch: master Commit: aea2d4df0ac3135c708089182858b9188951534c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aea2d4df0ac313… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Oct 23 18:28:22 2013 +0200 WATO integration of check genu_fan with lower and upper limits for fan speed --- checks/genua_fan | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/genua_fan b/checks/genua_fan index 50eecc3..938052d 100644 --- a/checks/genua_fan +++ b/checks/genua_fan @@ -60,6 +60,7 @@ def check_genua_fan(item, params, info): check_info['genua_fan'] = { "inventory_function" : inventory_genua_fan, "check_function" : check_genua_fan, + "group" : "hw_fan", "service_description": "FAN %s", "has_perfdata" : True, "snmp_info" : [( ".1.3.6.1.4.1.3717.2.1.1.1.1",[

10 years, 11 months

Check_MK Git: check_mk: checkgroup hw_fan now can handle lower and upper limits for fan speeds

by Götz Golla

Module: check_mk Branch: master Commit: 1405dc9abd7b6c71d933ec4802cd7f74eedbaf07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1405dc9abd7b6c… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Oct 23 18:27:14 2013 +0200 checkgroup hw_fan now can handle lower and upper limits for fan speeds --- checks/brocade | 28 ++++++++++++++++++++-------- web/plugins/wato/check_parameters.py | 27 ++++++++++++++++++++++----- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/checks/brocade b/checks/brocade index a6d8b08..98d2757 100644 --- a/checks/brocade +++ b/checks/brocade @@ -48,8 +48,7 @@ def brocade_scan(oid): brocade_info = ('.1.3.6.1.4.1.1588.2.1.1.1.1.22.1', [ 4, 5 ]) - -brocade_fan_default_levels = ( 3000 , 2800 ) +brocade_fan_default_levels = { "lower": (3000 , 2800 ) } def inventory_brocade_fan(info): info = brocade_sensor_convert(info, "FAN") @@ -57,20 +56,33 @@ def inventory_brocade_fan(info): def check_brocade_fan(item, params, info): info = brocade_sensor_convert(info, "FAN") - warn, crit = params + 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 ) + for snmp_item, name, value in info: if item == snmp_item: state = 0 label = "" value = saveint(value) perf = [ ('fan', value, warn, crit) ] - if value <= warn: + if value <= crit or ( uppercrit and value >= uppercrit ): state = 2 - label = "(Levels bellow: %d/%d)" % (warn, crit) - elif value <= crit: + label = "(Levels below: %d/%d)" % (warn, crit) + elif value <= warn or ( upperwarn and value >= upperwarn ): state = 1 - label = "(Levels bellow: %d/%d)" % (warn, crit) - + 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" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e76dd2f..c8759b0 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3143,12 +3143,29 @@ register_check_parameters( subgroup_environment, "hw_fans", _("FAN speed of Hardware devices"), - Tuple( - help = _("Levels for the FAN speed of a hardware device like a switch"), + Dictionary( elements = [ - Integer(title = _("warning if below"), unit = u"rpm", default_value = 3000), - Integer(title = _("critical if below"), unit = u"rpm", default_value = 2500), - ]), + ("lower", + Tuple( + help = _("Lower levels for the FAN speed of a hardware device"), + title = _("Lower levels"), + elements = [ + Integer(title = _("warning if below"), unit = u"rpm"), + Integer(title = _("critical if below"), unit = u"rpm"), + ]), + ), + ( "upper", + Tuple( + help = _("Upper levels for the FAN speed of a hardware device"), + title = _("Upper levels"), + elements = [ + Integer(title = _("warning if above"), unit = u"rpm", default_value = 8000), + Integer(title = _("critical if above"), unit = u"rpm", default_value = 8400), + ]), + ), + ], + optional_keys = ["upper"], + ), TextAscii( title = _("Fan Name"), help = _("The identificator of the fan.")),

10 years, 11 months

Check_MK Git: check_mk: Check added for the fan state and rpm of genuscreen firewalls

by Götz Golla

Module: check_mk Branch: master Commit: 8fd4c4c0d87340369e7b6d3a0407fafbdcaf4c8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fd4c4c0d87340… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Oct 23 16:13:02 2013 +0200 Check added for the fan state and rpm of genuscreen firewalls --- checkman/genua_fan | 37 +++++++++++++++++++++++++ checks/genua_fan | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/checkman/genua_fan b/checkman/genua_fan new file mode 100644 index 0000000..3c4b58b --- /dev/null +++ b/checkman/genua_fan @@ -0,0 +1,37 @@ +title: Check for fan state and rpm on genua devices +agents: snmp +catalog: hw/network/genua +license: GPL +distribution: check_mk +description: + This check monitors the state and rpm of fans found on genuscreen firewalls. + Lower and upper levels for the rpm may be given. + + The check is known to run with genuscreen version 3.0 and 4.1, and supports + genuas regular enterprise id 3717 as well as the id 3137 which was + introduced in a bug in some versions of genuscreen. + +perfdata: + The rpm of the fans + +inventory: + The inventory process checks if the device has a system description OID + of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen" + (case insensitive). + If this is true and a fan is found, then the it is inventorized. + +item: + The name of the fan according to the snmp output + +[parameters] +parameters(dict): parameters is a dictionary with two keys + + {"lower"}: a tuple of lower warning and critical values for the fan rpm + + {"upper"}: a tuple of upper warning and critical values for the fan rpm + +[configuration] +genua_fan_default_levels(dict): This variable is preset to + + {{ "lower": ( 2000, 1000), "upper": (8000, 8400) }} + diff --git a/checks/genua_fan b/checks/genua_fan new file mode 100644 index 0000000..50eecc3 --- /dev/null +++ b/checks/genua_fan @@ -0,0 +1,78 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- + +# Warning- und Criticalwerte (u/min) +genua_fan_default_levels = { "lower": ( 2000, 1000), "upper": (8000, 8400) } + +def inventory_genua_fan(info): + # remove empty elements due to alternative enterprise id in snmp_info + info = filter(None, info) + + inventory = [] + for fanNo, fanName, fanRPM, fanState in info[0]: + inventory.append( (fanName, "genua_fan_default_levels") ) + return inventory + +def check_genua_fan(item, params, info): + + # remove empty elements due to alternative enterprise id in snmp_info + info = filter(None, info) + + fanStateStr = { "1":"OK", "2":"Warning", "3":"Critical", + "4":"Unkown", "5":"Unkown", "6":"Unkown"} + + lowerwarn, lowercrit = params["lower"] + upperwarn, uppercrit = params["upper"] + for line in info[0]: + fanNo, fanName, fanRPM, fanState = line + if fanName != item: continue + + rpm = saveint(fanRPM) + + if rpm > uppercrit or rpm < lowercrit: + rpmstate = 2 + rpmsym = "(!!)" + elif rpm > upperwarn or rpm < lowerwarn: + rpmstate = 1 + rpmsym = "(!)" + else: + rpmstate = 0 + rpmsym = "" + + if fanState in ( "3", "4", "5", "6" ): + statestate = 2 + statesym = "(!!)" + elif fanState == "2": + statestate = 1 + statesym = "(!)" + else: + statestate = 0 + statesym = "" + + perfdata = [ ( 'rpm', fanRPM, upperwarn, uppercrit, 0, uppercrit ) ] + infotext = "State: %s %s, RPM: %s %s" % \ + (fanStateStr[fanState], statesym, fanRPM, rpmsym) + state = max(statestate,rpmstate) + return (state, infotext, perfdata) + + return (3, "UNKNOWN - FAN %s not found in SNMP data" % item) + +check_info['genua_fan'] = { + "inventory_function" : inventory_genua_fan, + "check_function" : check_genua_fan, + "service_description": "FAN %s", + "has_perfdata" : True, + "snmp_info" : [( ".1.3.6.1.4.1.3717.2.1.1.1.1",[ + "1", # "fanNo" + "2", # "fanName" + "3", # "fanRPM" + "4" # "fanState" + ]), + ( ".1.3.6.1.4.1.3137.2.1.1.1.1",[ + "1", # "fanNo" + "2", # "fanName" + "3", # "fanRPM" + "4" # "fanState" + ])], + "snmp_scan_function" : lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower() +}

10 years, 11 months

Check_MK Git: check_mk: FIX: LDAP: Custom user attributes can now be synced again

by Lars Michelsen

Module: check_mk Branch: master Commit: 22b9790bb52ef1447e6fb5449a372b76cbc04dad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22b9790bb52ef1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 23 15:49:09 2013 +0200 FIX: LDAP: Custom user attributes can now be synced again --- ChangeLog | 1 + web/plugins/userdb/ldap.py | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99321d3..834cc10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ (This might break code which uses some uncommon chars for varnames) * FIX: Fixed computation of perfometer values, which did not care about the snmp_check_interval. Simplyfied computation of perfometer values + * FIX: LDAP: Custom user attributes can now be synced again BI: * FIX: Fix exception when showing BI tree in reporting time warp diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 77faf2e..a8c1056 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -608,7 +608,7 @@ def ldap_convert_simple(user_id, ldap_user, user, user_attr, attr): else: return {} -def ldap_convert_mail(params, user_id, ldap_user, user): +def ldap_convert_mail(plugin, params, user_id, ldap_user, user): mail = '' if ldap_user.get(params.get('attr', ldap_attr('mail'))): mail = ldap_user[params.get('attr', ldap_attr('mail'))][0].lower() @@ -641,7 +641,7 @@ ldap_attribute_plugins['alias'] = { 'help': _('Populates the alias attribute of the WATO user by syncrhonizing an attribute ' 'from the LDAP user account. By default the LDAP attribute "cn" is used.'), 'needed_attributes': lambda params: [ params.get('attr', ldap_attr('cn')) ], - 'convert': lambda params, user_id, ldap_user, user: \ + 'convert': lambda plugin, params, user_id, ldap_user, user: \ ldap_convert_simple(user_id, ldap_user, user, 'alias', params.get('attr', ldap_attr('cn'))), 'lock_attributes': [ 'alias' ], @@ -657,7 +657,7 @@ ldap_attribute_plugins['alias'] = { # Checks wether or not the user auth must be invalidated (increasing the serial). # In first instance, it must parse the pw-changed field, then check wether or not # a date has been stored in the user before and then maybe increase the serial. -def ldap_convert_auth_expire(params, user_id, ldap_user, user): +def ldap_convert_auth_expire(plugin, params, user_id, ldap_user, user): changed_attr = params.get('attr', ldap_attr('pw_changed')) if not changed_attr in ldap_user: raise MKLDAPException(_('The "Authentication Expiration" attribute (%s) could not be fetched ' @@ -710,7 +710,7 @@ ldap_attribute_plugins['pager'] = { 'of the WATO user accounts, which is then forwarded to Nagios and can be used' 'for notifications. By default the LDAP attribute "mobile" is used.'), 'needed_attributes': lambda params: [ params.get('attr', ldap_attr('mobile')) ], - 'convert': lambda params, user_id, ldap_user, user: \ + 'convert': lambda plugin, params, user_id, ldap_user, user: \ ldap_convert_simple(user_id, ldap_user, user, 'pager', params.get('attr', ldap_attr('mobile'))), 'lock_attributes': ['pager'], @@ -729,10 +729,10 @@ def register_user_attribute_sync_plugins(): ldap_attribute_plugins[attr] = { 'title': val['valuespec'].title(), 'help': val['valuespec'].help(), - 'needed_attributes': lambda params: [ params.get('attr', ldap_attr(attr)) ], - 'convert': lambda params, user_id, ldap_user, user: \ - ldap_convert_simple(user_id, ldap_user, user, attr, - params.get('attr', ldap_attr(attr))), + 'needed_attributes': lambda params: [ params.get('attr', ldap_attr(attr)).lower() ], + 'convert': lambda plugin, params, user_id, ldap_user, user: \ + ldap_convert_simple(user_id, ldap_user, user, plugin, + params.get('attr', ldap_attr(plugin)).lower()), 'lock_attributes': [ attr ], 'parameters': [ ('attr', TextAscii( @@ -745,7 +745,7 @@ def register_user_attribute_sync_plugins(): register_user_attribute_sync_plugins() -def ldap_convert_groups_to_contactgroups(params, user_id, ldap_user, user): +def ldap_convert_groups_to_contactgroups(plugin, params, user_id, ldap_user, user): groups = [] # 1. Fetch CNs of all LDAP groups of the user (use group_dn, group_filter) ldap_groups = ldap_user_groups(user_id, ldap_user['dn'], nested = params.get('nested', False)) @@ -777,7 +777,7 @@ ldap_attribute_plugins['groups_to_contactgroups'] = { ], } -def ldap_convert_groups_to_roles(params, user_id, ldap_user, user): +def ldap_convert_groups_to_roles(plugin, params, user_id, ldap_user, user): groups = [] # 1. Fetch DNs of all LDAP groups of the user ldap_groups = [ g.lower() for g in ldap_user_groups(user_id, ldap_user['dn'], @@ -911,7 +911,7 @@ def ldap_sync(add_to_changelog, only_username): # Gather config from convert functions of plugins for key, params in config.ldap_active_plugins.items(): - user.update(ldap_attribute_plugins[key]['convert'](params or {}, user_id, ldap_user, user)) + user.update(ldap_attribute_plugins[key]['convert'](key, params or {}, user_id, ldap_user, user)) if not mode_create and user == users[user_id]: continue # no modification. Skip this user.

10 years, 11 months

Check_MK Git: check_mk: missing ChangeLog entry for previous commit..

by Andreas Boesl

Module: check_mk Branch: master Commit: b4cf3591826eb06e67292aeca4aa3051577151f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4cf3591826eb0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 23 15:10:20 2013 +0200 missing ChangeLog entry for previous commit.. --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 99321d3..7d0a2e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ * FIX: fixed error handling in SNMP scan, inventory check fails now if SNMP agent is not responding * FIX: Ignore snmp_check_interval cache in interactive situations (e.g. -nv) + * FIX: check_mk config generation: on computing the checks parameters + there is no longer a small chance that existing rules get modified Event Console: * check_mkevents now available as C binary: check_mkevents_c

10 years, 11 months

Check_MK Git: check_mk: ../ChangeLog

by Andreas Boesl

Module: check_mk Branch: master Commit: 34a274774847aa4b1a6b52f9c6c8f551d9b39721 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34a274774847aa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 23 14:49:24 2013 +0200 ../ChangeLog --- modules/check_mk.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 57a254d..6c48f6b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5400,6 +5400,12 @@ def compute_check_parameters(host, checktype, item, params): if type(params) == dict and type(entry) == dict: params.update(entry) else: + if type(entry) == dict: + # The entry still has the reference from the rule.. + # If we don't make a deepcopy the rule might be modified by + # a followup params.update(...) + import copy + entry = copy.deepcopy(entry) params = entry return params

10 years, 11 months

Check_MK Git: check_mk: check now works with any number of carp interfaces greater than 1

by Götz Golla

Module: check_mk Branch: master Commit: 194f9f1d7a16b848e70abac590076f8785430cd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=194f9f1d7a16b8… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Oct 23 13:49:23 2013 +0200 check now works with any number of carp interfaces greater than 1 --- checkman/genua_state_correlation | 18 ++++++++++-------- checks/genua_state_correlation | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/checkman/genua_state_correlation b/checkman/genua_state_correlation index c459cf1..0005332 100644 --- a/checkman/genua_state_correlation +++ b/checkman/genua_state_correlation @@ -4,17 +4,19 @@ catalog: hw/network/genua license: GPL distribution: check_mk description: - This check monitors if the two carp interfaces found on genuscreen devices - have the same carp state. If not, the check is critical. + This check monitors if the two or more carp interfaces found on genuscreen + devices have the same carp state. If not, the check is critical. - The check is known to run with genuscreen version 3.0 and supports genuas regular - enterprise id 3717 as well as the id 3137 which was introduced in a bug in some - versions of genuscreen. + The check is known to run with genuscreen version 3.0 and 4.1, supports + genuas regular enterprise id 3717 as well as the id 3137 which was + introduced in a bug in some versions of genuscreen. perfdata: None inventory: - The inventory process checks if the device has a system description OIDs (.1.3.6.1.2.1.1.2.0) - and if the name of this OID contains "genuscreen" (case insensitive). - If this is true the system is inventorized. + The inventory process checks if the device has a system description OID + of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen" + (case insensitive). + If this is true and at least two carp interfaces are found, then the system + is inventorized. diff --git a/checks/genua_state_correlation b/checks/genua_state_correlation index 482db93..54432cd 100644 --- a/checks/genua_state_correlation +++ b/checks/genua_state_correlation @@ -68,23 +68,23 @@ def check_genua_state(item, _no_params, info): return(3, "Invalid Output from Agent") state = 0 - output = "Node test:" carp_info = [] for ifIndex, ifName, ifType, ifLinkState, ifCarpState in info[0]: if ifType == "6": carp_info.append((ifIndex, ifName, ifType, ifLinkState, ifCarpState)) - if len(carp_info) != 2: - return(3, "Number of carp interfaces is %d, needs to be 2" % len(carp_info)) + # critical if the carp interfaces dont have the same state + carp_states = [ 0, 0, 0 ] + for i in range (0, len(carp_info)): + carp_states[int(carp_info[i][4])] += 1 + if carp_info[0][4] != carp_info[i][4]: + state = 2 - # Output formatieren - output += " %s:%s %s:%s" % (carp_info[0][1], genua_state_str(carp_info[0][4])\ - , carp_info[1][1], genua_state_str(carp_info[1][4])) - - # critical if the two carp interfaces dont have the same state - if carp_info[0][4] != carp_info[1][4]: - state = 2 + output = "Number of carp IFs in states " + for i in ('0', '1', '2'): + output += genua_state_str(i) + output += ":%d " % carp_states[int(i)] return(state, output)

10 years, 11 months

Check_MK Git: check_mk: FIX: Fixed computation of perfometer values ( handle snmp_check_interval)

by Lars Michelsen

Module: check_mk Branch: master Commit: c88dc65e6fd9f162f969b52285c7e29d21e59350 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c88dc65e6fd9f1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 23 13:00:39 2013 +0200 FIX: Fixed computation of perfometer values (handle snmp_check_interval) --- ChangeLog | 2 ++ web/htdocs/sidebar.py | 38 +++++++------------------------------- 2 files changed, 9 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43e6d79..99321d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,8 @@ * FIX: Hosttag filter now works in service related views * FIX: Added code to prevent injection of bogus varnames (This might break code which uses some uncommon chars for varnames) + * FIX: Fixed computation of perfometer values, which did not care about + the snmp_check_interval. Simplyfied computation of perfometer values BI: * FIX: Fix exception when showing BI tree in reporting time warp diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index f8c6ddc..1fe55bd 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -478,39 +478,15 @@ def ajax_speedometer(): # That way we save CPU resources since the computation of the # scheduled checks rate needs to loop over all hosts and services. if last_program_start != program_start: - - # 1. Get data of all active services and of passive/non-check_mk-services. - # For passive services we assume that they are scheduled with the rate the - # is configured via "check_interval". Nagios does not use this setting for i - # passive checks, but we have no other option. + # These days, we configure the correct check interval for Check_MK checks. + # We do this correctly for active and for passive ones. So we can simply + # use the check_interval of all services. Hosts checks are ignored. + # + # Manually added services without check_interval could be a problem, but + # we have no control there. scheduled_rate = html.live.query_summed_stats( "GET services\n" - "Stats: suminv check_interval\n" - "Filter: active_checks_enabled = 1\n" - "Filter: check_command ~ ^check_mk-\n" - "Negate:\n" - "Filter: active_checks_enabled = 0\n" - "And: 2\n" - "Or: 2\n")[0] / 60.0 - - # 3. Acount for check_mk-checks. Here we need to check interval of the - # Check_MK services on the host. Its check rate applies to the passive - # checks. First get the check intervals of the check_mk checks: - intervals = html.live.query_table( - "GET services\n" - "Columns: host_name check_interval\n" - "Filter: description = Check_MK") - - # Now get the number of passive check_mk checks for each host and convert - # it to a dict from host -> number of services - num_svcs = dict(html.live.query_table( - "GET services\n" - "Columns: host_name\n" - "Stats: check_command ~ ^check_mk-")) - - for host_name, check_interval in intervals: - num_services = num_svcs.get(host_name, 0) - scheduled_rate += float(num_services) / check_interval / 60.0 + "Stats: suminv check_interval\n")[0] / 60.0 percentage = 100.0 * current_rate / scheduled_rate; title = _("Scheduled service check rate: %.1f/s, current rate: %.1f/s, that is "

10 years, 11 months

Check_MK Git: check_mk: FIX: Ignore snmp_check_interval cache in interactive situations (e.g. -nv)

by Lars Michelsen

Module: check_mk Branch: master Commit: 5967c5d9adf54983df223c21120895e45ddb1b41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5967c5d9adf549… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 23 12:24:38 2013 +0200 FIX: Ignore snmp_check_interval cache in interactive situations (e.g. -nv) --- modules/check_mk_base.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 205109c..e2990b4 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -369,7 +369,11 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, ignore_che else: table = get_snmp_table(hostname, ipaddress, oid_info) store_cached_checkinfo(hostname, check_type, table) - write_cache_file(cache_relpath, repr(table) + "\n") + # only write cache file in non interactive mode. Otherwise it would + # prevent the regular checking from getting status updates during + # interactive debugging, for example with cmk -nv. + if not opt_dont_submit: + write_cache_file(cache_relpath, repr(table) + "\n") return table # Note: even von SNMP-tagged hosts TCP based checks can be used, if

10 years, 11 months

← Newer
1
...
5
6
7
8
9
10
11
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013