Module: check_mk Branch: master Commit: 4cda7116b251d628a7c1e679c994b7f0d48391d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cda7116b251d6… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Oct 16 12:00:06 2015 +0200 #2663 knuerr_rms_temp: switch to new generic temperature logic, allow e.g. lower levels This check now uses the generic mechanism for all temperature checks and thus allows things like lower levels or display in Fahreheit (in in future also trend monitoring). The service description has changed from <tt>Temperature</tt> to <tt>Temperature Ambient</tt> (in order to comply with the guidelines). You need to redo service discovery for this check. --- .werks/2663 | 13 +++++++++++++ ChangeLog | 2 ++ checks/knuerr_rms_temp | 31 ++++++++++++++----------------- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.werks/2663 b/.werks/2663 new file mode 100644 index 0000000..4653ccd --- /dev/null +++ b/.werks/2663 @@ -0,0 +1,13 @@ +Title: knuerr_rms_temp: switch to new generic temperature logic, allow e.g. lower levels +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i4 +Date: 1444989479 +Class: feature + +This check now uses the generic mechanism for all temperature checks +and thus allows things like lower levels or display in Fahreheit (in in +future also trend monitoring). The service description has changed from +<tt>Temperature</tt> to <tt>Temperature Ambient</tt> (in order to comply +with the guidelines). You need to redo service discovery for this check. diff --git a/ChangeLog b/ChangeLog index 3892ad3..ff3b1eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1.2.7i4: Checks & Agents: * 2695 hp_msa_disk, hp_msa_volume: these checks now report more information about disks and volumes of a HP MSA 2040 Storage System + * 2663 knuerr_rms_temp: switch to new generic temperature logic, allow e.g. lower levels... + NOTE: Please refer to the migration notes! * 2660 FIX: fixed windows agent using the wrong working directory... Multisite: diff --git a/checks/knuerr_rms_temp b/checks/knuerr_rms_temp index bb81c2c..9f190db 100644 --- a/checks/knuerr_rms_temp +++ b/checks/knuerr_rms_temp @@ -24,28 +24,25 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -knuerr_rms_temp_default_levels = (30, 35) +factory_settings["knuerr_rms_temp_default_levels"] = { + "levels" : (30, 35), +} def inventory_knuerr_rms_temp(info): - return [ (None, 'knuerr_rms_temp_default_levels') ] - - -def check_knuerr_rms_temp(_no_item, params, info): - name, rawtemp = info[0] - status, infotext, perfdata = check_temperature(float(rawtemp) / 10, params) - infotext += " (%s)" % name - return status, infotext, perfdata + return [ ("Ambient", {}) ] check_info["knuerr_rms_temp"] = { - "check_function" : check_knuerr_rms_temp, - "inventory_function" : inventory_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", - "includes" : [ "temperature.include" ], + "default_levels_variable" : "knuerr_rms_temp_default_levels", + "check_function" : lambda _no_item, params, info: \ + check_temperature(float(info[0][0]) / 10, params), + "inventory_function" : inventory_knuerr_rms_temp, + "service_description" : "Temperature %s", + "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", [4]), + "group" : "temperature", + "includes" : [ "temperature.include" ], }