[checkmk-commits] Check_MK Git: check_mk: #1640 FIX check_jolokia_metrics_serv_req: Fixed wrong levels shown for upper thresholds

Module: check_mk Branch: master Commit: ee4619a272af7eec73f30aa43ba140de6f83f276 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee4619a272af7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 12:15:58 2014 +0100 #1640 FIX check_jolokia_metrics_serv_req: Fixed wrong levels shown for upper thresholds --- .werks/1640 | 9 +++++++++ ChangeLog | 1 + checks/jolokia_metrics | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1640 b/.werks/1640 new file mode 100644 index 0000000..23745d3 --- /dev/null +++ b/.werks/1640 @@ -0,0 +1,9 @@ +Title: check_jolokia_metrics_serv_req: Fixed wrong levels shown for upper thresholds +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417691732 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8eb9264..ae862ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,7 @@ * 1617 FIX: lnx_if: Deal with data provided by cluster host * 1618 FIX: ad_replication: Output of timeLastSuccess and timeLastFailure was inverted... * 1623 FIX: hp_proliant_mem: support for some yet unhandled status situations + * 1640 FIX: check_jolokia_metrics_serv_req: Fixed wrong levels shown for upper thresholds Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index af330b3..c744cbc 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -437,10 +437,10 @@ def check_jolokia_metrics_serv_req(item, params, info): status_txt = ' (Below or equal %d)' % lo_warn elif hi_crit is not None and req >= hi_crit: status = 2 - status_txt = ' (Above or equal %d)' % lo_warn + status_txt = ' (Above or equal %d)' % hi_crit elif hi_warn is not None and req >= hi_warn: status = 1 - status_txt = ' (Above or equal %d)' % lo_crit + status_txt = ' (Above or equal %d)' % hi_warn output = ['Requests: %d%s' % (req, status_txt)] perfdata = [('Requests', req, hi_warn, hi_crit)]