Module: check_mk Branch: master Commit: ae0278abc1d669e74c84203c67a3afe84e8a6482 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae0278abc1d669… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Apr 9 12:07:06 2014 +0200 FIX cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks --- .werks/603 | 8 ++++++++ ChangeLog | 1 + checks/cmciii | 2 +- web/plugins/perfometer/check_mk.py | 6 ++++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/603 b/.werks/603 new file mode 100644 index 0000000..6fb6acb --- /dev/null +++ b/.werks/603 @@ -0,0 +1,8 @@ +Title: cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1397037965 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 6f647db..9eb594a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used... + * 0603 FIX: cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/cmciii b/checks/cmciii index d608b54..c14fb41 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -199,7 +199,7 @@ cmciii_snmp_info = [ ] ] -cmciii_scan = lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0") +cmciii_scan = lambda oid: ".1.3.6.1.4.1.2606.7" in oid(".1.3.6.1.2.1.1.2.0") # .--psm current---------------------------------------------------------. # | _ | diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 6e18c5c..8bf89ba 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -286,6 +286,7 @@ perfometers["check_mk-hitachi_hnas_temp"] = perfometer_temperature perfometers["check_mk-dell_poweredge_temp"] = perfometer_temperature perfometers["check_mk-dell_chassis_temp"] = perfometer_temperature perfometers["check_mk-innovaphone_temp"] = perfometer_temperature +perfometers["check_mk-cmciii.temp"] = perfometer_temperature def perfometer_temperature_multi(row, check_command, perf_data): display_value = -1 @@ -769,11 +770,12 @@ def perfometer_cmc_lcp(row, check_command, perf_data): perfometers["check_mk-cmc_lcp"] = perfometer_cmc_lcp -def perfometer_carel_uniflair_cooling(row, check_command, perf_data): +def perfometer_humidity(row, check_command, perf_data): humidity = float(perf_data[0][1]) return "%3.1f%%" % humidity, perfometer_linear(humidity, '#6f2') -perfometers['check_mk-carel_uniflair_cooling'] = perfometer_carel_uniflair_cooling +perfometers['check_mk-carel_uniflair_cooling'] = perfometer_humidity +perfometers['check_mk-cmciii.humidity'] = perfometer_humidity def perfometer_eaton(row, command, perf): return u"%s°C" % str(perf[0][1]), perfometer_linear(float(perf[0][1]), 'silver')