Checkmk git commits July 2011

checkmk-commits@lists.checkmk.com

2 participants
40 discussions

Check_MK Git: check_mk: add bug entry for IPMI agent issue

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e64f82c1e19d15379189671299b12be77af877f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e64f82c1e19d15… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Jul 18 15:49:13 2011 +0200 add bug entry for IPMI agent issue --- .bugs/311 | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.bugs/311 b/.bugs/311 index 9c6b387..e7faede 100644 --- a/.bugs/311 +++ b/.bugs/311 @@ -1,11 +1,14 @@ -Title: manual SNMP checks without scan function not visible in WATO -Component: wato -Benefit: 1 +Title: IPMI cache initialization race condition +Component: checks +Benefit: 6 State: open -Cost: 3 -Date: 2011-06-29 12:56:31 -Class: bug +Cost: 4 +Date: 2011-07-18 15:42:34 +Class: nastiness -When showing the services table of a host in WATO without -Full Scan, then manually configured SNMP services with -out a scan function will not be displayed (e.g. snmp_uptime) +there is a very nasty issue with the IPMI agent code - we +kills the initial build of the SDR cache there will be no point in re-doing the scan and IPMI will be disabled forever. +The problem is that many IPMI modules are not able to handle concurrent requests. If building the SDR cache takes longer than 55+ seconds then we gh chance that a new check_mk_agent call happens via inetd. This second call will cause an IPMI issue which will cause the SDR cache scan to fail. +From that time on, IPMI will be disabled / broken. + +Very ugly issue, maybe xinetd can disable multiple runs of the same service (but this would mean staleness issues will stop the agent forever)

13 years, 4 months

Check_MK Git: check_mk: New bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f3b91176e836fd67459daee43a53137050c8c5be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3b91176e836fd… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 22 09:50:32 2011 +0200 New bug entry --- .bugs/312 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/312 b/.bugs/312 new file mode 100644 index 0000000..e9dd89a --- /dev/null +++ b/.bugs/312 @@ -0,0 +1,10 @@ +Title: FreeBSD ifcounters broken +Component: checks +Benefit: 3 +State: open +Cost: 1 +Date: 2011-07-21 10:52:51 +Class: bug + +The interface counters are outputting one field twice +Reported by Scott & Mark McCorke

13 years, 4 months

Check_MK Git: check_mk: New bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a6e61fe1873cd691719f23b2251a62ae9c57ac62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6e61fe1873cd6… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 22 09:50:48 2011 +0200 New bug entry --- .bugs/313 | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/.bugs/313 b/.bugs/313 new file mode 100644 index 0000000..ebc3af1 --- /dev/null +++ b/.bugs/313 @@ -0,0 +1,18 @@ +Title: Change agent NTP check to skip reverse resolution of NTP clocks +Component: checks +Benefit: 5 +State: open +Cost: 3 +Date: 2011-07-21 10:54:02 +Class: feature + +The ntpq -p call will do one reverse lookup per NTP clock. +This is slowing down check_mk_agent by a moment for systems +with few clocks and fast DNS servers, or not slowing down at all when +just using files as hosts source. +BUT if there is any rDNS issue (think windows admins doing the DNS) or if theres +notable latency to the DNS servers (i.e. when using "pool pool.ntp.org") then this +will slow down the agent run by many seconds. + +We should discuss switching to ntpq -n -p to disable hostname lookups. +(Suggestion from "Sonic" on the mailing list)

13 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ef82d0d182af4f40b197e487b1cbf97be7c60117 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef82d0d182af4f… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 22 09:51:10 2011 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

13 years, 4 months

