Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: b41362d9aad85c1cdebbf67af70bec9e3f7b43d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b41362d9aad85c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 26 14:37:33 2016 +0100 Updated bug entries #2326 --- .bugs/2326 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bugs/2326 b/.bugs/2326 new file mode 100644 index 0000000..67c79d3 --- /dev/null +++ b/.bugs/2326 @@ -0,0 +1,7 @@ +Title: Make mkeventd network ports configurable +Component: ec +State: open +Date: 2016-01-26 14:36:57 +Targetversion: future +Class: feature +

8 years, 7 months

esx_vsphere_datastores: Fixed typo

by Lars Michelsen

Module: check_mk Branch: master Commit: be30d830821c88a3ad213dd50a40f51917f82b02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be30d830821c88… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 26 14:28:24 2016 +0100 esx_vsphere_datastores: Fixed typo --- checks/esx_vsphere_datastores | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index ad7b112..ad2787f 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -110,7 +110,7 @@ def check_esx_vsphere_datastores(item, params, info): if not store["accessible"]: state = 2 - infotext = "unaccessible(!!), " + infotext + infotext = "inaccessible(!!), " + infotext return state, infotext, perfdata

8 years, 7 months

#2958 FIX domino_tasks: Fixed broken discovery and check

by Lars Michelsen

Module: check_mk Branch: master Commit: 63233fbb03e00895aff04eda711c33d12a04b043 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63233fbb03e008… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 26 12:47:39 2016 +0100 #2958 FIX domino_tasks: Fixed broken discovery and check --- .werks/2958 | 9 +++++++++ ChangeLog | 1 + checks/domino_tasks | 23 +++++++++++++++++++---- checks/ps | 1 - 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/.werks/2958 b/.werks/2958 new file mode 100644 index 0000000..c2e7838 --- /dev/null +++ b/.werks/2958 @@ -0,0 +1,9 @@ +Title: domino_tasks: Fixed broken discovery and check +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453808840 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 536191c..941fe1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -217,6 +217,7 @@ * 2955 FIX: cpu.loads: Fixed monitoring on some AIX systems * 2939 FIX: winperf_phydisk: fixed permanent stall state if windows reports several disks with the same drive letter... * 2957 FIX: Renamed Lotus Domino Task Inventory rule to Lotus Domino Task Discovery + * 2958 FIX: domino_tasks: Fixed broken discovery and check Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/domino_tasks b/checks/domino_tasks index 42f5788..d5c4cc0 100644 --- a/checks/domino_tasks +++ b/checks/domino_tasks @@ -42,13 +42,28 @@ inv_domino_tasks_rules = [] inv_domino_tasks = [] -def inventory_domino_tasks(info): - return inventory_ps_common(inv_domino_tasks, inv_domino_tasks_rules, info) +# Bring the SNMP data in the format expected by the common ps functions. +# e.g.: +# [None, (u'root', u'185292', u'5804', u'00:00:02/03:33:13', u'1'), u'/sbin/init', u'splash'] +def parse_domino_tasks(info): + parsed = [] + for line in info: + node, task_name = line + # node, process_info, command_line + parsed.append((node, (None,), task_name)) + return parsed + + +def inventory_domino_tasks(parsed): + return inventory_ps_common(inv_domino_tasks, inv_domino_tasks_rules, parsed) + + +def check_domino_tasks(item, params, parsed): + return check_ps_common(item, params, parsed, info_name = "Tasks") -def check_domino_tasks(item, params, info): - return check_ps_common( item, params, info, info_name = "Tasks" ) check_info['domino_tasks'] = { + "parse_function" : parse_domino_tasks, "check_function" : check_domino_tasks, "inventory_function" : inventory_domino_tasks, "has_perfdata" : True, diff --git a/checks/ps b/checks/ps index 897ac92..2da3069 100644 --- a/checks/ps +++ b/checks/ps @@ -271,7 +271,6 @@ def inventory_ps(info): def check_ps(item, params, info): (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info = info - # ps_info, mem_info, solaris_mem_info, statgrab_mem_info = info if mem_info: total_ram = parse_proc_meminfo_bytes(mem_info).get("MemTotal") elif solaris_mem_info:

8 years, 7 months

#2957 FIX Renamed Lotus Domino Task Inventory rule to Lotus Domino Task Discovery

by Lars Michelsen

