[checkmk-commits] Check_MK Git: check_mk: #2089 FIX Debug mode shows details about errors in autochecks as expected now

Module: check_mk Branch: master Commit: 812a5cb38f1f21ca943d43cb8728e2009f502c40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=812a5cb38f1f21… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 5 12:49:12 2015 +0100 #2089 FIX Debug mode shows details about errors in autochecks as expected now --- .werks/2089 | 10 ++++++++++ ChangeLog | 3 ++- modules/discovery.py | 8 ++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.werks/2089 b/.werks/2089 new file mode 100644 index 0000000..58fdc18 --- /dev/null +++ b/.werks/2089 @@ -0,0 +1,10 @@ +Title: Debug mode shows details about errors in autochecks as expected now +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425556119 + + diff --git a/ChangeLog b/ChangeLog index 3785ddb..de9f62d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 2014 FIX: Fixed different issues running Check_MK on CentOS 5.x * 2037 FIX: Inventorize piggy back data even if access to normal agent fails * 2016 FIX: Fixed service discovery / monitoring on hosts which have only piggyback data (e.g. ESX VMs)... + * 2089 FIX: Debug mode shows details about errors in autochecks as expected now Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... @@ -105,11 +106,11 @@ * 2052 winperf_if: Now able to automatically group teamed interfaces and more... NOTE: Please refer to the migration notes! * 2053 New windows plugin: windows_if.ps1, renders wmic_if.ps1 obsolete... - * 1894 hwg_humidity: New check to monitor humidity sensors attached to HWg-STE... * 1864 akcp_exp_drycontact, akcp_exp_temp : change to service output and levels... * 2043 ibm_svc_mdiskgrp: Fix computation of capacity, show and check provisioning... NOTE: Please refer to the migration notes! * 2044 IBM SVC checks: renamed services, remove bogus IBM SVC... + * 1894 hwg_humidity: New check to monitor humidity sensors attached to HWg-STE... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/modules/discovery.py b/modules/discovery.py index 0315c32..1c7008c 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -721,16 +721,16 @@ def read_autochecks_of(hostname, world="config"): try: autochecks_raw = eval(file(filepath).read()) except SyntaxError,e: - if opt_verbose: + if opt_verbose or opt_debug: sys.stderr.write("Syntax error in file %s: %s\n" % (filepath, e)) if opt_debug: - sys.exit(3) + raise return [] except Exception, e: - if opt_verbose: + if opt_verbose or opt_debug: sys.stderr.write("Error in file %s:\n%s\n" % (filepath, e)) if opt_debug: - sys.exit(3) + raise return [] # Exchange inventorized check parameters with those configured by