Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: #2321 FIX process discovery: fixed exception during service discovery when no explicit process matching was set

by Andreas Boesl

Module: check_mk Branch: master Commit: d8450ce0042d4972061a91681c5dba0dce68d0d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8450ce0042d49… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 1 15:52:40 2015 +0200 #2321 FIX process discovery: fixed exception during service discovery when no explicit process matching was set The process discovery failed with an exception when there was no match type explictly set. E.g. in WATO this means that the checkbox for Process Matching was unchecked. The check now uses the setting Match all services as default. --- .werks/2321 | 13 +++++++++++++ ChangeLog | 1 + checks/ps.include | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2321 b/.werks/2321 new file mode 100644 index 0000000..aa912cb --- /dev/null +++ b/.werks/2321 @@ -0,0 +1,13 @@ +Title: process discovery: fixed exception during service discovery when no explicit process matching was set +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435758354 + +The process discovery failed with an exception when there was no match type explictly set. +E.g. in WATO this means that the checkbox for Process Matching was unchecked. + +The check now uses the setting Match all services as default. diff --git a/ChangeLog b/ChangeLog index 20d2247..ae5ddf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 2319 FIX: winperf_if: fixed exception when using windows_if.ps1 in an old windows version... * 1261 FIX: apc_symmetra_power: Ignore unused phases during discovery * 2320 FIX: winperf_msx_queues: no longer crashes in service discovery if there are no msx queues available + * 2321 FIX: process discovery: fixed exception during service discovery when no explicit process matching was set... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/ps.include b/checks/ps.include index d77a5fb..9c29195 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -78,7 +78,7 @@ def inventory_ps_common(invdata, invrules, info): v = rule[0] - entries.append((v['descr'], v['match'], v.get('user'), v.get('default_params', v))) + entries.append((v['descr'], v.get('match'), v.get('user'), v.get('default_params', v))) for servicedesc, pattern, userspec, default_params in entries: num_perc_s = servicedesc.count("%s")

9 years, 2 months

Check_MK Git: check_mk: dell_chassis_status: Reworked check to use yield-API

by Konstantin Büttner

