[checkmk-commits] Check_MK Git: check_mk: knuerr_rms_temp: Now uses temperature.include

Module: check_mk Branch: master Commit: 0ce8af5430bf23d5909ab765a042083525c403ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ce8af5430bf23… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 1 14:50:45 2014 +0200 knuerr_rms_temp: Now uses temperature.include --- checks/knuerr_rms_temp | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/checks/knuerr_rms_temp b/checks/knuerr_rms_temp index e08d6d6..bb81c2c 100644 --- a/checks/knuerr_rms_temp +++ b/checks/knuerr_rms_temp @@ -24,26 +24,19 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -knuerr_rms_temp_default_levels = ( 30, 35 ) +knuerr_rms_temp_default_levels = (30, 35) + def inventory_knuerr_rms_temp(info): - return [ ( None, 'knuerr_rms_temp_default_levels') ] + return [ (None, 'knuerr_rms_temp_default_levels') ] + def check_knuerr_rms_temp(_no_item, params, info): - name, reading = info[0] - reading = float(reading) / 10 - warn, crit = params - infotext = "Current Temperature: %.1f°C on Sensor %s" % ( reading, name ) - levels = ' (Warn/Crit at %s/%s)' % ( warn, crit ) - perfdata = [ ('temp', reading, warn, crit ) ] - state = 0 - if reading >= crit: - state = 2 - infotext += levels - elif reading >= warn: - state = 1 - infotext += levels - return state, infotext, perfdata + name, rawtemp = info[0] + status, infotext, perfdata = check_temperature(float(rawtemp) / 10, params) + infotext += " (%s)" % name + return status, infotext, perfdata + check_info["knuerr_rms_temp"] = { "check_function" : check_knuerr_rms_temp, @@ -51,7 +44,8 @@ check_info["knuerr_rms_temp"] = { "service_description" : "Temperature", "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.3711.15.1", - "snmp_info" : ( ".1.3.6.1.4.1.3711.15.1.1.1.1" , [ 2 , 4 ]), - "group" : "hw_single_temperature" + "snmp_info" : ( ".1.3.6.1.4.1.3711.15.1.1.1.1", [2, 4]), + "group" : "hw_single_temperature", + "includes" : [ "temperature.include" ], }