Module: check_mk Branch: master Commit: 46288680f3cd55755a24f85e218c71cd0b9f4d6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46288680f3cd55… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 26 12:36:44 2016 +0100 #2957 FIX Renamed Lotus Domino Task Inventory rule to Lotus Domino Task Discovery --- .werks/2957 | 9 +++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/2957 b/.werks/2957 new file mode 100644 index 0000000..6e939b9 --- /dev/null +++ b/.werks/2957 @@ -0,0 +1,9 @@ +Title: Renamed Lotus Domino Task Inventory rule to Lotus Domino Task Discovery +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453808185 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 44ea1aa..536191c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -216,6 +216,7 @@ * 2954 FIX: netextreme_temp: Fixed temperature checking * 2955 FIX: cpu.loads: Fixed monitoring on some AIX systems * 2939 FIX: winperf_phydisk: fixed permanent stall state if windows reports several disks with the same drive letter... + * 2957 FIX: Renamed Lotus Domino Task Inventory rule to Lotus Domino Task Discovery Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7508e39..b773905 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1357,9 +1357,9 @@ register_rule(group + '/' + subgroup_inventory, register_rule(group + '/' + subgroup_inventory, varname = "inv_domino_tasks_rules", - title = _('Lotus Domino Task Inventory'), - help = _("Keep in mind that all configuration parameters in this rule are only applied during the " - "hosts inventory. Any changes later on require a host re-inventory"), + title = _('Lotus Domino Task Discovery'), + help = _("This rule controls the discovery of tasks on Lotus Domino systems. " + "Any changes later on require a host re-discovery"), valuespec = Dictionary( elements = [ ('descr', TextAscii(

8 years, 7 months

#2959 FIX apt: Made check more robust against invalid agent data

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c2fb8af2e987f2265d2d66d483142467fb3990d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c2fb8af2e987f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 26 13:14:50 2016 +0100 #2959 FIX apt: Made check more robust against invalid agent data --- .werks/2959 | 9 +++++++++ ChangeLog | 1 + checks/apt | 13 ++++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.werks/2959 b/.werks/2959 new file mode 100644 index 0000000..6eef615 --- /dev/null +++ b/.werks/2959 @@ -0,0 +1,9 @@ +Title: apt: Made check more robust against invalid agent data +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453810466 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 941fe1d..40c6fd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -218,6 +218,7 @@ * 2939 FIX: winperf_phydisk: fixed permanent stall state if windows reports several disks with the same drive letter... * 2957 FIX: Renamed Lotus Domino Task Inventory rule to Lotus Domino Task Discovery * 2958 FIX: domino_tasks: Fixed broken discovery and check + * 2959 FIX: apt: Made check more robust against invalid agent data Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/apt b/checks/apt index 3dc2da7..3358669 100644 --- a/checks/apt +++ b/checks/apt @@ -44,10 +44,21 @@ factory_settings["apt_default_levels"] = { "security" : 2, } +# Check that the apt section is in valid format of mk_apt plugin and not +# from the apt agent plugin which can be found on the Check_MK exchange. +def apt_valid_info(info): + return info and len(info[0]) == 1 and len(info[0][0].split(None, 3)) == 4 + + def inventory_apt(info): - yield None, {} + if apt_valid_info(info): + yield None, {} + def check_apt(_no_item, params, info): + if not apt_valid_info(info): + return + sec_regex = regex("^[^\\(]*\\(.* (Debian-Security:|Ubuntu:[^/]*/[^-]*-security)") updates = [] sec_updates = []

8 years, 7 months

#2960 FIX tsm_stagingpools: Fixed exception in case of garbled agent output

by Lars Michelsen

Module: check_mk Branch: master Commit: d900c8167ee2abfa88f9971b87a3ffbaa4f47ea4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d900c8167ee2ab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 26 14:14:23 2016 +0100 #2960 FIX tsm_stagingpools: Fixed exception in case of garbled agent output --- .werks/2960 | 9 +++++++++ ChangeLog | 1 + checks/tsm_stagingpools | 23 +++++++++++++++++++---- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/.werks/2960 b/.werks/2960 new file mode 100644 index 0000000..9d38106 --- /dev/null +++ b/.werks/2960 @@ -0,0 +1,9 @@ +Title: tsm_stagingpools: Fixed exception in case of garbled agent output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453814049 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 40c6fd6..7e6ff5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -219,6 +219,7 @@ * 2957 FIX: Renamed Lotus Domino Task Inventory rule to Lotus Domino Task Discovery * 2958 FIX: domino_tasks: Fixed broken discovery and check * 2959 FIX: apt: Made check more robust against invalid agent data + * 2960 FIX: tsm_stagingpools: Fixed exception in case of garbled agent output Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/tsm_stagingpools b/checks/tsm_stagingpools index d88739d..55fff44 100644 --- a/checks/tsm_stagingpools +++ b/checks/tsm_stagingpools @@ -42,20 +42,34 @@ factory_settings["tsm_stagingpools_default_levels"] = { "free_below" : 70, } -def inventory_tsm_stagingpools(info): +# The agent plugin sometimes seems to mix two lines together some times. +# detect and fix that. +def parse_tsm_stagingpools(info): + parsed = [] + for line in info: + if len(line) == 6: + parsed.append(line[:3]) + parsed.append(line[3:]) + else: + parsed.append(line) + return parsed + + +def inventory_tsm_stagingpools(parsed): items = set([]) - for inst, pool, util in info: + for inst, pool, util in parsed: if inst == "default": items.add(pool) else: items.add(inst + " / " + pool) return [ (item, "tsm_stagingpools_default_levels") for item in items ] -def check_tsm_stagingpools(item, params, info): + +def check_tsm_stagingpools(item, params, parsed): num_tapes = 0 num_free_tapes = 0 utilization = 0.0 # in relation to one tape size - for inst, pool, util in info: + for inst, pool, util in parsed: if inst + " / " + pool == item or pool == item: util = float(util) / 100.0 utilization += util @@ -91,6 +105,7 @@ def check_tsm_stagingpools(item, params, info): check_info['tsm_stagingpools'] = { + "parse_function" : parse_tsm_stagingpools, "check_function" : check_tsm_stagingpools, "inventory_function" : inventory_tsm_stagingpools, "service_description" : "TSM Stagingpool %s",

