[checkmk-commits] hp_proliant_temp hp_proliant_fans: Do not fetch unused OIDs anymore

Module: check_mk Branch: master Commit: 554332b68cc620b0a9440ac23623b41c1c45bfc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=554332b68cc620… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 15:06:35 2018 +0200 hp_proliant_temp hp_proliant_fans: Do not fetch unused OIDs anymore Change-Id: If0982bdf619b789321f0ccc46ec76c1e91777bd9 --- checks/hp_proliant_fans | 17 ++++++++--------- checks/hp_proliant_temp | 5 ++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/checks/hp_proliant_fans b/checks/hp_proliant_fans index 83c47c0..d230089 100644 --- a/checks/hp_proliant_fans +++ b/checks/hp_proliant_fans @@ -49,21 +49,21 @@ hp_proliant_fans_locale = { def inventory_hp_proliant_fans(info): if len(info) > 0: items = [] - for line in [ line for line in info if line[3] == '3' ]: + for line in [ line for line in info if line[2] == '3' ]: label = 'other' - if int(line[2]) in hp_proliant_fans_locale: - label = hp_proliant_fans_locale[int(line[2])] - items.append(("%s (%s)" % (line[1], label), None)) + if int(line[1]) in hp_proliant_fans_locale: + label = hp_proliant_fans_locale[int(line[1])] + items.append(("%s (%s)" % (line[0], label), None)) return items def check_hp_proliant_fans(item, params, info): for line in info: label = 'other' - if len(line) > 2 and int(line[2]) in hp_proliant_fans_locale: - label = hp_proliant_fans_locale[int(line[2])] + if len(line) > 1 and int(line[1]) in hp_proliant_fans_locale: + label = hp_proliant_fans_locale[int(line[1])] - if "%s (%s)" % (line[1], label) == item: - _chassis, index, _name, _present, speed, status, currentSpeed = line + if "%s (%s)" % (line[0], label) == item: + index, _name, _present, speed, status, currentSpeed = line snmp_status = hp_proliant_fans_status_map[int(status)] status = hp_proliant_status2nagios_map[snmp_status] @@ -86,7 +86,6 @@ check_info["hp_proliant_fans"] = { 'has_perfdata': True, 'snmp_info': ( ".1.3.6.1.4.1.232.6.2.6.7.1", [ - "1", # cpqHeFltTolFanChassis "2", # cpqHeFltTolFanIndex "3", # cpqHeFltTolFanLocale "4", # cpqHeFltTolFanPresent diff --git a/checks/hp_proliant_temp b/checks/hp_proliant_temp index 1fc5f43..ec535e1 100644 --- a/checks/hp_proliant_temp +++ b/checks/hp_proliant_temp @@ -27,7 +27,7 @@ # Author: Lars Michelsen <lm(a)mathias-kettner.de> def format_hp_proliant_name(line): - return "%s (%s)" % (line[1], hp_proliant_locale[int(line[2])]) + return "%s (%s)" % (line[0], hp_proliant_locale[int(line[1])]) def inventory_hp_proliant_temp(info): for line in info: @@ -36,7 +36,7 @@ def inventory_hp_proliant_temp(info): def check_hp_proliant_temp(item, params, info): for line in info: if format_hp_proliant_name(line) == item: - _chassis, _index, _name, value, threshold, status = line + value, threshold, status = line[2:] # This case means no threshold available and # the devices' web interface displays "N/A" @@ -60,7 +60,6 @@ check_info["hp_proliant_temp"] = { 'service_description': 'Temperature %s', 'has_perfdata' : True, 'snmp_info' : ( ".1.3.6.1.4.1.232.6.2.6.8.1", [ - "1", # cpqHeTemperatureChassis "2", # cpqHeTemperatureIndex "3", # cpqHeTemperatureLocale "4", # cpqHeTemperatureCelsius