Module: check_mk Branch: master Commit: e58aa875f0f8eab0303b86fae8c1afd94aa7a96b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e58aa875f0f8ea… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jul 1 14:22:56 2015 +0200 dell_chassis_status: Reworked check to use yield-API --- checks/dell_chassis_status | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/checks/dell_chassis_status b/checks/dell_chassis_status index 0f9b7c8..7aa7819 100644 --- a/checks/dell_chassis_status +++ b/checks/dell_chassis_status @@ -39,24 +39,34 @@ def inventory_dell_chassis_status(info): return [ ( None, None ) ] def check_dell_chassis_status(item, _no_params, info): - di = dict() - di['URL'], di['Location'], di['Name'], di['ServiceTag'], di['DataCenter'], \ - di['FirmwareVersion'], status = info[0] + + whats = [ "URL", + "Locaction", + "Name", + "Service Tag", + "Data Center", + "Firmware Version", + "Status", + ] state_table = { - "1" : ( "other, ", 1 ), - "2" : ( "unknown, ", 1 ), - "3" : ( "", 0 ), - "4" : ( "nonCritical, ", 1 ), + "1" : ( "Other, ", 1 ), + "2" : ( "Unknown, ", 1 ), + "3" : ( "OK", 0 ), + "4" : ( "Non-Critical, ", 1 ), "5" : ( "Critical, ", 2 ), - "6" : ( "NonRecoverable, ", 2 ), + "6" : ( "Non-Recoverable, ", 2 ), } - infotext, state = state_table.get(status, ("unknown state", 2 )) - for parameter, value in di.items(): - infotext += "%s: %s, " % ( parameter, value ) - infotext = re.sub(", $","", infotext) - return state, infotext + things = zip(whats, info[0]) + + for what, value in things: + if what == "Status": + descr, status = state_table[value] + yield status, what + ": " + descr + else: + yield 0, what + ": " + value + check_info["dell_chassis_status"] = { "check_function" : check_dell_chassis_status,

9 years, 2 months

Check_MK Git: check_mk: Fix syntax error in werk

by Mathias Kettner

Module: check_mk Branch: master Commit: 49aa7b9540d6294236783ac0604a2e39fade4266 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49aa7b9540d629… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 1 14:09:30 2015 +0200 Fix syntax error in werk --- .werks/1261 | 3 +-- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.werks/1261 b/.werks/1261 index a37beca..13b3302 100644 --- a/.werks/1261 +++ b/.werks/1261 @@ -1,4 +1,4 @@ -Title: apc_symmetra_power: Ignore unused phases while disocery +Title: apc_symmetra_power: Ignore unused phases during discovery Level: 1 Component: checks Compatible: compat @@ -6,4 +6,3 @@ Version: 1.2.7i3 Date: 1435751643 Class: fix - diff --git a/ChangeLog b/ChangeLog index 739c191..20d2247 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,7 +24,7 @@ * 2368 FIX: ucd_cpu_load: fix exception in case of dump SNMP agent sending 12,540000 instead of 12.540000 * 2318 FIX: windows agent: no longer crashes when a cached plugin has several hundred sections... * 2319 FIX: winperf_if: fixed exception when using windows_if.ps1 in an old windows version... - * 1261 FIX: apc_symmetra_power: Ignore unused phases while disocery + * 1261 FIX: apc_symmetra_power: Ignore unused phases during discovery * 2320 FIX: winperf_msx_queues: no longer crashes in service discovery if there are no msx queues available Multisite:

9 years, 2 months

Check_MK Git: check_mk: #2320 FIX winperf_msx_queues: no longer crashes in service discovery if there are no msg queues available

by Andreas Boesl

Module: check_mk Branch: master Commit: 054a17cff55ece9797af4fc549d11297d89fcfec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=054a17cff55ece… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 1 13:58:33 2015 +0200 #2320 FIX winperf_msx_queues: no longer crashes in service discovery if there are no msg queues available --- .werks/2320 | 9 +++++++++ ChangeLog | 3 ++- checks/winperf_msx_queues | 27 ++++++++++++++------------- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.werks/2320 b/.werks/2320 new file mode 100644 index 0000000..e6fe97d --- /dev/null +++ b/.werks/2320 @@ -0,0 +1,9 @@ +Title: winperf_msx_queues: no longer crashes in service discovery if there are no msx queues available +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435751870 + diff --git a/ChangeLog b/ChangeLog index 204ef72..739c191 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,13 +18,14 @@ * 2362 FIX: mk_logwatch: fix cases where one logfile is listsed more than once in logwatch.cfg... * 2363 FIX: jolokia_metrics.uptime: Do not inventory instances where Uptime is missing - avoid crashed check * 2381 FIX: emc_datadomain_fans: Made check more robust against broken SNMP output - * 1261 FIX: apc_symmetra_power: Ignore unused phases while disocery * 2366 FIX: carel_sensors: fix crash in case of missing temperature sensor * 2382 FIX: mssql_backup: Formating age output more human friendly * 2383 FIX: FreeBSD Agent: Fixed handling <<<ps>>> section when jailed * 2368 FIX: ucd_cpu_load: fix exception in case of dump SNMP agent sending 12,540000 instead of 12.540000 * 2318 FIX: windows agent: no longer crashes when a cached plugin has several hundred sections... * 2319 FIX: winperf_if: fixed exception when using windows_if.ps1 in an old windows version... + * 1261 FIX: apc_symmetra_power: Ignore unused phases while disocery + * 2320 FIX: winperf_msx_queues: no longer crashes in service discovery if there are no msx queues available Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/winperf_msx_queues b/checks/winperf_msx_queues index ee78352..a770572 100644 --- a/checks/winperf_msx_queues +++ b/checks/winperf_msx_queues @@ -73,19 +73,20 @@ winperf_msx_queues = { winperf_msx_queues_inventory = [] def inventory_winperf_msx_queues(info): - num_instances = int(info[1][0]) - if num_instances > 0: - # Its possible to set the wanted queues via wato - inventory_rules = {} - for rulset in host_extra_conf(g_hostname, winperf_msx_queues_inventory): - inventory_rules.update(dict(rulset)) - # In case that rules for this host are set, - # only use this rules - if inventory_rules: - queues = inventory_rules - else: - queues = winperf_msx_queues - return [ (name, { "offset" : offset } ) for name, offset in queues.items() ] + if len(info) > 1: + num_instances = int(info[1][0]) + if num_instances > 0: + # Its possible to set the wanted queues via wato + inventory_rules = {} + for rulset in host_extra_conf(g_hostname, winperf_msx_queues_inventory): + inventory_rules.update(dict(rulset)) + # In case that rules for this host are set, + # only use this rules + if inventory_rules: + queues = inventory_rules + else: + queues = winperf_msx_queues + return [ (name, { "offset" : offset } ) for name, offset in queues.items() ] def check_winperf_msx_queues(item, params, info): num_instances = int(info[1][0])

9 years, 2 months

Check_MK Git: check_mk: #1261 FIX apc_symmetra_power: Ignore unused phases while disocery

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0e9bf0a210255cfe1d8ab5b799fa64e1ddb189eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e9bf0a210255c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 1 13:54:31 2015 +0200 #1261 FIX apc_symmetra_power: Ignore unused phases while disocery --- .werks/1261 | 9 +++++++++ ChangeLog | 1 + checks/apc_symmetra_power | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1261 b/.werks/1261 new file mode 100644 index 0000000..a37beca --- /dev/null +++ b/.werks/1261 @@ -0,0 +1,9 @@ +Title: apc_symmetra_power: Ignore unused phases while disocery +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1435751643 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index b9ac12f..c8a369d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * 2362 FIX: mk_logwatch: fix cases where one logfile is listsed more than once in logwatch.cfg... * 2363 FIX: jolokia_metrics.uptime: Do not inventory instances where Uptime is missing - avoid crashed check * 2381 FIX: emc_datadomain_fans: Made check more robust against broken SNMP output + * 1261 FIX: apc_symmetra_power: Ignore unused phases while disocery Multisite: * 2314 FIX: Availability: fixed exception when grouping by host or service group diff --git a/checks/apc_symmetra_power b/checks/apc_symmetra_power index 86afaae..8d260f9 100644 --- a/checks/apc_symmetra_power +++ b/checks/apc_symmetra_power @@ -27,7 +27,10 @@ apc_power_default_levels = (20, 1) # warning / critical *below* those levels (Watt) def inventory_apc_power(info): - return [ (line[0], "", "apc_power_default_levels") for line in info ] + for line in info: + value = int(line[1]) + if value not in [ 0, -1]: + yield line[0], "apc_power_default_levels" def check_apc_power(item, params, info): warn, crit = params

9 years, 2 months

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: b154ec329c484a9f1d7f08e7356bb9b23cfc3986 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b154ec329c484a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 1 13:54:53 2015 +0200 merge conflict ---

9 years, 2 months

Check_MK Git: check_mk: wut_webtherm.humidity: New check to support humidity sensors on WuT devices

by Konstantin Büttner

Module: check_mk Branch: master Commit: 69f38f0d12ebe50875f77847eda1dd02bb83d80b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69f38f0d12ebe5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jul 1 12:54:19 2015 +0200 wut_webtherm.humidity: New check to support humidity sensors on WuT devices --- checks/wut_webtherm | 77 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 5 deletions(-) diff --git a/checks/wut_webtherm b/checks/wut_webtherm index 262087c..a88fa29 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -36,12 +36,79 @@ def detect_webtherm(oid): ".1.3.6.1.4.1.5040.1.2.16", ".1.3.6.1.4.1.5040.1.2.18" ] +#. +# .--Air Pressure--------------------------------------------------------. +# | _ _ ____ | +# | / \ (_)_ __ | _ \ _ __ ___ ___ ___ _ _ _ __ ___ | +# | / _ \ | | '__| | |_) | '__/ _ \/ __/ __| | | | '__/ _ \ | +# | / ___ \| | | | __/| | | __/\__ \__ \ |_| | | | __/ | +# | /_/ \_\_|_| |_| |_| \___||___/___/\__,_|_| \___| | +# | | +# '----------------------------------------------------------------------' + +#def inventory_wut_webtherm_pressure(info): +# for index, reading in info: +# if index.split(".")[1] == "3": +# yield "3", None +# +# +#def check_wut_webtherm_pressure(item, params, info): +# return 3, "Not implemented yet" +# +# +#check_info["wut_webtherm.pressure"] = { +# "inventory_function" : inventory_wut_webtherm_pressure, +# "check_function" : check_wut_webtherm_pressure, +# "service_description" : "Pressure %s", +#} + +#. +# .--Humidity------------------------------------------------------------. +# | _ _ _ _ _ _ | +# | | | | |_ _ _ __ ___ (_) __| (_) |_ _ _ | +# | | |_| | | | | '_ ` _ \| |/ _` | | __| | | | | +# | | _ | |_| | | | | | | | (_| | | |_| |_| | | +# | |_| |_|\__,_|_| |_| |_|_|\__,_|_|\__|\__, | | +# | |___/ | +# '----------------------------------------------------------------------' + +wut_webtherm_humidity_defaultlevels = (35, 40, 60, 65) + +def inventory_wut_webtherm_humidity(info): + print info + for index, reading in info: + if index.split(".")[1] == "2": + yield "2", None + + +def check_wut_webtherm_humidity(item, params, info): + humidity = float(line[1].replace(",",".")) + return check_humidity(humidity, params) + + +check_info["wut_webtherm.humidity"] = { + "inventory_function" : inventory_wut_webtherm_humidity, + "check_function" : check_wut_webtherm_humidity, + "service_description" : "Humidity %s", + "includes" : [ "humidity.include" ], + "group" : "humidity", +} + +#. +# .--Temperature---------------------------------------------------------. +# | _____ _ | +# | |_ _|__ _ __ ___ _ __ ___ _ __ __ _| |_ _ _ _ __ ___ | +# | | |/ _ \ '_ ` _ \| '_ \ / _ \ '__/ _` | __| | | | '__/ _ \ | +# | | | __/ | | | | | |_) | __/ | | (_| | |_| |_| | | | __/ | +# | |_|\___|_| |_| |_| .__/ \___|_| \__,_|\__|\__,_|_| \___| | +# | |_| | +# '----------------------------------------------------------------------' + factory_settings["wut_webtherm_defaultlevels"] = { "levels" : (30, 35), } -def inventory_webtherm(info): - print info +def inventory_wut_webtherm(info): # line[0] is 1.1, 2.1, 3.1, 6.1, 8.1, 16.1 or 18.1 depending on MIB variant. We chop # of the first part in order to get independent of that. for line in info: @@ -53,7 +120,7 @@ def inventory_webtherm(info): continue yield line[0].split(".")[1], {} -def check_webtherm(item, params, info): +def check_wut_webtherm(item, params, info): for line in info: if line[0].split(".")[1] == item: temp = float(line[1].replace(",", ".")) @@ -62,8 +129,8 @@ def check_webtherm(item, params, info): check_info["wut_webtherm"] = { 'default_levels_variable' : "wut_webtherm_defaultlevels", - 'inventory_function' : inventory_webtherm, - 'check_function' : check_webtherm, + 'inventory_function' : inventory_wut_webtherm, + 'check_function' : check_wut_webtherm, 'service_description' : 'Temperature %s', 'has_perfdata' : True, 'snmp_info' : ('.1.3.6.1.4.1.5040.1.2',

