[checkmk-commits] Check_MK Git: check_mk: #1982 FIX Fixed exception during checking regular checking when having checks without discovery function

Module: check_mk Branch: master Commit: c21fbed1c5512382d88d657534867b45a6b27337 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c21fbed1c55123… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 10 08:35:40 2015 +0100 #1982 FIX Fixed exception during checking regular checking when having checks without discovery function --- .werks/1982 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1982 b/.werks/1982 new file mode 100644 index 0000000..cf35f24 --- /dev/null +++ b/.werks/1982 @@ -0,0 +1,10 @@ +Title: Fixed exception during checking regular checking when having checks without discovery function +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423553729 + + diff --git a/ChangeLog b/ChangeLog index 81d6f85..a74b053 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * 1880 FIX: inventory_processes rules can now be configured without setting levels... * 1882 FIX: Fixed exception "filesystem_levels" not defined when compiling config for nagios * 1977 FIX: Dramatically reduced size of Check_MK check helper processes... + * 1982 FIX: Fixed exception during checking regular checking when having checks without discovery function Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/check_mk.py b/modules/check_mk.py index d7927b7..60d5444 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2671,7 +2671,7 @@ opt_verbose = ('-v' in sys.argv) and 1 or 0 opt_debug = '-d' in sys.argv # make sure these names are defined (even if never needed) -no_inventory_possible = None +no_discovery_possible = None """) # Compile in all neccessary global variables