Module: check_mk
Branch: master
Commit: 0598d438351ca9f2538808ebb45baa0b32c96f1e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0598d438351ca9…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Wed Jun 3 17:08:56 2015 +0200
raritan_pdu_ocprot: Cleanup after merge of subchecks
---
checkman/raritan_pdu_ocprot | 9 +++++++--
checkman/raritan_pdu_ocprot.current | 17 -----------------
web/plugins/metrics/check_mk.py | 2 +-
3 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/checkman/raritan_pdu_ocprot b/checkman/raritan_pdu_ocprot
index 46fad38..bc89d6d 100644
--- a/checkman/raritan_pdu_ocprot
+++ b/checkman/raritan_pdu_ocprot
@@ -1,4 +1,4 @@
-title: Raritan PX-2000 family PDU overcurrent protector status
+title: Raritan PX-2000 family PDU overcurrent protector
agents: snmp
catalog: hw/other
license: GPL
@@ -6,10 +6,15 @@ distribution: check_mk
description:
This check monitors the electrical current of overcurrent protectors
of the Raritan PX-2000 family of intelligent rack power distribution
- units (iPDUs).
+ units (iPDUs). As well as the current, the status as reported by the
+ device is taken into account, whereby the status open is interpreted
+ as CRIT, closed as OK, and unavailable as UNKNOWN.
item:
The ID of the Overcurrent protector, eg. C1.
+perfdata:
+ One value: The current current in Ampère.
+
inventory:
One check per overcurrent protector is created.
diff --git a/checkman/raritan_pdu_ocprot.current b/checkman/raritan_pdu_ocprot.current
deleted file mode 100644
index 07e3d83..0000000
--- a/checkman/raritan_pdu_ocprot.current
+++ /dev/null
@@ -1,17 +0,0 @@
-title: Raritan PX-2000 family PDU overcurrent protector status
-agents: snmp
-catalog: hw/other
-license: GPL
-distribution: check_mk
-description:
- This check monitors the current of overcurrent protectors of the Raritan PX-2000
- family of intelligent rack power distribution units (iPDUs).
-
-item:
- The ID of the Overcurrent protector, eg. C1.
-
-perfdata:
- One value: The current current in Ampère.
-
-inventory:
- One check per overcurrent protector is created.
diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py
index 6d6aaa8..3190c77 100644
--- a/web/plugins/metrics/check_mk.py
+++ b/web/plugins/metrics/check_mk.py
@@ -1412,7 +1412,7 @@ check_metrics["check_mk-apc_rackpdu_power"]
= { "amperage" :
check_metrics["check_mk-apc_ats_output"] = {
"volt" : { "name" : "voltage" }, "watt" : {
"name" : "power"}, "ampere": { "name":
"current"}, "load_perc" : { "name": "output_load"
}}
check_metrics["check_mk-raritan_pdu_inlet"] = {}
check_metrics["check_mk-raritan_pdu_inlet_summary"] = {}
-check_metrics["check_mk-raritan_pdu_ocprot.current"] = {}
+check_metrics["check_mk-raritan_pdu_ocprot"] = {}
check_metrics["check_mk-ups_socomec_outphase"] = {}
check_metrics["check_mk-ucs_bladecenter_psu.switch_power"] = {}
check_metrics["check_mk-bluenet_meter"] = {}