[checkmk-commits] Check_MK Git: check_mk: emc_isilon_power: Minor code cleanup

Module: check_mk Branch: master Commit: 0aab8265d131f8b64ecdd23d900b3be6b938bcd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0aab8265d131f8… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Aug 17 12:02:03 2015 +0200 emc_isilon_power: Minor code cleanup --- checkman/emc_isilon_power | 12 +----------- checks/emc_isilon_power | 16 +++++++++++----- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/checkman/emc_isilon_power b/checkman/emc_isilon_power index 3a48ed0..35cdd42 100644 --- a/checkman/emc_isilon_power +++ b/checkman/emc_isilon_power @@ -12,14 +12,4 @@ item: Power Supply 1 Input, Power Supply 2 Input, ... inventory: - Creates one service per voltage reading - -[parameters] -parameters (tuple): A pair of numbers for warning and critical level - - warning (int): The lower limit which triggers an WARNING state - - critical (int): The lower limit which triggers an CRITICAL state - -[configuration] -emc_isilon_power_default_levels (tuple): Default warning and critical level + Creates one service per power supply diff --git a/checks/emc_isilon_power b/checks/emc_isilon_power index 24da1f6..013f2b4 100644 --- a/checks/emc_isilon_power +++ b/checks/emc_isilon_power @@ -48,15 +48,21 @@ def check_emc_isilon_power(item, params, info): for line in info: if item == isilon_power_item_name(line[0]): volt = float(line[1]) - yield 0, "%.1f V" % volt - warn_lower, crit_lower = params - limits_text = " (warn/crit below %.1f/%.1f V)" % (warn_lower, crit_lower) + infotext = "%.1f V" % volt + warn_lower, crit_lower = params + levelstext = " (warn/crit below %.1f/%.1f V)" % (warn_lower, crit_lower) if volt < crit_lower: - yield 2, limits_text + state = 2 + infotext += levelstext elif volt < warn_lower: - yield 1, limits_text + state = 1 + infotext += levelstext + else: + state = 0 + + return state, infotext check_info["emc_isilon_power"] = {