[checkmk-commits] 6905 jolokia_generic: Don't discover wrong types

Module: check_mk Branch: master Commit: 327930c101ac92e66b87f79ff15c3be607f3f1df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=327930c101ac92… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Nov 16 14:38:49 2018 +0100 6905 jolokia_generic: Don't discover wrong types The jolokia generic check no longer discovers services that would -- due to the wrong value type -- go to UNKNOWN anyway. Change-Id: I04aac60c6a007cd9f813b95574ff10e1f4e3fcbc --- .werks/6905 | 12 ++++++++++++ checks/jolokia_generic | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.werks/6905 b/.werks/6905 new file mode 100644 index 0000000..909ba99 --- /dev/null +++ b/.werks/6905 @@ -0,0 +1,12 @@ +Title: jolokia_generic: Don't discover wrong types +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542375396 +Class: feature + +The jolokia generic check no longer discovers services that would + -- due to the wrong value type -- go to UNKNOWN anyway. + diff --git a/checks/jolokia_generic b/checks/jolokia_generic index e223ca2..800b7c4 100644 --- a/checks/jolokia_generic +++ b/checks/jolokia_generic @@ -88,8 +88,12 @@ check_info["jolokia_generic.string"] = { def inventory_jolokia_generic_rate(parsed): - for item in parsed: - if parsed[item]["type"] == "rate": + for item, data in parsed.iteritems(): + if data.get("type") == "rate": + try: + float(data["value"]) + except (KeyError, ValueError): + continue yield item, {} @@ -163,8 +167,12 @@ check_info["jolokia_generic.rate"] = { def inventory_jolokia_generic(parsed): - for item in parsed: - if parsed[item]["type"] == "number": + for item, data in parsed.iteritems(): + if data.get("type") == "number": + try: + float(data["value"]) + except (KeyError, ValueError): + continue yield item, {}