Checkmk git commits November 2014

checkmk-commits@lists.checkmk.com

6 participants
232 discussions

Check_MK Git: check_mk: New keywords OID_END_BIN and OID_END_OCTET_STRING for SNMP

by Mathias Kettner

Module: check_mk Branch: master Commit: 8438a85961d135c6bb815f71069c5511d8d7215b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8438a85961d135… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 26 15:32:21 2014 +0100 New keywords OID_END_BIN and OID_END_OCTET_STRING for SNMP --- modules/snmp.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index 22dd216..6ba2e4b 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -28,9 +28,11 @@ import subprocess -OID_END = 0 -OID_STRING = -1 -OID_BIN = -2 +OID_END = 0 # Suffix-part of OID that was not specified +OID_STRING = -1 # Complete OID as string ".1.3.6.1.4.1.343...." +OID_BIN = -2 # Complete OID as binary string "\x01\x03\x06\x01..." +OID_END_BIN = -3 # Same, but just the end part +OID_END_OCTET_STRING = -4 # yet same, but omit first byte (assuming that is the length byte) def strip_snmp_value(value, hex_plain = False): v = value.strip() @@ -127,7 +129,10 @@ def get_snmp_table(hostname, ip, check_type, oid_info): # in later. If the column in OID_STRING or OID_BIN we do something # similar: we fill in the complete OID of the entry, either as # string or as binary UTF-8 encoded number string - if column in [ OID_END, OID_STRING, OID_BIN ]: + if column in [ OID_END, OID_STRING, OID_BIN, OID_END_BIN, OID_END_OCTET_STRING ]: + if index_column >= 0: + raise MKGeneralException("Invalid SNMP OID specification in implementation of check. " + "You can only use one of OID_END, OID_STRING, OID_BIN, OID_END_BIN and OID_END_OCTET_STRING.") index_column = colno columns.append((fetchoid, [])) index_format = column @@ -161,12 +166,16 @@ def get_snmp_table(hostname, ip, check_type, oid_info): fetchoid, max_column = columns[max_len_col] for o, value in max_column: if index_format == OID_END: - eo = extract_end_oid(fetchoid, o) - index_rows.append((o, eo)) + index_rows.append((o, extract_end_oid(fetchoid, o))) elif index_format == OID_STRING: index_rows.append((o, o)) - else: + elif index_format == OID_BIN: index_rows.append((o, oid_to_bin(o))) + elif index_format == OID_END_BIN: + index_rows.append((o, oid_to_bin(extract_end_oid(fetchoid, o)))) + else: # OID_END_OCTET_STRING: + index_rows.append((o, oid_to_bin(extract_end_oid(fetchoid, o))[1:])) + columns[index_column] = fetchoid, index_rows

9 years, 10 months

Check_MK Git: check_mk: Always activate agent simulator for stored SNMP walks

by Mathias Kettner

Module: check_mk Branch: master Commit: b46e3345dd05f1ad117390e60dbcf826785648d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b46e3345dd05f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 26 15:31:58 2014 +0100 Always activate agent simulator for stored SNMP walks --- modules/check_mk.py | 3 +-- modules/snmp.py | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 66abbe4..426962a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5832,8 +5832,7 @@ def read_config_files(with_autochecks=True, with_conf_d=True): ] # Load agent simulator if enabled in configuration - if agent_simulator: - execfile(modules_dir + "/agent_simulator.py", globals(), globals()) + execfile(modules_dir + "/agent_simulator.py", globals(), globals()) # Compute parameters for a check honoring factory settings, diff --git a/modules/snmp.py b/modules/snmp.py index 159e2a4..22dd216 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -360,9 +360,7 @@ def get_stored_snmpwalk(hostname, oid): o = o[1:] if o == oid or o.startswith(oid_prefix + "."): if len(parts) > 1: - value = parts[1] - if agent_simulator: - value = agent_simulator_process(value) + value = agent_simulator_process(parts[1]) else: value = "" # Fix for missing starting oids

9 years, 10 months

Check_MK Git: check_mk: #1550 FIX zfs_arc_cache: do not inventorize of no cache information available

by Mathias Kettner