Check_MK Git: check_mk: WATO: support original folder when doing imports

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6364f282fefe900202b28a1a8d4b8db1d687d609 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6364f282fefe90… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 15 15:40:06 2011 +0200 WATO: support original folder when doing imports --- web/htdocs/wato.py | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 140 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index faf7891..5c446b0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -475,14 +475,17 @@ def check_wato_filename(htmlvarname, name, what): if not re.match("^[-a-z0-9A-Z_]*$", name): raise MKUserError(htmlvarname, _("Invalid %s name. Only the characters a-z, A-Z, 0-9, _ and - are allowed.") % what) -def create_wato_filename(title, what): +def create_wato_filename(title, what, in_folder = None): + if in_folder == None: + in_folder = g_folder + basename = convert_title_to_filename(title) c = 1 name = basename while True: - if what == "folder" and name not in g_folder[".folders"]: + if what == "folder" and name not in in_folder[".folders"]: break - elif what == "file" and name + ".mk" not in g_folder[".files"]: + elif what == "file" and name + ".mk" not in in_folder[".files"]: break c += 1 name = "%s-%d" % (basename, c) @@ -573,6 +576,10 @@ def mode_file(phase): num_moved = move_hosts_to(selected_hosts, target_file) return None, _("Successfully moved %d hosts to %s") % (num_moved, target_file) + # Move to target folder (from import) + elif html.var("_bulk_movetotarget"): + return move_to_imported_folders(selected_hosts) + elif html.var("_bulk_edit"): return "bulkedit" @@ -615,6 +622,7 @@ def mode_file(phase): search_text = html.var("search") selected_hosts = get_hostnames_from_checkboxes() + at_least_one_imported = False for hostname in hostnames: if search_text and (search_text.lower() not in hostname.lower()): continue @@ -667,6 +675,13 @@ def mode_file(phase): html.write("</td>") html.write("</tr>\n") + # Remember if that host has a target folder (i.e. was imported with + # a folder information but not yet moved to that folder). If at least + # one host has a target folder, then we show an additional bulk action. + if effective.get("imported_folder"): + at_least_one_imported = True + + # bulk actions html.write('<tr class="data %s0"><td class=select>' % odd) html.jsbutton('_markall', 'X', 'javascript:wato_check_all(\'wato_select\');') @@ -677,6 +692,8 @@ def mode_file(phase): html.button("_bulk_cleanup", _("Cleanup")) html.button("_bulk_inventory", _("Inventory")) host_move_combo(None) + if at_least_one_imported: + html.button("_bulk_movetotarget", _("Move to Target Folders")) html.write("</td></tr>\n") html.write("</table>\n") @@ -980,6 +997,107 @@ def search_hosts_in_file(the_folder, the_file, crit): return len(found) +def move_to_imported_folders(hosts): + c = wato_confirm( + _("Confirm moving hosts"), + _('You are going to move the selected hosts to folders ' + 'representing their original folder location in the system ' + 'you did the import from. Please make sure that you have ' + 'done an <b>inventory</b> before moving the hosts.')) + if c == False: # not yet confirmed + return "" + elif not c: + return None # browser reload + + # Create groups of hosts with the same target folder + targets = {} + for hostname in hosts: + host = g_hosts[hostname] + effective = effective_attributes(host, g_file) + imported_folder = effective.get('imported_folder') + if imported_folder == None: + continue + targets.setdefault(imported_folder, []).append(hostname) + + # Remove target folder information, now that the hosts are + # at their target position. + del host['imported_folder'] + + # Now handle each target folder + num_moved = 0 + for imported_folder, hosts in targets.items(): + # Next problem: The folder path in imported_folder refers + # to the Alias of the folders, not to the internal file + # name. And we need to create folders not yet existing. + target_file = create_target_file_from_aliaspath(imported_folder) + num_moved += move_hosts_to(hosts, target_file) + + save_folder_config() + html.reload_sidebar() # refresh WATO snapin + return None, _("Successfully moved %d hosts to their original folder destinations.") % num_moved + + +def create_target_file_from_aliaspath(aliaspath): + # The alias path is a '/' separated path of folder titles. + # An empty path is interpreted as root path. The actual file + # name is the host list with the name "Hosts". + if aliaspath == "": + folder = g_root_folder + else: + parts = aliaspath.split("/") + folder = g_root_folder + while len(parts) > 0: + # Look in current folder for subfolder with the target name + for name, f in folder.get(".folders", {}).items(): + if f["title"] == parts[0]: + folder = f + parts = parts[1:] + break + else: # not found. Create this folder + name = create_wato_filename(parts[0], "folder", folder) + new_folder = { + ".name" : name, + ".path" : folder[".path"] + (name,), + "title" : parts[0], + "roles" : folder["roles"], + "attributes" : {}, + ".folders" : {}, + ".files" : {}, + } + folder[".folders"][name] = new_folder + folder = new_folder + parts = parts[1:] + + # Now folder points to the folder the host needs to be created + # in. In that folder we put the host into the host list "hosts.mk". + if "hosts" not in folder[".files"]: + new_file = { + ".name" : "hosts.mk", + ".path" : folder[".path"] + ("hosts.mk",), + "title" : _("Hosts"), + "roles" : folder["roles"], + "attributes" : {}, + "num_hosts" : 0, + } + folder[".files"]["hosts.mk"] = new_file + g_files[new_file[".path"]] = new_file + + the_file = folder[".files"]["hosts.mk"] + return "/" + "/".join(the_file[".path"]) + + + + + + + + + + + + + + # +----------------------------------------------------------------------+ # | ____ _ _ ___ _ | # | | __ ) _ _| | | __ |_ _|_ ____ _____ _ __ | |_ ___ _ __ _ _ | @@ -2365,6 +2483,25 @@ class TextAttribute(Attribute): value = "" return crit.lower() in value.lower() +# A simple text attribute that is not editable by the user. +# It can be used to store context information from other +# systems (e.g. during an import of a host database from +# another system). +class FixedTextAttribute(TextAttribute): + def __init__(self, name, title, help = None): + TextAttribute.__init__(self, name, title, help, None) + self._mandatory = False + + def render_input(self, value): + if value != None: + html.hidden_field("attr_" + self.name(), value) + html.write(value) + + def from_html_vars(self): + return html.var("attr_" + self.name()) + + + class IPAddressAttribute(TextAttribute): def __init__(self, name, title, help = None, mandatory = False, dnslookup = False):

