Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: alcatel_power: Check for power supplies on Alcatel switches

by Bastian Kuhn

Module: check_mk Branch: master Commit: 94ed7d815c2cb1f790c06a87a82ce0b7e5f205dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94ed7d815c2cb1… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 15 14:07:44 2013 +0200 alcatel_power: Check for power supplies on Alcatel switches --- ChangeLog | 1 + checkman/alcatel_power | 16 +++++++++++++++ checks/alcatel_power | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/ChangeLog b/ChangeLog index c67ff50..7fd8a10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * FIX: esx_vsphere_counters: added missing ramdisk type upgradescratch * FIX: esx_vsphere_hostsystem: fixed bug in handling of params * steelhead_perrs: New check for Rivergate Gateways + * alcatel_power: Check for power supplies on Alcatel switches WATO: * You can now have site-specific global settings when using diff --git a/checkman/alcatel_power b/checkman/alcatel_power new file mode 100644 index 0000000..36428d9 --- /dev/null +++ b/checkman/alcatel_power @@ -0,0 +1,16 @@ +title: Alcatel switches: Power Supplies +agents: snmp +catalog: hw/network +license: GPL +distribution: check_mk +description: + This check monitors the health of power supplies in + Alcatel switches. If one of the two power supplies fails, the + check returns {CRIT}. + +item: + The ID of the power supply as output from the SNMP agent. + +inventory: + One check is created for each power supply. + diff --git a/checks/alcatel_power b/checks/alcatel_power new file mode 100644 index 0000000..6042249 --- /dev/null +++ b/checks/alcatel_power @@ -0,0 +1,52 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +def inventory_alcatel_power(info): + return [ (x[0], None) for x in info if x[2] in ['0x35000001', '0x45000004']] + +def check_alcatel_power(item, _no_params, info): + for line in info: + if item == line[0]: + if line[2] not in ['0x35000001', '0x45000004']: + return 3, "No Power supply connected to this port" + if int(line[1]) != 1: + return 2, "Supply in error condition (%s)" % line[1] + return 0, "Supply status OK" + return 3, "Supply not found" + +check_info["alcatel_power"] = { + "check_function" : check_alcatel_power, + "inventory_function" : inventory_alcatel_power, + "service_description" : "Power Supply %s", + "has_perfdata" : False, + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.6486.800"), + "snmp_info" : (".1.3.6.1.4.1.6486.800.1.1.1.1.1.1.1", + [OID_END, + 2, # Error Status + 5 # Device Type (0x35000001 == Power Supply) + ]), +} +

10 years, 11 months

Check_MK Git: check_mk: esx_vsphere_hostsystem: fixed bug in params handling

by Andreas Boesl

Module: check_mk Branch: master Commit: e5fc60fc70816f00563d6b710b47300f6409c397 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5fc60fc70816f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 15 12:33:38 2013 +0200 esx_vsphere_hostsystem: fixed bug in params handling --- ChangeLog | 1 + checks/esx_vsphere_hostsystem | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4b76ec7..7825bb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ make WATO-configable * check_sql: Database port can now be explicitly set * FIX: esx_vsphere_counters: added missing ramdisk type upgradescratch + * FIX: esx_vsphere_hostsystem: fixed bug in handling of params WATO: * You can now have site-specific global settings when using diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index eaf55dd..aec2a42 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -257,6 +257,7 @@ def check_esx_vsphere_hostsystem_multipath(item, params, info): standby_label = "(!)" state = max(state_infos["standby"][1], state) else: + state = 0 for state_name, state_values in state_infos.items(): if params.get(state_name): warn, crit = params.get(state_name)

10 years, 11 months

Check_MK Git: check_mk: FIX: Fixed searching hosts by aliases/adresses

by Lars Michelsen

Module: check_mk Branch: master Commit: 2567a846399bf86d58a5f1d243e20518198ef7ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2567a846399bf8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 15 10:23:32 2013 +0200 FIX: Fixed searching hosts by aliases/adresses --- ChangeLog | 1 + web/htdocs/sidebar.py | 77 +++++++++++++++++++++++++++++------------ web/plugins/sidebar/search.py | 8 +++++ 3 files changed, 64 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ebc0c5..6bb2b3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ are omitted, since they do not really matter and make the results less useful when using CMC. * FIX: Fixed encoding problem in webservice column output + * FIX: Fixed searching hosts by aliases/adresses Checks & Agents: * diskstat: removed (ever incorrect) latency computation for Linux diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index e134dc9..8e9c1aa 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -653,20 +653,23 @@ def search_livestatus(ty, q): except: limit = 80 - filt = [] - for plugin in search_plugins: - if plugin['type'] == ty and 'filter_func' in plugin: - f = plugin['filter_func'](q) - if f: - filt.append(f) - if filt: - filt.append('Or: %d\n' % (len(filt))) - + # We need to know which plugin lead to finding a particular host, so it + # is neccessary to make one query for each plugin - sorry. For example + # for the case, that a host can be found via alias or name. + data = [] column = ty == 'service' and 'description' or 'name' - lq = "GET %ss\nCache: reload\nColumns: %s\n%sLimit: %d\n" % \ - (ty, column, ''.join(filt), limit) html.live.set_prepend_site(True) - data = html.live.query(lq) + for plugin in search_plugins: + if plugin['type'] != ty or 'filter_func' not in plugin: + continue + + f = plugin['filter_func'](q) + if f: + lq = "GET %ss\nCache: reload\nColumns: %s\n%sLimit: %d\n" % \ + (ty, column, f, limit) + data += [ [ plugin['id'] ] + row for row in html.live.query(lq) ] + if len(data) >= limit: + break html.live.set_prepend_site(False) # Some special plugins fetch host data, but do own livestatus @@ -683,7 +686,7 @@ def search_livestatus(ty, q): def sort_data(data): sorted_data = set([]) for entry in data: - entry = ('', entry[1]) + entry = (entry[0], '', entry[2]) if entry not in sorted_data: sorted_data.add(entry) sorted_data = list(sorted_data) @@ -704,17 +707,17 @@ def render_search_results(ty, objects): display_site = False for obj in objects: if only_site is None: - only_site = obj[0] - elif only_site != obj[0]: + only_site = obj[1] + elif only_site != obj[1]: display_site = True break for obj in objects: - if len(obj) == 2: - site, name = obj + if len(obj) == 3: + plugin, site, name = obj url = url_tmpl % {'name': name, 'site': site} else: - site, name, url = obj + plugin, site, name, url = obj html.write('<a id="result_%s" class="%s" href="%s" onClick="mkSearchClose()" target="main">%s' % (name, ty, url, name)) if display_site: @@ -747,6 +750,11 @@ def ajax_search(): except Exception, e: html.write(repr(e)) +def get_search_plugin(plugin_id): + for plugin in search_plugins: + if plugin['id'] == plugin_id: + return plugin + def search_open(): q = html.var('q').strip() if not q: @@ -756,13 +764,38 @@ def search_open(): if ty is None: return + cleaned_search_string = parse_search_query(q)[1] + if len(data) == 1: - if len(data[0]) == 2: - url = search_url_tmpl(ty) % {'name': html.urlencode(data[0][1]), 'site': data[0][0]} + if len(data[0]) == 3: + # Check wether or not the plugin which found the first match registered + # an own url template, use this if provided. + plugin = get_search_plugin(data[0][0]) + if 'url_tmpl' in plugin: + url_tmpl = plugin['url_tmpl'] + else: + url_tmpl = search_url_tmpl(ty) + url = url_tmpl % { + 'name' : html.urlencode(data[0][2]), + 'search' : html.urlencode(cleaned_search_string), + 'site' : data[0][1], + } else: - url = data[0][2] + url = data[0][3] else: - url = search_url_tmpl(ty, exact = False) % {'name': html.urlencode(parse_search_query(q)[1]), 'site': ''} + # Check wether or not the plugin which found the first match registered + # an own url template, use this if provided. + url_tmpl = search_url_tmpl(ty, exact = False) + if data: + plugin = get_search_plugin(data[0][0]) + if 'url_tmpl' in plugin: + url_tmpl = plugin['url_tmpl'] + + url = url_tmpl % { + 'name' : html.urlencode(cleaned_search_string), + 'search' : html.urlencode(cleaned_search_string), + 'site' : '', + } html.set_http_header('Location', url) from mod_python import apache diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 3add208..a574b9d 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -111,21 +111,25 @@ def search_filter_name(q, column = 'name'): return 'Filter: %s ~~ %s\n' % (column, q) search_plugins.append({ + 'id' : 'name', 'type' : 'host', 'filter_func' : search_filter_name, }) search_plugins.append({ + 'id' : 'name', 'type' : 'service', 'filter_func' : lambda q: search_filter_name(q, 'description'), }) search_plugins.append({ + 'id' : 'name', 'type' : 'hostgroup', 'filter_func' : search_filter_name, }) search_plugins.append({ + 'id' : 'name', 'type' : 'servicegroup', 'filter_func' : search_filter_name, }) @@ -135,14 +139,18 @@ def search_filter_ipaddress(q): return 'Filter: address ~~ %s\n' % q search_plugins.append({ + 'id' : 'address', 'type' : 'host', 'filter_func' : search_filter_ipaddress, + 'url_tmpl' : 'view.py?view_name=searchhost&host_address=%(search)s&filled_in=filter' }) def search_filter_alias(q): return 'Filter: alias ~~ %s\n' % q search_plugins.append({ + 'id' : 'alias', 'type' : 'host', 'filter_func' : search_filter_alias, + 'url_tmpl' : 'view.py?view_name=searchhost&hostalias=%(search)s&filled_in=filter' })

10 years, 11 months

Check_MK Git: check_mk: Added perfdata information to SAP check man pages

by Mathias Kettner

Module: check_mk Branch: master Commit: 8563c7db6744dff37dc2a42c1cb3b3dc6c3ea726 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8563c7db6744df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 15 04:42:23 2013 +0200 Added perfdata information to SAP check man pages --- .bugs/1038 | 10 ++++++++-- .bugs/1062 | 7 +++++-- checkman/sap.dialog | 5 +++++ checkman/sap.value | 4 ++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.bugs/1038 b/.bugs/1038 index 599d053..30590f2 100644 --- a/.bugs/1038 +++ b/.bugs/1038 @@ -1,9 +1,9 @@ Title: problem with mrpe if lable has white space characters Component: checks -State: open +Class: bug +State: wontfix Date: 2013-08-27 12:12:33 Targetversion: future -Class: bug habe heute eine seltsame Sache mit einigen MRPE Checks gehabt. Falls die Checks Performance Daten liefern und das Label der Performance Daten @@ -64,3 +64,9 @@ mrpe.diff + perfdata.append(parts[1].strip()) else: perfdata = [] + +2013-10-15 04:17:00: changed state open -> wontfix +Check_MK unterstützt keine Leerzeichen in Variablennamen von +Perfdaten. Hat es noch nie. Auch der Microcore kann's nicht. +Widerspricht dem Nagios-Standard. Die Spaces machen sowieso +auch an vielen anderen Stellen Probleme. diff --git a/.bugs/1062 b/.bugs/1062 index 34250a4..2095e9d 100644 --- a/.bugs/1062 +++ b/.bugs/1062 @@ -1,11 +1,14 @@ Title: mismatch between check and check manpages for plugin sap Component: checks -State: open +Class: bug +State: done Date: 2013-10-04 12:34:09 Targetversion: 1.2.3i3 -Class: bug the sap checks provide perfdata but the manpages sap.dialog and sap.value tell, it does not perfdata need to be documented in the both manpages + +2013-10-15 04:42:11: changed state open -> done +Done. diff --git a/checkman/sap.dialog b/checkman/sap.dialog index c95f587..79432c4 100644 --- a/checkman/sap.dialog +++ b/checkman/sap.dialog @@ -20,3 +20,8 @@ item: inventory: The check creates a check for each SAP system ID which at least provides the {SAP CCMS Monitor Templates/Dialog Overview/Dialog Response Time/ResponseTime}. + +perfdata: + As long as your R/3 has not been configured in an unusual way, four + values are output: (1) the number of users logged in, (2) the standard transaction's response time, + (3) The front end net time and (4) the response time - all in milliseconds diff --git a/checkman/sap.value b/checkman/sap.value index 12e8f00..cab0507 100644 --- a/checkman/sap.value +++ b/checkman/sap.value @@ -31,6 +31,10 @@ inventory: node found on the target host. If an entry matches, a new check will be created according to the entry (if it's not already existing). +perfdata: + For status variables, no performance data is being output. Numeric + values are output as performance data. + examples: # Examples for automatic inventorization of processes inventory_sap_values = [

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0951

by Mathias Kettner

Module: check_mk Branch: master Commit: 013f31cebb5f0f75423c37f000becc010cbcf260 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=013f31cebb5f0f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 15 04:04:02 2013 +0200 Updated bug entries #0951 --- .bugs/951 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/951 b/.bugs/951 index 38ba855..0b2a944 100644 --- a/.bugs/951 +++ b/.bugs/951 @@ -1,12 +1,15 @@ Title: Folder-Tree Snapin shows foreign folders, but filter does not work Component: multisite -State: open +Class: bug +State: done Date: 2013-09-12 17:27:28 Targetversion: 1.2.3i2 -Class: bug If you create a disributed monitoring then the folder tree snapin can show folders from remote sites (without alias), which is OK. But when you click on a folder then the filter does not work because (i think) it does not know the folder and hence ignored it. + +2013-10-15 04:03:31: changed state open -> done +Was already fixed in September.

10 years, 11 months

Check_MK Git: check_mk: Automatically remove duplicate checks on SNMP+TCP

by Mathias Kettner

Module: check_mk Branch: master Commit: fe968afbff3a50939c5882cefc2a4979ad9da3fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe968afbff3a50… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 15 02:56:24 2013 +0200 Automatically remove duplicate checks on SNMP+TCP This was very annoying. Now if a host as a TCP based and SNMP based variant of the same check then the SNMP based one is silently dropped. It is still handled during inventory and visible in WATO. But when the actual monitoring configuration is being created, it is omitted. In the rare case where the user wants to prefer the SNMP based check, he can still use disabled_checks and disable the TCP based one for the host in question. --- .bugs/955 | 7 +++++-- ChangeLog | 4 +++- modules/check_mk.py | 49 ++++++++++++++++++++++++++++++++++++++-------- modules/check_mk_base.py | 2 +- 4 files changed, 50 insertions(+), 12 deletions(-) diff --git a/.bugs/955 b/.bugs/955 index 0595fb7..f5e5992 100644 --- a/.bugs/955 +++ b/.bugs/955 @@ -1,9 +1,9 @@ Title: Automatically remove duplicate checks Component: core -State: open +Class: nastiness +State: done Date: 2013-09-26 09:23:02 Targetversion: 1.2.3i3 -Class: nastiness When you check a host with TCP and SNMP, you most times have duplicate checks. This is nasty because you manually have @@ -11,3 +11,6 @@ to ignore the duplicate. We simply could silently disable the SNMP based variants if a TCP based variant already exist. + +2013-10-15 02:53:21: changed state open -> done +Done. diff --git a/ChangeLog b/ChangeLog index 36d1b3c..c7572bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,9 @@ * FIX: fix configuration of explicit SNMP community, allow unicode * FIX: avoid invalid cache of 2nd and up hosts in bulk inventory * FIX: fixed error handling in SNMP scan, inventory check fails now - if SNMP agent is not responding + if SNMP agent is not responding + * Automatically remove duplicate checks when monitoring with Agent+SNMP + at the same time. TCP based ones have precedence. * inventory check of SNMP devices now does scan per default (configurable) Multisite: diff --git a/modules/check_mk.py b/modules/check_mk.py index d29e890..5b59f92 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -593,6 +593,9 @@ def is_tcp_host(hostname): def is_ping_host(hostname): return not is_snmp_host(hostname) and not is_tcp_host(hostname) +def is_dual_host(hostname): + return is_tcp_host(hostname) and is_snmp_host(hostname) + def check_period_of(hostname, service): periods = service_extra_conf(hostname, service, check_periods) if periods: @@ -951,13 +954,16 @@ g_check_table_cache = {} # are used in the autochecks and assumed be make up the vast majority. g_singlehost_checks = None g_multihost_checks = None -def get_check_table(hostname): +def get_check_table(hostname, remove_duplicates=False): global g_singlehost_checks global g_multihost_checks # speed up multiple lookup of same host if hostname in g_check_table_cache: - return g_check_table_cache[hostname] + if remove_duplicates and is_dual_host(hostname): + return remove_duplicate_checks(g_check_table_cache[hostname]) + else: + return g_check_table_cache[hostname] check_table = {} @@ -1039,15 +1045,42 @@ def get_check_table(hostname): deps.append(d) g_check_table_cache[hostname] = check_table - return check_table + if remove_duplicates and is_dual_host(hostname): + return remove_duplicate_checks(check_table) + else: + return check_table + +def remove_duplicate_checks(check_table): + have_with_tcp = {} + have_with_snmp = {} + without_duplicates = {} + for key, value in check_table.iteritems(): + checkname = key[0] + descr = value[1] + if check_uses_snmp(checkname): + if descr in have_with_tcp: + continue + have_with_snmp[descr] = key + else: + if descr in have_with_snmp: + snmp_key = have_with_snmp[descr] + del without_duplicates[snmp_key] + del have_with_snmp[descr] + have_with_tcp[descr] = key + without_duplicates[key] = value + return without_duplicates + -def get_sorted_check_table(hostname): +# remove_duplicates: Automatically remove SNMP based checks +# if there already is a TCP based one with the same +# description. E.g: df vs hr_fs. +def get_sorted_check_table(hostname, remove_duplicates=False): # Convert from dictionary into simple tuple list. Then sort # it according to the service dependencies. unsorted = [ (checkname, item, params, descr, deps) for ((checkname, item), (params, descr, deps)) - in get_check_table(hostname).items() ] + in get_check_table(hostname, remove_duplicates=remove_duplicates).items() ] def cmp(a, b): if a[3] < b[3]: return -1 @@ -1920,7 +1953,7 @@ define servicedependency { return result - host_checks = get_check_table(hostname).items() + host_checks = get_check_table(hostname, remove_duplicates=True).items() host_checks.sort() # Create deterministic order aggregated_services_conf = set([]) do_aggregation = host_is_aggregated(hostname) @@ -2900,7 +2933,7 @@ def find_check_plugins(checktype): return paths def get_precompiled_check_table(hostname): - host_checks = get_sorted_check_table(hostname) + host_checks = get_sorted_check_table(hostname, remove_duplicates=True) precomp_table = [] for checktype, item, params, description, deps in host_checks: aggr_name = aggregated_service_name(hostname, description) @@ -3006,7 +3039,7 @@ no_inventory_possible = None output.write("%s = %r\n" % (var, globals()[var])) output.write("\n# Checks for %s\n\n" % hostname) - output.write("def get_sorted_check_table(hostname):\n return %r\n\n" % check_table) + output.write("def get_sorted_check_table(hostname, remove_duplicates=False):\n return %r\n\n" % check_table) # Do we need to load the SNMP module? This is the case, if the host # has at least one SNMP based check. Also collect the needed check diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 1b37a71..a47207e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1032,7 +1032,7 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): g_hostname = hostname num_success = 0 error_sections = set([]) - check_table = get_sorted_check_table(hostname) + check_table = get_sorted_check_table(hostname, remove_duplicates=True) problems = [] for checkname, item, params, description, info in check_table:

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1020

by Mathias Kettner

Module: check_mk Branch: master Commit: b24f36f22d46fa37286ae25110f0d9c8776fb8db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b24f36f22d46fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 15 01:49:13 2013 +0200 Updated bug entries #1020 --- .bugs/1020 | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.bugs/1020 b/.bugs/1020 index 1729a53..9bed6aa 100644 --- a/.bugs/1020 +++ b/.bugs/1020 @@ -2,11 +2,22 @@ Title: cmk --snmpwalk does not always get all oids Component: core State: open Date: 2013-09-04 11:27:53 -Targetversion: 1.2.3 -Class: bug +Targetversion: future +Class: nastiness In some cases, on somehow broken devices, the cmk --snmpwalk feature does not get complete results. At the moment it walks the standard OIDs 1.2.6.1.2 and 1.2.6.1.4. An option to try to fix this problem is to add the oid returned by .1.3.6.1.2.1.1.2.0 . + +Mathias: I think I remember that there are some devices that do *not* +have a MIB at that OID. And also some devices that have multiple entries +in .1.3.6.1.2.1.1.2.0. + +Because we need the whole thing only for development we could simple give +the possibility to manually add further OIDs to fetch via the command line, +e.g. + +cmk --snmpwalk --extra-oid 1.3.5.1.4.3.5.3.5 HOST +

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0985, #0986

by Mathias Kettner

Module: check_mk Branch: master Commit: 67d2949e38ab05d6184c067ff872f2aad8b87d88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67d2949e38ab05… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 15 01:39:39 2013 +0200 Updated bug entries #0985, #0986 --- .bugs/985 | 17 +++++++++++++++++ .bugs/986 | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/.bugs/985 b/.bugs/985 new file mode 100644 index 0000000..f302b8f --- /dev/null +++ b/.bugs/985 @@ -0,0 +1,17 @@ +Title: Reloading sidebar after config change erases Quicksearch +Component: multisite +State: open +Date: 2013-10-15 01:34:28 +Targetversion: 1.2.3i3 +Class: nastiness + +If you active changes via WATO then the sidebar reloads. +That way Quicksearch is emptied. This is nasty. + +1. You add a new host to the monitoring +2. You activate the changes +3. You type in the new hostname in Quicksearch +4. The host name is erased right now because of the reload + +Does the Quicksearch need to be reloaded at the first place? +It's now AJAX-enabled, isn't it? diff --git a/.bugs/986 b/.bugs/986 new file mode 100644 index 0000000..98b6544 --- /dev/null +++ b/.bugs/986 @@ -0,0 +1,17 @@ +Title: Delay sidebar reload after changes to site config +Component: wato +State: open +Date: 2013-10-15 01:37:53 +Targetversion: 1.4.0 +Class: nastiness + +If you change the site configuration via WATO then the +sidear is reloaded. But: at exactly the same time the +liveproxyd is being restarted and all sites are down +for 1-2 seconds. The sidebar is reloaded in exactly that +point of time. Consequnce: + +- Tactical overview does not show remote hosts +- Site status is [dead] for all remote sites. + +Can't we delay the reload for a small time?

10 years, 11 months

Check_MK Git: check_mk: FIX: fixed error handling in SNMP scan

by Mathias Kettner

Module: check_mk Branch: master Commit: e0cebeb39db1e3938f0f010cdf1267827529b82e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0cebeb39db1e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 15 01:22:47 2013 +0200 FIX: fixed error handling in SNMP scan --- ChangeLog | 2 ++ modules/check_mk.py | 46 ++++++++++++++++++++++++++++++---------------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2f562c..36d1b3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ * FIX: continue inventory, if one check does not support it * FIX: fix configuration of explicit SNMP community, allow unicode * FIX: avoid invalid cache of 2nd and up hosts in bulk inventory + * FIX: fixed error handling in SNMP scan, inventory check fails now + if SNMP agent is not responding * inventory check of SNMP devices now does scan per default (configurable) Multisite: diff --git a/modules/check_mk.py b/modules/check_mk.py index 3d7d7b0..d29e890 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -765,6 +765,11 @@ def snmp_get_oid(hostname, ipaddress, oid): snmp_process = os.popen(command, "r") line = snmp_process.readline().strip() + if not line: + if opt_debug: + sys.stdout.write("Error in response to snmpget.\n") + return None + item, value = line.split("=", 1) value = value.strip() if opt_debug: @@ -828,11 +833,13 @@ def snmp_scan(hostname, ipaddress): sys.stdout.write("Scanning host %s(%s) for SNMP checks..." % (hostname, ipaddress)) sys.stdout.flush() if not in_binary_hostlist(hostname, snmp_without_sys_descr): - sys_descr = get_single_oid(hostname, ipaddress, ".1.3.6.1.2.1.1.1.0") + sys_descr_oid = ".1.3.6.1.2.1.1.1.0" + sys_descr = get_single_oid(hostname, ipaddress, sys_descr_oid) if sys_descr == None: - if opt_verbose: - sys.stderr.write("no SNMP answer\n") - return [] + raise MKSNMPError("Cannot fetch system description OID %s" % sys_descr_oid) + # if opt_verbose: + # sys.stderr.write("no SNMP answer\n") + # return [] found = [] for check_type, check in check_info.items(): @@ -2488,7 +2495,14 @@ def do_snmp_scan(hostnamelist, check_only=False, include_state=False): except: sys.stdout.write("Cannot resolve %s into IP address. Skipping.\n" % hostname) continue - checknames = snmp_scan(hostname, ipaddress) + try: + checknames = snmp_scan(hostname, ipaddress) + except Exception, e: + if opt_debug: + raise + sys.stdout.write("SNMP scan for %s failed: %s\n" % (hostname, e)) + continue + for checkname in checknames: if opt_debug: sys.stdout.write("Trying inventory for %s on %s\n" % (checkname, hostname)) @@ -2715,19 +2729,16 @@ def check_inventory(hostname): is_snmp = is_snmp_host(hostname) is_tcp = is_tcp_host(hostname) check_table = get_check_table(hostname) - if is_snmp and inventory_check_do_scan: - try: + + try: + if is_snmp and inventory_check_do_scan: ipaddress = lookup_ipaddress(hostname) snmp_checktypes = snmp_scan(hostname, ipaddress) - except: - if opt_debug: - raise - pass - else: - snmp_checktypes = [] + else: + snmp_checktypes = [] + + hosts_checktypes = set([ ct for (ct, item), params in check_table.items() ]) - hosts_checktypes = set([ ct for (ct, item), params in check_table.items() ]) - try: for ct in inventorable_checktypes("all"): if check_uses_snmp(ct) and not is_snmp: continue # Skip SNMP checks on non-SNMP hosts @@ -2761,7 +2772,10 @@ def check_inventory(hostname): # Honor rule settings for "Status of the Check_MK service". In case of # a problem we assume a connection error here. spec = exit_code_spec(hostname) - what = isinstance(e, MKAgentError) and "connection" or "exception" + if isinstance(e, MKAgentError) or isinstance(e, MKSNMPError): + what = "connection" + else: + what = "exception" status = spec.get(what, 3) sys.stdout.write("%s - %s\n" % (nagios_state_names[status], e)) sys.exit(status)

10 years, 11 months

Check_MK Git: check_mk: Fixed verbose output during SNMP inventory

by Mathias Kettner

Module: check_mk Branch: master Commit: 1a529099a29e9fdcd0b0989a647e8e634d900b1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a529099a29e9f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 15 00:58:34 2013 +0200 Fixed verbose output during SNMP inventory --- modules/check_mk.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 8211c1c..3d7d7b0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -826,10 +826,11 @@ def snmp_scan(hostname, ipaddress): if opt_verbose: sys.stdout.write("Scanning host %s(%s) for SNMP checks..." % (hostname, ipaddress)) + sys.stdout.flush() if not in_binary_hostlist(hostname, snmp_without_sys_descr): sys_descr = get_single_oid(hostname, ipaddress, ".1.3.6.1.2.1.1.1.0") if sys_descr == None: - if opt_debug: + if opt_verbose: sys.stderr.write("no SNMP answer\n") return [] @@ -4666,7 +4667,7 @@ def do_cleanup_autochecks(): hostchecks.append(line) checks += 1 hostdata[hostname] = hostchecks - if opt_verbose: + if opt_debug: sys.stdout.write("Found %d checks from %d hosts.\n" % (checks, len(hostdata))) # 2. Write out new autochecks.

10 years, 11 months

← Newer
1
...
19
20
21
22
23
24
25
...
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