Module: check_mk Branch: master Commit: e34bfa6ba53735926e0777fff1fa2bb4d5585c60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e34bfa6ba53735… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 25 17:03:23 2015 +0100 #2048 FIX netapp_api_fan, netapp_api_psu, netapp_api_temp: fixed typo in service description Shelfes -> Shelves --- .werks/2048 | 10 ++++++++++ ChangeLog | 2 ++ checks/netapp_api_fan | 5 +++-- checks/netapp_api_psu | 4 ++-- checks/netapp_api_temp | 7 +++++-- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.werks/2048 b/.werks/2048 new file mode 100644 index 0000000..be7c562 --- /dev/null +++ b/.werks/2048 @@ -0,0 +1,10 @@ +Title: netapp_api_fan, netapp_api_psu, netapp_api_temp: fixed typo in service description Shelfes -> Shelves +Level: 1 +Component: checks +Class: fix +Compatible: incomp +State: unknown +Version: 1.2.7i1 +Date: 1424880096 + + diff --git a/ChangeLog b/ChangeLog index f3bee00..287f6fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -196,6 +196,8 @@ NOTE: Please refer to the migration notes! * 2018 FIX: ibm_imm_health: Fixed exception when host does provides empty SNMP data * 2019 FIX: heartbeat_crm: Be compatible to yet unknown crm_mon output format + * 2048 FIX: netapp_api_fan, netapp_api_psu, netapp_api_temp: fixed typo in service description Shelfes -> Shelves + NOTE: Please refer to the migration notes! Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/netapp_api_fan b/checks/netapp_api_fan index 3a47325..0c65667 100644 --- a/checks/netapp_api_fan +++ b/checks/netapp_api_fan @@ -48,7 +48,8 @@ def check_netapp_api_fan(_no_item, _no_params, parsed): if fans["cooling-element-is-error"][idx] == "true": fan_errors.append((2, "Error in Shelf %s Fan %s" % (shelf, fans["cooling-element-number"][idx]))) - yield 0, "%s Fans installed" % fan_count + + yield 0, "%s fans assigned to this filer" % fan_count max_fans = 5 for state, text in fan_errors[:max_fans]: @@ -62,7 +63,7 @@ check_info["netapp_api_fan"] = { 'check_function' : check_netapp_api_fan, 'parse_function' : netapp_api_parse_info_environ, 'inventory_function' : inventory_netapp_api_fan, - 'service_description' : 'Fan Status Shelfes', + 'service_description' : 'Fan Status Shelves', 'includes' : ["netapp_api.include"] } diff --git a/checks/netapp_api_psu b/checks/netapp_api_psu index 22e6372..79a36c3 100644 --- a/checks/netapp_api_psu +++ b/checks/netapp_api_psu @@ -49,7 +49,7 @@ def check_netapp_api_psu(_no_item, _no_params, parsed): if psus["power-supply-is-error"][idx] == "true": psu_errors.append((2, "Error in Shelf %s PSU %s" % (shelf, psus["power-supply-element-number"][idx]))) - yield 0, "%s Power supplies installed" % psu_count + yield 0, "%s power supplies assigned to this filer" % psu_count for state, text in psu_errors: yield state, text @@ -59,6 +59,6 @@ check_info["netapp_api_psu"] = { 'check_function' : check_netapp_api_psu, 'inventory_function' : inventory_netapp_api_psu, 'parse_function' : netapp_api_parse_info_environ, - 'service_description' : 'Power Supplies Shelfes', + 'service_description' : 'Power Supplies Shelves', 'includes' : ["netapp_api.include"] } diff --git a/checks/netapp_api_temp b/checks/netapp_api_temp index 80ee94d..7767efe 100644 --- a/checks/netapp_api_temp +++ b/checks/netapp_api_temp @@ -64,7 +64,10 @@ def check_netapp_api_temp(item, params, parsed): sensorlist.append( (shelf + "/" + sensor_no, current_temp, kwargs) ) - return check_temperature_list(sensorlist, params) + if not sensorlist: + return 0, "No temperature sensors assigned to this filer" + else: + return check_temperature_list(sensorlist, params) check_info["netapp_api_temp"] = { @@ -73,7 +76,7 @@ check_info["netapp_api_temp"] = { 'parse_function' : netapp_api_parse_info_environ, 'has_perfdata' : True, 'group' : "temperature", - 'service_description' : 'Temperature %s Shelfes', + 'service_description' : 'Temperature %s Shelves', 'includes' : ["netapp_api.include", "temperature.include"] }