8 years, 7 months

#2962 FIX esx_vsphere_vm.guest_tools: Fixed exception in case no version info is available

by Lars Michelsen

Module: check_mk Branch: master Commit: fd424303748cfffcc9e52bcc52215e578a5d432b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd424303748cff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 26 14:18:31 2016 +0100 #2962 FIX esx_vsphere_vm.guest_tools: Fixed exception in case no version info is available --- .werks/2962 | 9 +++++++++ ChangeLog | 1 + checks/esx_vsphere_vm | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2962 b/.werks/2962 new file mode 100644 index 0000000..9920abd --- /dev/null +++ b/.werks/2962 @@ -0,0 +1,9 @@ +Title: esx_vsphere_vm.guest_tools: Fixed exception in case no version info is available +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453814285 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c3964d7..e252129 100644 --- a/ChangeLog +++ b/ChangeLog @@ -221,6 +221,7 @@ * 2959 FIX: apt: Made check more robust against invalid agent data * 2960 FIX: tsm_stagingpools: Fixed exception in case of garbled agent output * 2961 FIX: tsm_sessions: Fixed crash in cae of client name contains spaces + * 2962 FIX: esx_vsphere_vm.guest_tools: Fixed exception in case no version info is available Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 6f0a8f2..1d51288 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -238,7 +238,10 @@ def inventory_esx_vsphere_vm_guest_tools(info): def check_esx_vsphere_vm_guest_tools(_no_item, params, info): data = esx_vsphere_vm_convert(info) - vm_status = data['guest.toolsVersionStatus'][0] + try: + vm_status = data['guest.toolsVersionStatus'][0] + except KeyError: + return guest_tools_map = { "guestToolsCurrent": (0, "VMware Tools are installed and the version is current"),

8 years, 7 months

#2963 FIX esx_vsphere_datastores: Deal with empty url attribute of datastores

by Lars Michelsen

Module: check_mk Branch: master Commit: 984c8b9ca92cf43f87ba1d84eb5b6536c2540f0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=984c8b9ca92cf4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 26 14:25:42 2016 +0100 #2963 FIX esx_vsphere_datastores: Deal with empty url attribute of datastores --- .werks/2963 | 9 +++++++++ ChangeLog | 1 + checks/esx_vsphere_datastores | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/2963 b/.werks/2963 new file mode 100644 index 0000000..b478ab7 --- /dev/null +++ b/.werks/2963 @@ -0,0 +1,9 @@ +Title: esx_vsphere_datastores: Deal with empty url attribute of datastores +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453814735 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index e252129..8cb7aec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -222,6 +222,7 @@ * 2960 FIX: tsm_stagingpools: Fixed exception in case of garbled agent output * 2961 FIX: tsm_sessions: Fixed crash in cae of client name contains spaces * 2962 FIX: esx_vsphere_vm.guest_tools: Fixed exception in case no version info is available + * 2963 FIX: esx_vsphere_datastores: Deal with empty url attribute of datastores Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index 0aba3e3..ad7b112 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -42,7 +42,13 @@ def esx_vsphere_datastores_parse(info): store = {} stores[name] = store else: - key, value = line + # Seems that the url attribute can have an empty value + if len(line) == 1: + key = line[0].strip() + value = None + else: + key, value = line + if key == "accessible": value = value.lower() == "true" elif key in [ "capacity", "freeSpace", "uncommitted" ]:

8 years, 7 months

#2961 FIX tsm_sessions: Fixed crash in cae of client name contains spaces

by Lars Michelsen