9 years, 2 months

Check_MK Git: check_mk: Removed print statement

by Konstantin Büttner

Module: check_mk Branch: master Commit: 33e10b472ff2d188a4c715d98bfd076075d0b7ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33e10b472ff2d1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jul 1 13:50:23 2015 +0200 Removed print statement --- checks/wut_webtherm | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/wut_webtherm b/checks/wut_webtherm index a88fa29..add64ee 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -75,7 +75,6 @@ def detect_webtherm(oid): wut_webtherm_humidity_defaultlevels = (35, 40, 60, 65) def inventory_wut_webtherm_humidity(info): - print info for index, reading in info: if index.split(".")[1] == "2": yield "2", None

9 years, 2 months

Check_MK Git: check_mk: Fixed crashing check helpers in case of non-ASCII check output

by Mathias Kettner

Module: check_mk Branch: master Commit: 9162b7759bb817f36f0e85763959121295bc8b6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9162b7759bb817… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 1 13:19:45 2015 +0200 Fixed crashing check helpers in case of non-ASCII check output --- modules/check_mk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index faae8de..8b6c55a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5353,8 +5353,8 @@ def do_check_keepalive(): g_total_check_output = "%s - Check_MK timed out after %d seconds\n" % ( core_state_names[status], g_timeout) - os.write(keepalive_fd, "%03d\n%08d\n%s" % - (status, len(g_total_check_output), make_utf8(g_total_check_output))) + check_output_utf8 = make_utf8(g_total_check_output) + os.write(keepalive_fd, "%03d\n%08d\n%s" % (status, len(check_output_utf8), check_output_utf8)) g_total_check_output = "" except Exception, e:

9 years, 2 months

Check_MK Git: check_mk: Fixed code formatting

by Mathias Kettner

Module: check_mk Branch: master Commit: 3858d4d4e9e9820aaf3a7a33bae79d29ce96357c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3858d4d4e9e982… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 1 13:19:31 2015 +0200 Fixed code formatting --- checks/temperature.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/temperature.include b/checks/temperature.include index a062cae..23c11ea 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -58,9 +58,9 @@ def render_temp(n, output_unit): return "%.1f" % t temp_unitsym = { -"c": "°C", -"f": "°F", -"k": "K", + "c": "°C", + "f": "°F", + "k": "K", }

9 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015