Module: check_mk Branch: master Commit: e48b0e3feacfa63a573e183b7b56379ba42cc9f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e48b0e3feacfa6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 26 12:22:14 2014 +0100 #1550 FIX zfs_arc_cache: do not inventorize of no cache information available This avoid an exception. --- .werks/1550 | 9 +++++++++ ChangeLog | 1 + checks/zfs_arc_cache | 17 +++++++---------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.werks/1550 b/.werks/1550 new file mode 100644 index 0000000..54f5d9d --- /dev/null +++ b/.werks/1550 @@ -0,0 +1,9 @@ +Title: zfs_arc_cache: do not inventorize of no cache information available +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417000713 +Class: fix + +This avoid an exception. diff --git a/ChangeLog b/ChangeLog index c47760f..815d18e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * 1548 FIX: bluecat_ntp: do not inventorized devices where NTP information is missing * 1549 FIX: bluecat_threads: do not inventorize this check where information is missing... * 1536 FIX: fritz!Box special agent now deals with new URLs (firmware >= 6.0) correctly + * 1550 FIX: zfs_arc_cache: do not inventorize of no cache information available... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/zfs_arc_cache b/checks/zfs_arc_cache index b26f320..b707a23 100644 --- a/checks/zfs_arc_cache +++ b/checks/zfs_arc_cache @@ -93,7 +93,7 @@ # [...] # } -def zfs_arc_cache_parse(info): +def parse_zfs_arc_cache(info): parsed = {} for line in info: if len(line) > 2 and line[1] == "=": @@ -109,15 +109,13 @@ def zfs_arc_cache_parse(info): # | | # '----------------------------------------------------------------------' -def inventory_zfs_arc_cache(info): - parsed = zfs_arc_cache_parse(info) - if "hits" in parsed.keys() and "misses" in parsed.keys(): +def inventory_zfs_arc_cache(parsed): + if parsed.get("hits") and parsed.get("misses"): return [ (None, None) ] else: return [] -def check_zfs_arc_cache(_no_item, _no_params, info): - parsed = zfs_arc_cache_parse(info) +def check_zfs_arc_cache(_no_item, _no_params, parsed): status = 0 perfdata = [] message = "ZFS arc cache:" @@ -174,6 +172,7 @@ def check_zfs_arc_cache(_no_item, _no_params, info): return status, message, perfdata check_info["zfs_arc_cache"] = { + "parse_function" : parse_zfs_arc_cache, "check_function" : check_zfs_arc_cache, "inventory_function" : inventory_zfs_arc_cache, "service_description" : "ZFS arc cache", @@ -190,16 +189,14 @@ check_info["zfs_arc_cache"] = { # | | # '----------------------------------------------------------------------' -def inventory_zfs_arc_cache_l2(info): - parsed = zfs_arc_cache_parse(info) +def inventory_zfs_arc_cache_l2(parsed): # if l2_size == 0 there is no l2 cache available at all if "l2_size" in parsed.keys() and parsed["l2_size"] > 0: return [ (None, None) ] else: return [] -def check_zfs_arc_cache_l2(_no_item, _no_params, info): - parsed = zfs_arc_cache_parse(info) +def check_zfs_arc_cache_l2(_no_item, _no_params, parsed): status = 0 perfdata = [] message = "ZFS arc cache L2:"

9 years, 10 months

Check_MK Git: check_mk: win_bios, win_signature: make more compatible with Win 2003

by Mathias Kettner

Module: check_mk Branch: master Commit: 2385b1bbb1b28a743aa1a4d9bec5859962a8aede URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2385b1bbb1b28a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 26 11:51:29 2014 +0100 win_bios, win_signature: make more compatible with Win 2003 --- inventory/win_bios | 2 +- inventory/win_disks | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/inventory/win_bios b/inventory/win_bios index c48f50d..c346878 100644 --- a/inventory/win_bios +++ b/inventory/win_bios @@ -36,7 +36,6 @@ # SMBIOSMajorVersion : 2 # SMBIOSMinorVersion : 5 - def inv_win_bios(info): node = inv_tree("hardware.bios.") smbios_version = "" @@ -56,6 +55,7 @@ def inv_win_bios(info): # The ReleaseDate property indicates the release date of the # Win32 BIOS in the Coordinated Universal Time (UTC) format # of YYYYMMDDHHMMSS.MMMMMM(+-)OOO. + value = value.replace("*", "0") node["date"] = int(time.mktime(time.strptime(value.split(".")[0], "%Y%m%d%H%M%S"))) elif varname == "Manufacturer": node["vendor"] = value diff --git a/inventory/win_disks b/inventory/win_disks index 4970379..7514f00 100644 --- a/inventory/win_disks +++ b/inventory/win_disks @@ -77,8 +77,11 @@ def inv_win_disks(info): array["size"] = int(value) elif varname == "MediaType": array["type"] = value - elif varname == "Signature" and value != '': - array["signature"] = int(value) + elif varname == "Signature": + if value != "": + array["signature"] = int(value) + else: + array["signature"] = 0 array["local"] = True node.append(array)

