[checkmk-commits] Check_MK Git: check_mk: domino_mailqueues, domino_tasks: minor cleanup

Module: check_mk Branch: master Commit: 54e5fe950acd91d8b94d1d059d56a8afc8368bcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54e5fe950acd91… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Oct 24 11:52:06 2014 +0200 domino_mailqueues, domino_tasks: minor cleanup --- checks/domino_mailqueues | 10 +++------- checks/domino_tasks | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/checks/domino_mailqueues b/checks/domino_mailqueues index f09f56e..280690b 100644 --- a/checks/domino_mailqueues +++ b/checks/domino_mailqueues @@ -37,12 +37,10 @@ domino_mailqueues = { } def inventory_domino_mailqueues(info): - inventory = [] for line in info: val = int(line[0][0].split(".")[12]) if val in domino_mailqueues.keys(): - inventory.append(( domino_mailqueues[val][0], "domino_mailqueues_defaults" )) - return inventory + yield domino_mailqueues[val][0], {} def check_domino_mailqueues(item, params, info): for line in info: @@ -61,14 +59,12 @@ def check_domino_mailqueues(item, params, info): elif reading >= warn: state = 1 infotext += levels - return state, infotext, perfdata - - return 3, "no information found" + yield state, infotext, perfdata check_info["domino_mailqueues"] = { "check_function" : check_domino_mailqueues, "inventory_function" : inventory_domino_mailqueues, - "service_description" : "Domino %s", + "service_description" : "Domino Queue %s", "has_perfdata" : True, "default_levels_variable" : "domino_mailqueues_defaults", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.311.1.1.3.1.2", diff --git a/checks/domino_tasks b/checks/domino_tasks index 322822b..b71d7e0 100644 --- a/checks/domino_tasks +++ b/checks/domino_tasks @@ -53,7 +53,7 @@ check_info['domino_tasks'] = { "inventory_function" : inventory_domino_tasks, "has_perfdata" : True, "group" : "domino_tasks", - "service_description" : "Task %s", + "service_description" : "Domino Task %s", "includes" : [ "ps.include" ], "node_info" : True, # add first column with actual host name "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.311.1.1.3.1.2",