Module: check_mk
Branch: master
Commit: 48051181c1d64404223c21d7d6413b3b4b5a881c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48051181c1d644…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Thu Nov 12 14:51:10 2015 +0100
updated netextreme_psu_in check
---
.werks/2835 | 13 +++++++++++++
ChangeLog | 1 +
checks/netextreme_psu_in | 9 +--------
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/.werks/2835 b/.werks/2835
new file mode 100644
index 0000000..85f7cf6
--- /dev/null
+++ b/.werks/2835
@@ -0,0 +1,13 @@
+Title: netextreme_psu_in: fixed wrong voltage usage handling
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i4
+Date: 1447335434
+
+This value is not the current voltage usage,
+but rather the PSU type defined in EXTREME-SYSTEM-MIB:
+v110 (1), v220 (2), v48DC (3), unknown(4)
+Thus we do not monitor this value any more.
diff --git a/ChangeLog b/ChangeLog
index d1ffe9a..0a9a9ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,7 @@
* 2786 FIX: agent_netapp: now able to monitor more than 20 instances of a given type,
e.g. volumes or interfaces...
* 2765 FIX: heartbeat_crm: Fixed issue detecting outdated data with daylight saving
time
* 2775 FIX: omd_status: handle case where status information is incomplete due to
missing cmk version
+ * 2835 FIX: netextreme_psu_in: fixed wrong voltage usage handling...
Multisite:
* 2684 Added icons for downloading agent data / walks of hosts...
diff --git a/checks/netextreme_psu_in b/checks/netextreme_psu_in
index 21b733b..f69df7f 100644
--- a/checks/netextreme_psu_in
+++ b/checks/netextreme_psu_in
@@ -24,10 +24,6 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
-# .1.3.6.1.4.1.1916.1.1.1.27.1.3.1 4 -->
EXTREME-SYSTEM-MIB::extremePowerSupplyInputVoltage.1
-# .1.3.6.1.4.1.1916.1.1.1.27.1.3.2 4 -->
EXTREME-SYSTEM-MIB::extremePowerSupplyInputVoltage.2
-# .1.3.6.1.4.1.1916.1.1.1.27.1.8.1 2 -->
EXTREME-SYSTEM-MIB::extremePowerSupplySource.1
-# .1.3.6.1.4.1.1916.1.1.1.27.1.8.2 2 -->
EXTREME-SYSTEM-MIB::extremePowerSupplySource.2
# .1.3.6.1.4.1.1916.1.1.1.27.1.9.1 52550 -->
EXTREME-SYSTEM-MIB::extremePowerSupplyInputPowerUsage.1
# .1.3.6.1.4.1.1916.1.1.1.27.1.9.2 43700 -->
EXTREME-SYSTEM-MIB::extremePowerSupplyInputPowerUsage.2
# .1.3.6.1.4.1.1916.1.1.1.27.1.11.1 -3 -->
EXTREME-SYSTEM-MIB::extremePowerSupplyInputPowerUsageUnitMultiplier.1
@@ -35,8 +31,7 @@
# Just an assumption
factory_settings["netextreme_psu_in_default_levels"] = {
- "power" : (1100, 1200), # This levels a recomended by the manufactorer
- "voltage" : (2, 1),
+ "power" : (110, 120), # This levels a recomended by the manufactorer
}
def parse_netextreme_psu_in(info):
@@ -44,7 +39,6 @@ def parse_netextreme_psu_in(info):
for psu_index, psu_voltage_str, psu_usage_str, psu_factor_str in info:
parsed["Input %s" % psu_index] = {
"power" : float(psu_usage_str) * pow(10, int(psu_factor_str)),
- "voltage" : float(psu_voltage_str),
}
return parsed
@@ -57,7 +51,6 @@ check_info['netextreme_psu_in'] = {
'has_perfdata' : True,
'snmp_info' : (".1.3.6.1.4.1.1916.1.1.1.27.1", [
OID_END, # Power Supply Index
- "3", #
extremePowerSupplyInputVoltage
"9", #
extremePowerSupplyInputPowerUsage
"11", #
extremePowerSupplyInputPowerUsageUnitMultiplier
]),