Module: check_mk
Branch: master
Commit: 82e9dbaa8ab35e47efaed0fc348c2733471d29c2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82e9dbaa8ab35e…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Wed Nov 12 18:07:40 2014 +0100
raritan_pdu_inlet, raritan_pdu_inlet_summary: Fixed perf-o-meter
---
checks/raritan_pdu_inlet | 17 ++++++++---------
web/plugins/perfometer/check_mk.py | 3 ++-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet
index 8ad15c3..2b87105 100644
--- a/checks/raritan_pdu_inlet
+++ b/checks/raritan_pdu_inlet
@@ -24,7 +24,7 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
-def raritan_pdu_inlet_convert(info):
+def parse_raritan_pdu_inlet(info):
# List of tuples, sorting like the snmp output,
# each tuple contains: capabilities, digits
translation = (
@@ -38,6 +38,8 @@ def raritan_pdu_inlet_convert(info):
phases = [ 'L1', 'L2', 'L3' ]
i = 0
state = 4 # We dont know the senosr state, so we assume normal
+
+ parsed = []
for line in info:
y = 0
# loop over the current Sensor values.
@@ -46,19 +48,16 @@ def raritan_pdu_inlet_convert(info):
item = phases[i] + '-' + capabilities[translation[y][0]]
unit = translation[y][0]
digits = translation[y][1]
- yield item, unit, digits, '1', state, value
+ parsed.append( (item, unit, digits, '1', state, value) )
y += 1
i += 1
+ return parsed
-def inventory_raritan_pdu_inlet(info):
- return inventory_raritan_pdu_inlet_generic( raritan_pdu_inlet_convert(info) )
-
-def check_raritan_pdu_inlet(item, _no_params, info):
- return check_raritan_pdu_inlet_generic( item, _no_params,
raritan_pdu_inlet_convert(info) )
check_info['raritan_pdu_inlet'] = {
- "inventory_function" : inventory_raritan_pdu_inlet,
- "check_function" : check_raritan_pdu_inlet,
+ "inventory_function" : inventory_raritan_pdu_inlet_generic,
+ "check_function" : check_raritan_pdu_inlet_generic,
+ "parse_function" : parse_raritan_pdu_inlet,
"service_description" : "Inlet %s",
"has_perfdata" : True,
"snmp_info" : ( ".1.3.6.1.4.1.13742.6.5.2.4.1.4.1.1",
diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py
index 410bc89..0a09b48 100644
--- a/web/plugins/perfometer/check_mk.py
+++ b/web/plugins/perfometer/check_mk.py
@@ -1112,7 +1112,7 @@ perfometers["check_mk-adva_fsp_current"] =
perfometer_current
def perfometer_raritan_pdu_inlet(row, check_command, perf_data):
display_color = "#50f020"
- cap = perf_data[0][0]
+ cap = perf_data[0][0].split('-')[-1]
value = float(perf_data[0][1])
unit = perf_data[0][2]
display_str = perf_data[0][1] + " " + unit
@@ -1137,6 +1137,7 @@ def perfometer_raritan_pdu_inlet(row, check_command, perf_data):
return "unimplemented" , perfometer_linear(0, "#ffffff")
perfometers["check_mk-raritan_pdu_inlet"] = perfometer_raritan_pdu_inlet
+perfometers["check_mk-raritan_pdu_inlet_summary"] =
perfometer_raritan_pdu_inlet
def perfometer_raritan_pdu_outletcount(row, check_command, perf_data):