[checkmk-commits] Check_MK Git: check_mk: apc_inrow_airflow, _fanspeed, _temp:

Made SNMP scan function more lenient Message-ID: <5583da65.W3D2L3Rzx7POOokZ%kb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: f7d04b356ab800a40740af0a94712ba0385c1d83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7d04b356ab800… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jun 19 11:01:19 2015 +0200 apc_inrow_airflow, _fanspeed, _temp: Made SNMP scan function more lenient --- checks/apc_inrow_airflow | 5 +++-- checks/apc_inrow_fanspeed | 5 +++-- checks/apc_inrow_temp | 7 ++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/checks/apc_inrow_airflow b/checks/apc_inrow_airflow index 4ea52f4..85ee8fd 100644 --- a/checks/apc_inrow_airflow +++ b/checks/apc_inrow_airflow @@ -28,7 +28,8 @@ apc_inrow_airflow_default_levels = { "level_low" : ( 5.0 , 2.0 ), "level_high" : ( 10.0, 11.0 ) } def inventory_apc_inrow_airflow(info): - return [ (None, "apc_inrow_airflow_default_levels")] + if info: + return [ (None, "apc_inrow_airflow_default_levels")] def check_apc_inrow_airflow(_no_item, params, info): flow = saveint(info[0][0])/100.0 @@ -59,7 +60,7 @@ check_info["apc_inrow_airflow"] = { "inventory_function" : inventory_apc_inrow_airflow, "service_description" : "Airflow", "snmp_info" : (".1.3.6.1.4.1.318.1.1.13.3.2.2.2", [ "5" ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.318.1.3.14.5", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "group" : "airflow", "has_perfdata" : True, } diff --git a/checks/apc_inrow_fanspeed b/checks/apc_inrow_fanspeed index 89c007c..5112253 100644 --- a/checks/apc_inrow_fanspeed +++ b/checks/apc_inrow_fanspeed @@ -25,7 +25,8 @@ # Boston, MA 02110-1301 USA. def inventory_apc_inrow_fanspeed(info): - return [ (None, None) ] + if info: + return [ (None, None) ] def check_apc_inrow_fanspeed(_no_item, _no_params, info): value = savefloat(info[0][0]) / 10 @@ -36,6 +37,6 @@ check_info["apc_inrow_fanspeed"] = { "inventory_function" : inventory_apc_inrow_fanspeed, "service_description" : "Fanspeed", "snmp_info" : ( ".1.3.6.1.4.1.318.1.1.13.3.2.2.2", [ "16" ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.318.1.3.14.5", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "has_perfdata" : True, } diff --git a/checks/apc_inrow_temp b/checks/apc_inrow_temp index ebab953..b18df07 100644 --- a/checks/apc_inrow_temp +++ b/checks/apc_inrow_temp @@ -73,8 +73,9 @@ def apc_inrow_temp_convert(info): def inventory_apc_inrow_temp(info): - info = apc_inrow_temp_convert(info) - return [ (x, "apc_inrow_temp_default_levels") for x in info.keys() ] + if info: + info = apc_inrow_temp_convert(info) + return [ (x, "apc_inrow_temp_default_levels") for x in info.keys() ] def check_apc_inrow_temp(item, params, info): @@ -90,7 +91,7 @@ check_info["apc_inrow_temp"] = { "service_description" : "Temperature %s", "group" : "hw_temperature", "snmp_info" : (".1.3.6.1.4.1.318.1.1.13.3.2.2.2", [ 7, 9, 11, 24, 26 ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.318.1.3.14.5", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "has_perfdata" : True, "includes" : [ "temperature.include" ], }