[checkmk-commits] Check_MK Git: check_mk: #1143 FIX dell_powerconnect_temp: fix configuration via WATO

Module: check_mk Branch: master Commit: 75cb6df2d77f1780c29c7539711660a3529ff860 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75cb6df2d77f17… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Aug 20 17:25:47 2014 +0200 #1143 FIX dell_powerconnect_temp: fix configuration via WATO When configuring levels via the rule <i>Hardware temperature</i> the levels would not work for this check type. The reason is that - unless most of the other check plugins for hardware temperature - this check only supports a single sensor. Therefor a new ruleset has been created named <i>Hardware temperature, single sensor</i>. Please use that for configuration. --- .werks/1143 | 13 +++++++++++++ ChangeLog | 2 +- checks/dell_powerconnect_temp | 4 ++-- web/plugins/wato/check_parameters.py | 17 ++++++++++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/.werks/1143 b/.werks/1143 new file mode 100644 index 0000000..fa75fc7 --- /dev/null +++ b/.werks/1143 @@ -0,0 +1,13 @@ +Title: dell_powerconnect_temp: fix configuration via WATO +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408548253 +Class: fix + +When configuring levels via the rule <i>Hardware temperature</i> the levels would not +work for this check type. The reason is that - unless most of the other check plugins +for hardware temperature - this check only supports a single sensor. Therefor a new +ruleset has been created named <i>Hardware temperature, single sensor</i>. Please use +that for configuration. diff --git a/ChangeLog b/ChangeLog index 5ed2703..50429df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * 1097 FIX: windows_agent: preventing missing agent sections on first query... * 1009 FIX: df: deal with space in file system type for PlayStation file system... * 1098 FIX: esx_vsphere_counters.diskio: Now reports unknown when counter data is missing + * 1143 FIX: dell_powerconnect_temp: fix configuration via WATO... Multisite: * 1066 Implemented Dashboard Designer... @@ -50,7 +51,6 @@ * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... WATO: - * 1095 New WATO Web-API: Now able to manage hosts via web automation calls * 1096 New WATO webservices: manage hosts via webinterface... * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... * 1089 FIX: Snapshot restore: fixed exception during exception handling...... diff --git a/checks/dell_powerconnect_temp b/checks/dell_powerconnect_temp index 4eb0151..fb57692 100644 --- a/checks/dell_powerconnect_temp +++ b/checks/dell_powerconnect_temp @@ -56,7 +56,7 @@ def inventory_dell_powerconnect_temp(checkname, info): return inventory # Execute a check against each sensor. -def check_dell_powerconnect_temp(item, params, info): +def check_dell_powerconnect_temp(_no_item, params, info): warn, crit = params sensor_info = "" temp_info = "" @@ -96,5 +96,5 @@ check_info["dell_powerconnect_temp"] = { 'snmp_info': ('.1.3.6.1.4.1.89.53.15.1', ['9', '10']), 'snmp_scan_function': \ lambda oid: ".1.3.6.1.4.1.674.10895" in oid(".1.3.6.1.2.1.1.2.0"), - 'group': 'hw_temperature', + 'group': 'hw_temperature_single', } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ccd3a91..071b105 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4459,7 +4459,7 @@ register_check_parameters( register_check_parameters( subgroup_environment, "hw_temperature", - _("Hardware temperature (e.g. switches)"), + _("Hardware temperature, multiple sensors"), Tuple( help = _("Temperature levels for hardware devices like " "Brocade switches with (potentially) several " @@ -4477,6 +4477,21 @@ register_check_parameters( register_check_parameters( subgroup_environment, + "hw_temperature_single", + _("Hardware temperature, single sensor"), + Tuple( + help = _("Temperature levels for hardware devices like " + "DELL Powerconnect that have just one temperature sensor. "), + elements = [ + Integer(title = _("warning if above"), unit = u"°C", default_value = 35), + Integer(title = _("critical if above"), unit = u"°C", default_value = 40), + ]), + None, + "first" +) + +register_check_parameters( + subgroup_environment, "disk_temperature", _("Harddisk temperature (e.g. via SMART)"), Tuple(