Module: check_mk Branch: master Commit: 278d6ae0fe8d82b58e26252317bae29e9fb57f03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=278d6ae0fe8d82… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 26 14:15:02 2016 +0100 #2961 FIX tsm_sessions: Fixed crash in cae of client name contains spaces --- .werks/2961 | 9 +++++++++ ChangeLog | 1 + checks/tsm_sessions | 9 ++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/2961 b/.werks/2961 new file mode 100644 index 0000000..c01fde5 --- /dev/null +++ b/.werks/2961 @@ -0,0 +1,9 @@ +Title: tsm_sessions: Fixed crash in cae of client name contains spaces +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453814076 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7e6ff5b..c3964d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -220,6 +220,7 @@ * 2958 FIX: domino_tasks: Fixed broken discovery and check * 2959 FIX: apt: Made check more robust against invalid agent data * 2960 FIX: tsm_stagingpools: Fixed exception in case of garbled agent output + * 2961 FIX: tsm_sessions: Fixed crash in cae of client name contains spaces Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/tsm_sessions b/checks/tsm_sessions index 043f966..322c8ae 100644 --- a/checks/tsm_sessions +++ b/checks/tsm_sessions @@ -39,8 +39,15 @@ def check_tsm_sessions(item, params, info): for entry in info: if len(entry) == 4: sid, client_name, proc_state, wait = entry + + elif len(entry) > 4: + sid = entry[0] + proc_state, wait = entry[-2:] + client_name = " ".join(entry[1:-2]) + else: sid, proc_state, wait = entry + if proc_state in ['RecvW', 'MediaW']: wait = saveint(wait) if wait >= crit: @@ -49,7 +56,7 @@ def check_tsm_sessions(item, params, info): elif wait >= warn: state = max(state, 1) count += 1 - return state, "%d sessions to long in RecvW or MediaW state" % count + return state, "%d sessions too long in RecvW or MediaW state" % count check_info["tsm_sessions"] = {

8 years, 7 months

mssql_tablespaces: for unallocated space, the levels are now lower bounds, not upper

by Sebastian Herbord

Module: check_mk Branch: master Commit: 269b53f117baae42b3290b454c12605e8c2840ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=269b53f117baae… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Jan 26 14:21:05 2016 +0100 mssql_tablespaces: for unallocated space, the levels are now lower bounds, not upper It's no such thing as too much available space --- checks/mssql_tablespaces | 23 ++++++++++++----------- web/plugins/wato/check_parameters.py | 4 ++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/checks/mssql_tablespaces b/checks/mssql_tablespaces index ca0995e..b0e1c43 100644 --- a/checks/mssql_tablespaces +++ b/checks/mssql_tablespaces @@ -66,13 +66,13 @@ def check_mssql_tablespaces(item, params, info): output = [] perfdata = [] - for key, label, value, uom in [ - ('size', 'Size', float(line[2]), line[3]), - ('unallocated', 'Unallocated Space', float(line[4]), line[5]), - ('reserved', 'Reserved Space', float(line[6]), line[7]), - ('data', 'Data', float(line[8]), line[9]), - ('indexes', 'Indexes', float(line[10]), line[11]), - ('unused', 'Unused', float(line[12]), line[13]), + for key, label, value, uom, lower_bounds in [ + ('size', 'Size', float(line[2]), line[3], False), + ('unallocated', 'Unallocated Space', float(line[4]), line[5], True), + ('reserved', 'Reserved Space', float(line[6]), line[7], False), + ('data', 'Data', float(line[8]), line[9], False), + ('indexes', 'Indexes', float(line[10]), line[11], False), + ('unused', 'Unused', float(line[12]), line[13], False), ]: if uom == 'KB': val_bytes = value * 1024 @@ -86,12 +86,13 @@ def check_mssql_tablespaces(item, params, info): warn, crit = params.get(key, (None, None)) error_label = "" if warn and crit: - levels = "(warn/crit at %s/%s)" % \ - (get_bytes_human_readable(warn), get_bytes_human_readable(crit)) - if val_bytes > crit: + levels = "(warn/crit %s %s/%s)" % \ + (lower_bounds and "below" or "at", + get_bytes_human_readable(warn), get_bytes_human_readable(crit)) + if lower_bounds and val_bytes <= crit or not lower_bounds and val_bytes >= crit: state = 2 error_label += levels + "(!!)" - elif val_bytes > warn: + elif lower_bounds and val_bytes <= warn or not lower_bounds and val_bytes >= warn: state = max(state, 1) error_label += levels +"(!)" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d5a25e9..7508e39 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5427,8 +5427,8 @@ register_check_parameters( Tuple( title = _("Unallocated Space"), elements = [ - Filesize(title = _("Warning at")), - Filesize(title = _("Critical at")) + Filesize(title = _("Warning below")), + Filesize(title = _("Critical below")) ] )), ("reserved",

8 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016