13 years, 4 months

Check_MK Git: check_mk: if/i64 fixed operstate monitoring ( and this time not roll in an older version, too)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4bd0ed2fb4bc659b43b223380d1eac6a49e95350 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bd0ed2fb4bc65… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 15 10:02:32 2011 +0200 if/i64 fixed operstate monitoring (and this time not roll in an older version, too) --- checks/if.include | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/if.include b/checks/if.include index 8213c17..fd701e5 100644 --- a/checks/if.include +++ b/checks/if.include @@ -136,7 +136,7 @@ def check_if_common(item, params, info): elif len(params) == 5: err_warn, err_crit, targetspeed, bw_warn, bw_crit = params elif len(params) == 6: - err_warn, err_crit, targetspeed, bw_warn, bw_crit, allowed_operstates = params + err_warn, err_crit, targetspeed, bw_warn, bw_crit, targetstate = params for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ @@ -170,7 +170,7 @@ def check_if_common(item, params, info): operstatus = if_statename(str(ifOperStatus)) if targetstate and \ (ifOperStatus != targetstate - and not (type(targetstate) == list and ifOperStatus in targetstate)): + and not (type(targetstate) in [ list, tuple ] and ifOperStatus in targetstate)): state = 2 infotext += "(%s!!) " % operstatus else:

13 years, 4 months

