[checkmk-commits] Check_MK Git: check_mk: Refurbished output of checks

Module: check_mk Branch: master Commit: cc773cc65793e50819b2da181347e0e7a1667f01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc773cc65793e5… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Mar 18 17:16:20 2014 +0100 Refurbished output of checks --- checks/dell_poweredge_mem | 4 ++-- checks/dell_poweredge_pci | 4 ++-- checks/dell_poweredge_status | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/checks/dell_poweredge_mem b/checks/dell_poweredge_mem index 50e9748..3acd7bc 100644 --- a/checks/dell_poweredge_mem +++ b/checks/dell_poweredge_mem @@ -54,9 +54,9 @@ def inventory_dell_poweredge_mem(info): def check_dell_poweredge_mem(item, _no_params, info): di = dict() - for status, location, di['Size'], di['Speed'], di['Manufacturer'], di['PartNumber'], \ - di['SerialNumber'] in info: + for status, location, size, di['Speed'], di['MFR'], di['P/N'], di['S/N'] in info: + di['Size'] = str(saveint(size)/1024/1024)+"GB" if item == location: state_table = { "1" : ( "other", 1 ), diff --git a/checks/dell_poweredge_pci b/checks/dell_poweredge_pci index fdc22cd..451ec19 100644 --- a/checks/dell_poweredge_pci +++ b/checks/dell_poweredge_pci @@ -48,7 +48,7 @@ def inventory_dell_poweredge_pci(info): def check_dell_poweredge_pci(item, _no_params, info): di = dict() - for status, di['BusWidth'], di['Manufacturer'], di['Description'], fqdd in info: + for status, di['BusWidth'], di['MFR'], di['Desc.'], fqdd in info: if item == fqdd: state_table = { @@ -72,7 +72,7 @@ def check_dell_poweredge_pci(item, _no_params, info): check_info["dell_poweredge_pci"] = { "check_function" : check_dell_poweredge_pci, "inventory_function" : inventory_dell_poweredge_pci, - "service_description" : "%s", + "service_description" : "PCI %s", "has_perfdata" : False, "snmp_info" : dell_poweredge_pci_info, "snmp_scan" : dell_poweredge_pci_scan, diff --git a/checks/dell_poweredge_status b/checks/dell_poweredge_status index b2f9a16..4724485 100644 --- a/checks/dell_poweredge_status +++ b/checks/dell_poweredge_status @@ -41,8 +41,7 @@ def inventory_dell_poweredge_status(info): def check_dell_poweredge_status(item, _no_params, info): di = dict() - di['racURL'], di['chassisSystemName'], di['SystemBladeSlotNumber'], \ - di['systemModelName'], status, di['chassisServiceTagName'] = info[0] + di['racURL'], di['Chassis'], di['Slot'], di['Model'], status, di['ServiceTag'] = info[0] state_table = { "1" : ( "other", 1 ), @@ -54,7 +53,7 @@ def check_dell_poweredge_status(item, _no_params, info): } state_txt, state = state_table.get(status, "2") infotext, state = state_table.get(status, "2") - for parameter, value in di.items(): + for parameter, value in di.items(): infotext += ", %s: %s" % ( parameter, value ) infotext = re.sub("^, ","", infotext)