[checkmk-commits] Check_MK Git: check_mk: #2037 FIX Inventorize piggy back data even if access to normal agent fails

Module: check_mk Branch: master Commit: 4afc6d3bbb800058b2ebfdad2892cdf71d480b2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4afc6d3bbb8000… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 24 10:16:41 2015 +0100 #2037 FIX Inventorize piggy back data even if access to normal agent fails --- .werks/2037 | 10 ++++++++++ ChangeLog | 1 + modules/discovery.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2037 b/.werks/2037 new file mode 100644 index 0000000..9bcf3de --- /dev/null +++ b/.werks/2037 @@ -0,0 +1,10 @@ +Title: Inventorize piggy back data even if access to normal agent fails +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424769389 + + diff --git a/ChangeLog b/ChangeLog index e7cd726..33f3b95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 1982 FIX: Fixed exception during checking regular checking when having checks without discovery function * 2012 FIX: Piggyback hostname translation can now deal correctly with umlauts * 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 Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/discovery.py b/modules/discovery.py index b6bb015..2b1f6dd 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -377,7 +377,7 @@ def discover_check_type(hostname, ipaddress, check_type, use_caches): info = None # default in case of exception info = get_info_for_discovery(hostname, ipaddress, section_name, use_caches) except MKAgentError, e: - if str(e): + if str(e) and str(e) != "Cannot get information from agent, processing only piggyback data.": raise except MKSNMPError, e: if str(e):