Module: check_mk
Branch: master
Commit: f4887496a402546ba11ef296cda2f62bebc50555
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4887496a40254…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Wed Sep 2 13:01:10 2015 +0200
levels --> warn/crit
---
checks/ucs_bladecenter_psu | 8 ++++----
checks/win_dhcp_pools | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/checks/ucs_bladecenter_psu b/checks/ucs_bladecenter_psu
index db2bdbc..1dd4777 100644
--- a/checks/ucs_bladecenter_psu
+++ b/checks/ucs_bladecenter_psu
@@ -88,15 +88,15 @@ def check_ucs_bladecenter_psu(item, params, parsed):
if key in psu.keys():
warn_lower, crit_lower = params[param_key + "lower"]
if voltage <= crit_lower:
- yield 2, "too low (levels at %.2f/%.2f V)" % params[param_key +
"lower"]
+ yield 2, "too low (warn/crit below %.2f/%.2f V)" %
params[param_key + "lower"]
elif voltage <= warn_lower:
- yield 1, "too low (levels at %.2f/%.2f V)" % params[param_key +
"lower"]
+ yield 1, "too low (warn/crit below %.2f/%.2f V)" %
params[param_key + "lower"]
warn_upper, crit_upper = params[param_key + "upper"]
if voltage >= crit_upper:
- yield 2, "too high (levels at %.2f/%.2f V)" % params[param_key
+ "upper"]
+ yield 2, "too high (warn/crit at %.2f/%.2f V)" %
params[param_key + "upper"]
elif voltage >= warn_upper:
- yield 1, "too high (levels at %.2f/%.2f V)" % params[param_key
+ "upper"]
+ yield 1, "too high (warn/crit at %.2f/%.2f V)" %
params[param_key + "upper"]
check_info["ucs_bladecenter_psu"] = {
diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools
index d74653f..46e3fa9 100644
--- a/checks/win_dhcp_pools
+++ b/checks/win_dhcp_pools
@@ -140,7 +140,7 @@ def check_win_dhcp_pools(item, params, info):
infotext = 'Addresses Free: %d, Used: %d, Pending: %d' % (free, used,
pending)
if status:
- infotext += " (levels at %d/%d)" % (warn_abs, crit_abs)
+ infotext += " (warn/crit at %d/%d)" % (warn_abs, crit_abs)
return status, infotext, perfdata
else:
return (3, 'Pool information not found')