Check_MK Git: check_mk: revert my patch for review

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b806fb4c10573655702ef02e1eda470268fbb278 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b806fb4c105736… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Jul 14 00:10:31 2011 +0200 revert my patch for review Revert "if/if64 fixed operstate monitoring" This reverts commit 9c84661c2adf6a05e1d075624b957dbf8cd0f89e. Conflicts: ChangeLog --- ChangeLog | 10 ------ checks/if.include | 87 ++++++++++++++++++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68824e7..93f605f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,8 @@ 1.1.11i2: Core, Setup, etc.: * FIX: sort output of cmk --list-hosts alphabetically - * FIX: Fixed .* in SNMP scan function when using stored SNMP walks - * FIX: Fixed OID_END handling in SNMP based checks (e.g. canon_pages) Checks & Agents: - * FIX: Problems with { and } in manpage parsing has been fixed * FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) * FIX: Added PNP-template for winperf_phydisk * FIX: if64: fix UNKNOWN in case of non-unique ifAlias @@ -23,7 +20,6 @@ * vbox_guest: new check for checking guest additions of Linux virtual box hosts * if/if64: Fixed bug in operstate detection when using old tuple based params * if/if64: Fixed bug in operstate detection when using tuple of valid operstates - * windows_updates: Added missing manpage Multisite: * FIX: make non-Ascii characters in services names work again @@ -35,8 +31,6 @@ * Introduced basic infrastructure for multilanguage support in Multisite * Make 'Views' snapin foldable * Replace old main view by dashboard. - * new filter for WATO folder of host - * added icons to context buttons WATO: * Configration files can now be administered via the WEB UI @@ -54,10 +48,6 @@ MK Livestatus: * FIX: fix compile problem on Debian unstable (Thanks to Sven Velt) * Column aggregation (Stats) now also works for perf_data - * hosts, services & contacts: new column custom_variables (this is - a dictionary of all custom variables) - * new column 'filename' in table host (value of variable _FILENAME) - * Updated Python-API to most current version 1.1.11i1: Core, Setup, etc.: diff --git a/checks/if.include b/checks/if.include index 9dcf206..8213c17 100644 --- a/checks/if.include +++ b/checks/if.include @@ -68,20 +68,29 @@ def inventory_if_common(info): if len(info) == 0 or len(info[0]) != 19: return [] pre_inventory = [] + + seen_items = set([]) + duplicate = set([]) for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, inmcast, inbcast, ifInDiscards, \ ifInErrors, ifOutOctets, outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias in info: ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) - if ifType in if_inventory_porttypes and ifOperStatus in if_inventory_portstates: - if if_inventory_uses_description and ifDescr: - item = ifDescr - elif if_inventory_uses_alias and ifAlias: - item = ifAlias - else: - item = ifIndex + # compute item now - also for unmonitored ports - in order to see if it + # is uninque. + if if_inventory_uses_description and ifDescr: + item = ifDescr + elif if_inventory_uses_alias and ifAlias: + item = ifAlias + else: + item = ifIndex + if item in seen_items: # duplicate + duplicate.add(item) + seen_items.add(item) + + if ifType in if_inventory_porttypes and ifOperStatus in if_inventory_portstates: paramstring = '{ "errors" : if_default_error_levels, ' \ '"traffic" : if_default_traffic_levels, ' \ '"average" : if_default_average ' @@ -95,13 +104,6 @@ def inventory_if_common(info): pre_inventory.append( (item, paramstring, int(ifIndex)) ) # Check for duplicate items (e.g. when using Alias as item and the alias is not unique) - seen_items = set([]) - duplicate = set([]) - for item, params, index in pre_inventory: - if item in seen_items: # duplicate - duplicate.add(item) - seen_items.add(item) - inventory = [] for item, params, index in pre_inventory: if item in duplicate: @@ -109,6 +111,7 @@ def inventory_if_common(info): else: new_item = item inventory.append((new_item, params)) + return inventory @@ -133,21 +136,25 @@ def check_if_common(item, params, info): elif len(params) == 5: err_warn, err_crit, targetspeed, bw_warn, bw_crit = params elif len(params) == 6: - err_warn, err_crit, targetspeed, bw_warn, bw_crit, targetstate = params + err_warn, err_crit, targetspeed, bw_warn, bw_crit, allowed_operstates = params - for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, inmcast, inbcast, ifInDiscards, \ - ifInErrors, ifOutOctets, outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias in info: + for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ + inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ + outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ + ifOutQLen, ifAlias in info: ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) if item == ifIndex \ or item == ifAlias \ or item == ifDescr \ - or item == "%s %s" % (ifAlias, ifIndex): + or item == "%s %s" % (ifAlias, ifIndex) \ + or item == "%s %s" % (ifDescr, ifIndex): # Display port number or alias in infotext if that is not part # of the service description anyway - if item == ifIndex and (item == ifAlias or ifAlias == '') and (item == ifDescr or ifDescr == ''): # description trivial + if item == ifIndex and (item == ifAlias or ifAlias == '') \ + and (item == ifDescr or ifDescr == ''): # description trivial infotext = "" elif item == "%s %s" % (ifAlias, ifIndex) and ifDescr != '': # non-unique Alias infotext = "[%s/%s]" % (ifAlias, ifDescr) @@ -158,23 +165,20 @@ def check_if_common(item, params, info): else: infotext = "[%s] " % ifIndex + state = 0 + operstatus = if_statename(str(ifOperStatus)) if targetstate and \ (ifOperStatus != targetstate - and not (type(targetstate) in [ list, tuple ] and ifOperStatus in targetstate)): - return (2, "CRIT - %soperstatus: %s (CRIT)" % (infotext, operstatus)) - infotext += "(%s) " % operstatus + and not (type(targetstate) == list and ifOperStatus in targetstate)): + state = 2 + infotext += "(%s!!) " % operstatus + else: + infotext += "(%s) " % operstatus - state = 0 - # Check speed + # prepare reference speed for computing relative bandwidth usage speed = saveint(ifSpeed) - infotext += get_nic_speed_human_readable(speed) - if not targetspeed is None and speed != targetspeed: - infotext += " (wrong speed! expected: %s)" % get_nic_speed_human_readable(targetspeed) - state = 1 - - # convert percentages to absolute values and vice verca - if possible if speed: ref_speed = speed / 8.0 elif targetspeed: @@ -182,13 +186,34 @@ def check_if_common(item, params, info): else: ref_speed = None - # convert percentages to absolute values if reference speed available + # Check speed settings of interface, but only if speed information + # is available. This is not always the case. + if speed: + infotext += get_nic_speed_human_readable(speed) + if not targetspeed is None and speed != targetspeed: + infotext += " (wrong speed! expected: %s)" % get_nic_speed_human_readable(targetspeed) + state = max(state, 1) + elif targetspeed: + infotext += "assuming %s" % get_nic_speed_human_readable(targetspeed) + else: + infotext += "speed unknown" + + # convert percentages to absolute values if levels are float + # this is only possible if a reference speed is available. if ref_speed: if bw_warn != None and type(bw_warn) == float: bw_warn = bw_warn / 100.0 * ref_speed if bw_crit != None and type(bw_crit) == float: bw_crit = bw_crit / 100.0 * ref_speed + # Ignore percentual levels if no reference speed is available + else: + if bw_warn != None and type(bw_warn) == float: + bw_warn = None + + if bw_crit != None and type(bw_crit) == float: + bw_crit = None + # Performance counters this_time = time.time() rates = []