9 years, 10 months

Check_MK Git: check_mk: #1536 FIX fritz!Box special agent now deals with new URLs (firmware >= 6.0) correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: b4052180869926f65302bad671a01561d67df119 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4052180869926… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 26 11:50:38 2014 +0100 #1536 FIX fritz!Box special agent now deals with new URLs (firmware >= 6.0) correctly --- .werks/1536 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_fritzbox | 43 +++++++++++++++++++++++++++-------------- 3 files changed, 39 insertions(+), 15 deletions(-) diff --git a/.werks/1536 b/.werks/1536 new file mode 100644 index 0000000..2928004 --- /dev/null +++ b/.werks/1536 @@ -0,0 +1,10 @@ +Title: fritz!Box special agent now deals with new URLs (firmware >= 6.0) correctly +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416999028 + + diff --git a/ChangeLog b/ChangeLog index 443a2f4..c47760f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 1532 FIX: mk_sap: Cleaning up old state information from sap.state file... * 1548 FIX: bluecat_ntp: do not inventorized devices where NTP information is missing * 1549 FIX: bluecat_threads: do not inventorize this check where information is missing... + * 1536 FIX: fritz!Box special agent now deals with new URLs (firmware >= 6.0) correctly Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/special/agent_fritzbox b/agents/special/agent_fritzbox index 6cccf36..30df424 100755 --- a/agents/special/agent_fritzbox +++ b/agents/special/agent_fritzbox @@ -107,9 +107,10 @@ class RequestError(Exception): g_device = None g_version = None +base_urls = [ 'http://%s:49000/upnp' % host_address, 'http://%s:49000/igdupnp' % host_address ] + def get_upnp_info(control, namespace, action): global g_device, g_version - url = 'http://%s:49000/upnp/control/%s' % (host_address, control) headers = { 'User-agent': 'Check_MK agent_fritzbox', @@ -124,20 +125,32 @@ def get_upnp_info(control, namespace, action): </s:Body> </s:Envelope>''' % (action, namespace) - if opt_debug: - sys.stdout.write('============================\n') - sys.stdout.write('URL: %s\n' % url) - sys.stdout.write('SoapAction: %s\n' % headers['SoapAction']) - - try: - req = urllib2.Request(url, data, headers) - handle = urllib2.urlopen(req) - except Exception, e: - if opt_debug: - sys.stdout.write('----------------------------\n') - sys.stdout.write(traceback.format_exc()) - sys.stdout.write('============================\n') - raise RequestError('Error during UPNP call') + # Fritz!Box with firmware >= 6.0 use a new url. We try the newer one first and + # try the other one, when the first one did not succeed. + for base_url in base_urls[:]: + url = base_url + '/control/' + control + try: + if opt_debug: + sys.stdout.write('============================\n') + sys.stdout.write('URL: %s\n' % url) + sys.stdout.write('SoapAction: %s\n' % headers['SoapAction']) + req = urllib2.Request(url, data, headers) + handle = urllib2.urlopen(req) + break # got a good response + except urllib2.HTTPError, e: + if e.code == 500: + # Is the result when the old URL can not be found, continue in this + # case and revert the order of base urls in the hope that the other + # url gets a successful result to have only one try on future requests + # during an agent execution + base_urls.reverse() + continue + except Exception, e: + if opt_debug: + sys.stdout.write('----------------------------\n') + sys.stdout.write(traceback.format_exc()) + sys.stdout.write('============================\n') + raise RequestError('Error during UPNP call') infos = handle.info() contents = handle.read()

9 years, 10 months

Check_MK Git: check_mk: Fixed sorting of service discovery table ( can not be sorted interactive anymore)

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d2117ef39a6fe87a9831805f6f5a43e2806425d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d2117ef39a6fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 26 11:19:46 2014 +0100 Fixed sorting of service discovery table (can not be sorted interactive anymore) --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3ccd0c1..da15c5e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3206,7 +3206,7 @@ def show_service_table(host, firsttime): if html.var("_scan"): html.hidden_field("_scan", "on") - table.begin(css ="data", searchable = False, limit = None) + table.begin(css ="data", searchable = False, limit = None, sortable = False) # This option will later be switchable somehow

9 years, 10 months

Check_MK Git: check_mk: #1535 Disabled services on service discovery page now link to the ruleset

by Lars Michelsen

