[checkmk-commits] Check_MK Git: check_mk: FIX oracle_tablespaces: now able to bear None values as warn/crit levels

Module: check_mk Branch: master Commit: e8a79db20d1fce7a3abea3ee07922fb43c5c5527 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8a79db20d1fce… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 8 10:46:52 2014 +0200 FIX oracle_tablespaces: now able to bear None values as warn/crit levels The levels in the oracle_tablespaces parameters could be set to None if dynamic levels were used, but the filesystem was not within the limits of the dynamic levels. This caused an invalid check output. --- .werks/788 | 11 +++++++++++ ChangeLog | 1 + checks/oracle_tablespaces | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/788 b/.werks/788 new file mode 100644 index 0000000..f692950 --- /dev/null +++ b/.werks/788 @@ -0,0 +1,11 @@ +Title: oracle_tablespaces: now able to bear None values as warn/crit levels +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1396946661 +Class: fix + +The levels in the oracle_tablespaces parameters could be set to None +if dynamic levels were used, but the filesystem was not within the limits +of the dynamic levels. +This caused an invalid check output. diff --git a/ChangeLog b/ChangeLog index 6f647db..ac71639 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used... + * 0788 FIX: oracle_tablespaces: now able to bear None values as warn/crit levels... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index a8c01c6..7ed2eec 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -257,7 +257,7 @@ def check_oracle_tablespaces(item, params, info): else: status = max(1, status) - perfdata = [ ("size", current_size, max_size - warn, max_size - crit), + perfdata = [ ("size", current_size, max_size - (warn or 0), max_size - (crit or 0)), ("used", used), ("max_size", max_size) ]