Module: check_mk Branch: master Commit: e1e567fa7602ccd46645569b346abe4bdc8bb329 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1e567fa7602cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 6 14:03:40 2013 +0200 FIX: jolokia_info: ignore ERROR instances Conflicts: ChangeLog --- ChangeLog | 6 ++++++ checks/jolokia_info | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2de199d..462695c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,12 @@ * Inventory: Display link symbol for ps ruleset * FIX: Rulesets: correct display of rules within subfolders + +1.2.2p2: + Checks & Agents: + * FIX: jolokia_info: ignore ERROR instances + + 1.2.2p1: Core: * FIX: correctly quote ! and \ in active checks for Nagios diff --git a/checks/jolokia_info b/checks/jolokia_info index 30c7e01..9bde781 100644 --- a/checks/jolokia_info +++ b/checks/jolokia_info @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. def inventory_jolokia_info(info): - return [ (line[0], None) for line in info ] + return [ (line[0], None) for line in info if line[1] != 'ERROR' ] def check_jolokia_info(item, _no_params, info): for line in info: