[checkmk-commits] Check_MK Git: check_mk: #2190 FIX jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are defined

Module: check_mk Branch: master Commit: 5b721ca61bb191a63e392f2d5dcb84f20cf6774d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b721ca61bb191… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 14:49:42 2015 +0200 #2190 FIX jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are defined --- .werks/2190 | 10 ++++++++++ ChangeLog | 1 + checks/jolokia_metrics | 12 ++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/2190 b/.werks/2190 new file mode 100644 index 0000000..cba2186 --- /dev/null +++ b/.werks/2190 @@ -0,0 +1,10 @@ +Title: jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are defined +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428497362 + + diff --git a/ChangeLog b/ChangeLog index 1fa6c17..5ef9a8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -310,6 +310,7 @@ * 2110 FIX: netapp_api_aggr: check did not take configured levels when using Nagios * 1954 FIX: fileinfo / fileinfo.groups: Fixed discovery function for fileinfo groups and equalize agent output of fileinfo agents... * 2111 FIX: hitachi_hnas_volume: fix for cases when size information of volumes is not available + * 2190 FIX: jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are defined Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index bc83312..0592d0c 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -525,8 +525,9 @@ def check_jolokia_metrics_gc(item, params, info): if gc == None: return - if params: - cwarn, ccrit = params.get('CollectionCount', (None, None)) + if params == None: + params = {} + crate = get_rate("jvm.gc.count.%s" % (item), \ time.time(), int(gc['CollectionCount'])) @@ -534,6 +535,7 @@ def check_jolokia_metrics_gc(item, params, info): ctext = '' status = 0 + cwarn, ccrit = params.get('CollectionCount', (None, None)) if cwarn != None and ccrit != None: if crate >= int(ccrit): status = 2 @@ -546,9 +548,7 @@ def check_jolokia_metrics_gc(item, params, info): [('CollectionCount', crate, cwarn, ccrit)] if 'CollectionTime' in gc: - if params: - twarn, tcrit = params.get('CollectionTime', (None, None)) - + twarn, tcrit = params.get('CollectionTime', (None, None)) trate = get_rate("jvm.gc.time.%s" % (item), \ time.time(), int(gc['CollectionTime'])) trate = trate * 60.0 @@ -563,7 +563,7 @@ def check_jolokia_metrics_gc(item, params, info): status = 1 ttext = "(Level %s) " % twarn - yield status, "%.2f GC ms/minute%s" % (trate, text), \ + yield status, "%.2f GC ms/minute%s" % (trate, ttext), \ [('CollectionTime', trate, twarn, tcrit)]