13 years, 4 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f9b657c6b30125c9d673edf30f985608b792b945 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9b657c6b30125… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jul 12 14:46:49 2011 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index ec6cab0..947e93b 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -331 +341

13 years, 4 months

Check_MK Git: check_mk: if/if64 fixed operstate monitoring

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c84661c2adf6a05e1d075624b957dbf8cd0f89e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c84661c2adf6a… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jul 12 14:02:02 2011 +0200 if/if64 fixed operstate monitoring --- ChangeLog | 2 + checks/if.include | 87 +++++++++++++++++++---------------------------------- 2 files changed, 33 insertions(+), 56 deletions(-) diff --git a/ChangeLog b/ChangeLog index abded47..93f605f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ * lnx_if: treat interfaces without information from ethtool as softwareLoopback interface. The will not be found by inventory now. * vbox_guest: new check for checking guest additions of Linux virtual box hosts + * if/if64: Fixed bug in operstate detection when using old tuple based params + * if/if64: Fixed bug in operstate detection when using tuple of valid operstates Multisite: * FIX: make non-Ascii characters in services names work again diff --git a/checks/if.include b/checks/if.include index 8213c17..9dcf206 100644 --- a/checks/if.include +++ b/checks/if.include @@ -68,29 +68,20 @@ def inventory_if_common(info): if len(info) == 0 or len(info[0]) != 19: return [] pre_inventory = [] - - seen_items = set([]) - duplicate = set([]) for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, inmcast, inbcast, ifInDiscards, \ ifInErrors, ifOutOctets, outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias in info: ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) - # compute item now - also for unmonitored ports - in order to see if it - # is uninque. - if if_inventory_uses_description and ifDescr: - item = ifDescr - elif if_inventory_uses_alias and ifAlias: - item = ifAlias - else: - item = ifIndex - - if item in seen_items: # duplicate - duplicate.add(item) - seen_items.add(item) - if ifType in if_inventory_porttypes and ifOperStatus in if_inventory_portstates: + if if_inventory_uses_description and ifDescr: + item = ifDescr + elif if_inventory_uses_alias and ifAlias: + item = ifAlias + else: + item = ifIndex + paramstring = '{ "errors" : if_default_error_levels, ' \ '"traffic" : if_default_traffic_levels, ' \ '"average" : if_default_average ' @@ -104,6 +95,13 @@ def inventory_if_common(info): pre_inventory.append( (item, paramstring, int(ifIndex)) ) # Check for duplicate items (e.g. when using Alias as item and the alias is not unique) + seen_items = set([]) + duplicate = set([]) + for item, params, index in pre_inventory: + if item in seen_items: # duplicate + duplicate.add(item) + seen_items.add(item) + inventory = [] for item, params, index in pre_inventory: if item in duplicate: @@ -111,7 +109,6 @@ def inventory_if_common(info): else: new_item = item inventory.append((new_item, params)) - return inventory @@ -136,25 +133,21 @@ def check_if_common(item, params, info): elif len(params) == 5: err_warn, err_crit, targetspeed, bw_warn, bw_crit = params elif len(params) == 6: - err_warn, err_crit, targetspeed, bw_warn, bw_crit, allowed_operstates = params + err_warn, err_crit, targetspeed, bw_warn, bw_crit, targetstate = params - for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ - inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ - outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ - ifOutQLen, ifAlias in info: + for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, inmcast, inbcast, ifInDiscards, \ + ifInErrors, ifOutOctets, outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias in info: ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) if item == ifIndex \ or item == ifAlias \ or item == ifDescr \ - or item == "%s %s" % (ifAlias, ifIndex) \ - or item == "%s %s" % (ifDescr, ifIndex): + or item == "%s %s" % (ifAlias, ifIndex): # Display port number or alias in infotext if that is not part # of the service description anyway - if item == ifIndex and (item == ifAlias or ifAlias == '') \ - and (item == ifDescr or ifDescr == ''): # description trivial + if item == ifIndex and (item == ifAlias or ifAlias == '') and (item == ifDescr or ifDescr == ''): # description trivial infotext = "" elif item == "%s %s" % (ifAlias, ifIndex) and ifDescr != '': # non-unique Alias infotext = "[%s/%s]" % (ifAlias, ifDescr) @@ -165,20 +158,23 @@ def check_if_common(item, params, info): else: infotext = "[%s] " % ifIndex - state = 0 - operstatus = if_statename(str(ifOperStatus)) if targetstate and \ (ifOperStatus != targetstate - and not (type(targetstate) == list and ifOperStatus in targetstate)): - state = 2 - infotext += "(%s!!) " % operstatus - else: - infotext += "(%s) " % operstatus + and not (type(targetstate) in [ list, tuple ] and ifOperStatus in targetstate)): + return (2, "CRIT - %soperstatus: %s (CRIT)" % (infotext, operstatus)) + infotext += "(%s) " % operstatus + state = 0 - # prepare reference speed for computing relative bandwidth usage + # Check speed speed = saveint(ifSpeed) + infotext += get_nic_speed_human_readable(speed) + if not targetspeed is None and speed != targetspeed: + infotext += " (wrong speed! expected: %s)" % get_nic_speed_human_readable(targetspeed) + state = 1 + + # convert percentages to absolute values and vice verca - if possible if speed: ref_speed = speed / 8.0 elif targetspeed: @@ -186,34 +182,13 @@ def check_if_common(item, params, info): else: ref_speed = None - # Check speed settings of interface, but only if speed information - # is available. This is not always the case. - if speed: - infotext += get_nic_speed_human_readable(speed) - if not targetspeed is None and speed != targetspeed: - infotext += " (wrong speed! expected: %s)" % get_nic_speed_human_readable(targetspeed) - state = max(state, 1) - elif targetspeed: - infotext += "assuming %s" % get_nic_speed_human_readable(targetspeed) - else: - infotext += "speed unknown" - - # convert percentages to absolute values if levels are float - # this is only possible if a reference speed is available. + # convert percentages to absolute values if reference speed available if ref_speed: if bw_warn != None and type(bw_warn) == float: bw_warn = bw_warn / 100.0 * ref_speed if bw_crit != None and type(bw_crit) == float: bw_crit = bw_crit / 100.0 * ref_speed - # Ignore percentual levels if no reference speed is available - else: - if bw_warn != None and type(bw_warn) == float: - bw_warn = None - - if bw_crit != None and type(bw_crit) == float: - bw_crit = None - # Performance counters this_time = time.time() rates = []

13 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8e874eacec4625db057008f968ff2acdea93fe41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e874eacec4625… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jul 12 14:42:18 2011 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

13 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2011