Module: check_mk Branch: master Commit: 372b5c1b1a8f9dfa57a74306a70d6fd6373585f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=372b5c1b1a8f9d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 26 11:13:57 2014 +0100 #1535 Disabled services on service discovery page now link to the ruleset --- .werks/1535 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/.werks/1535 b/.werks/1535 new file mode 100644 index 0000000..b2501ec --- /dev/null +++ b/.werks/1535 @@ -0,0 +1,10 @@ +Title: Disabled services on service discovery page now link to the ruleset +Level: 1 +Component: wato +Class: feature +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416996809 + + diff --git a/ChangeLog b/ChangeLog index b218b6e..443a2f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ * 1489 Added iCalendar import for generating timeperiods e.g. for holidays... * 1495 Most WATO tables can now be sorted (where useful)... * 1504 WATO makes host tag and group information available for NagVis... + * 1535 Disabled services on service discovery page now link to the ruleset * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5305e9d..3ccd0c1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3292,6 +3292,13 @@ def show_service_table(host, firsttime): ("item", mk_repr(item))]) html.icon_button(url, _("Edit and analyze the check parameters of this service"), "check_parameters") + if state_type == "ignored": + url = make_link([("mode", "edit_ruleset"), + ("varname", "ignored_services"), + ("host", hostname), + ("item", mk_repr(descr))]) + html.icon_button(url, _("Edit and analyze the disabled services rules"), "ignore") + # Permanently disable icon if state_type in ['new', 'old']: url = make_link([

9 years, 10 months

Check_MK Git: check_mk: cisco_vss: fixed typo

by Bastian Kuhn

Module: check_mk Branch: master Commit: a8d9066b7b785f6bb49564f1a75550db6f7b681b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8d9066b7b785f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 26 10:35:31 2014 +0100 cisco_vss: fixed typo --- checks/cisco_vss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cisco_vss b/checks/cisco_vss index 8a924fb..d639a98 100644 --- a/checks/cisco_vss +++ b/checks/cisco_vss @@ -93,7 +93,7 @@ def check_cisco_vss(item, params, info): state = 0 yield state, "chassis %s: %s" % (switch_id, cisco_vss_role_names[chassis_role]) - yield 0, "%d VLS connections configured" % len(ports) + yield 0, "%d VSL connections configured" % len(ports) for core_switch_id, operstatus, conf_portcount, op_portcount in ports: if operstatus == '1':

9 years, 10 months

Check_MK Git: check_mk: This fixes an error where filtering a view leads into an empty view, because

by Lars Michelsen

Module: check_mk Branch: master Commit: 14efe0ff259d49720135a5107bc02093d4c14f36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14efe0ff259d49… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 26 10:02:10 2014 +0100 This fixes an error where filtering a view leads into an empty view, because the enforced site filter has the first site preselected, which is not always the site of the data shown in the view. Now we use the optional site filter for most views to cleanup this error. Conflicts: ChangeLog web/plugins/views/builtin.py --- .werks/1534 | 13 ++++++++ ChangeLog | 1 + mkeventd/web/plugins/views/mkeventd.py | 4 +-- web/plugins/views/builtin.py | 52 ++++++++++++++++---------------- 4 files changed, 42 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=14efe0ff25…

9 years, 10 months

Check_MK Git: check_mk: #1533 FIX Fixed sorting of hosts with same name in "services of host" view

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e5b5814c85f17e2672156f540e1d06cfd8a587f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e5b5814c85f17… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 26 09:18:51 2014 +0100 #1533 FIX Fixed sorting of hosts with same name in "services of host" view --- .werks/1533 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/builtin.py | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1533 b/.werks/1533 new file mode 100644 index 0000000..b73f342 --- /dev/null +++ b/.werks/1533 @@ -0,0 +1,9 @@ +Title: Fixed sorting of hosts with same name in "services of host" view +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1416989899 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9a22256..3174235 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ * 1527 FIX: Fixed views missing values of some filters (serviceregex, hostgroup filters, ...)... * 1528 FIX: Fixed actions in mobile GUI... * 1529 FIX: Mobile-GUI: Fixed "all host problems" view not showing all problems... + * 1533 FIX: Fixed sorting of hosts with same name in "services of host" view WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 2d44ed5..9662378 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -545,7 +545,9 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['svcstate', 'serviceregex'], - 'sorters': [('svcdescr', False)], + 'sorters': [('site', False), + ('site_host', False), + ('svcdescr', False)], 'linktitle': _('Services'), 'title': _('Services of Host')}, 'host_export': {'browser_reload': 30,

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2014