[checkmk-commits] Check_MK Git: check_mk: vms_cpu: Correctly handle perfdata if no alert levels were configured by the user

Module: check_mk Branch: master Commit: 018bdc9c509a02782562c1705910950a0457b21c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=018bdc9c509a02… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Aug 2 12:09:03 2012 +0200 vms_cpu: Correctly handle perfdata if no alert levels were configured by the user --- checks/vms_cpu | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/checks/vms_cpu b/checks/vms_cpu index 9e2b862..6189aee 100644 --- a/checks/vms_cpu +++ b/checks/vms_cpu @@ -42,7 +42,15 @@ def check_vms_cpu(item, params, info): system = 100.0 - idle - user - wait infotext = " - user: %2.1f%%, system: %2.1f%%, wait: %2.1f%%" % (user, system, wait) state = 0 + perfdata = [ + ( "user", user ), + ( "system", system ), + ( "wait", wait, 0, 0 ) ] if params: + perfdata = [ + ( "user", user ), + ( "system", system ), + ( "wait", wait, warn, crit ) ] warn, crit = params if wait >= crit: state = 2 @@ -51,10 +59,6 @@ def check_vms_cpu(item, params, info): state = 1 infotext += '(!)' - perfdata = [ - ( "user", user ), - ( "system", system ), - ( "wait", wait, warn, crit ) ] return (state, nagios_state_names[state] + infotext, perfdata) check_info['vms_cpu'] = {