[checkmk-commits] Check_MK Git: check_mk: #1525 viprinet_temp: Now uses new Temperature WATO rule

Module: check_mk Branch: master Commit: 232dc36562eef649d1fdca4f706041a159944eef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=232dc36562eef6… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jan 20 14:44:31 2015 +0100 #1525 viprinet_temp: Now uses new Temperature WATO rule This check is no longer in the room_temperature group, but in the temperature group. Old rules will therefore no longer apply. --- .werks/1525 | 10 ++++++++++ ChangeLog | 2 ++ checks/viprinet_temp | 22 ++++------------------ 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.werks/1525 b/.werks/1525 new file mode 100644 index 0000000..3d6358b --- /dev/null +++ b/.werks/1525 @@ -0,0 +1,10 @@ +Title: viprinet_temp: Now uses new Temperature WATO rule +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1421761352 +Class: feature + +This check is no longer in the room_temperature group, but in the +temperature group. Old rules will therefore no longer apply. diff --git a/ChangeLog b/ChangeLog index 668c126..024d3ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,8 @@ * 1670 winperf_processor: fixed invalid check values on counter wrap... * 1524 kentix_temp: Now supports setting levels... NOTE: Please refer to the migration notes! + * 1525 viprinet_temp: Now uses new Temperature WATO rule... + NOTE: Please refer to the migration notes! * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/viprinet_temp b/checks/viprinet_temp index 5042be5..683e6d7 100644 --- a/checks/viprinet_temp +++ b/checks/viprinet_temp @@ -25,32 +25,18 @@ # Boston, MA 02110-1301 USA. def check_viprinet_temp(item, params, info): - state = 0 - value = saveint(info[0][item == "System"]) - state_info = "" - - warn = "" - crit = "" - if params: - warn, crit = params - if value > crit: - state_info = "(crit at %d°C)" % crit - state = 2 - elif value > warn: - state_info = "(warn at %d°C)" % warn - state = 1 - - infotext = "%s: %s°C %s" % (item, value, state_info) - return state, infotext, [("temp", value, warn, crit)] + reading = int(info[0][item == "System"]) + return check_temperature(reading, params) check_info["viprinet_temp"] = { 'check_function' : check_viprinet_temp, 'inventory_function' : lambda info: len(info) > 0 and [("CPU", None), ("System", None)] or [], 'service_description' : "Temperature %s", - 'group' : "room_temperature", + 'group' : "temperature", 'has_perfdata' : True, 'snmp_info' : (".1.3.6.1.4.1.35424.1.2", [3, 4]), 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'includes' : [ 'temperature.include' ] }