[checkmk-commits] veritas_vcs: fix params vs. _no_params

Module: check_mk Branch: master Commit: e2e365c18df7ecd3d7558dc0a191e2c766540248 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2e365c18df7ec… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Mar 5 13:01:45 2019 +0100 veritas_vcs: fix params vs. _no_params Change-Id: I9ce75f8ae30505bffb3c732ed0a11b64d6e39b12 --- checks/veritas_vcs | 54 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/checks/veritas_vcs b/checks/veritas_vcs index 184062a..ec3bbae 100644 --- a/checks/veritas_vcs +++ b/checks/veritas_vcs @@ -215,6 +215,13 @@ def check_veritas_vcs(item, params, parsed, item_type): yield state, "%s%s" % (", ".join(infotexts), cluster_info) +def veritas_vcs_get_check_function(item_type): + def check_function(item, params, parsed): + return check_veritas_vcs(item, params, parsed, item_type) + + return check_function + + # .--cluster - main check -----------------------------------------------. # | _ _ | # | ___| |_ _ ___| |_ ___ _ __ | @@ -226,15 +233,13 @@ def check_veritas_vcs(item, params, parsed, item_type): # | main check | # '----------------------------------------------------------------------' - check_info['veritas_vcs'] = { - 'group' : 'veritas_vcs', - 'parse_function' : parse_veritas_vcs, - 'inventory_function' : lambda parsed: inventory_veritas_vcs(parsed, 'cluster'), - 'check_function' : lambda item, _no_params, parsed: \ - check_veritas_vcs(item, _no_params, parsed, "cluster"), - 'service_description' : 'VCS Cluster %s', - 'node_info' : True, + 'group': 'veritas_vcs', + 'parse_function': parse_veritas_vcs, + 'inventory_function': lambda parsed: inventory_veritas_vcs(parsed, 'cluster'), + 'check_function': veritas_vcs_get_check_function("cluster"), + 'service_description': 'VCS Cluster %s', + 'node_info': True, 'default_levels_variable': 'veritas_vcs_defaults', } @@ -249,12 +254,11 @@ check_info['veritas_vcs'] = { # '----------------------------------------------------------------------' check_info['veritas_vcs.system'] = { - 'group' : 'veritas_vcs', - 'inventory_function' : lambda parsed: inventory_veritas_vcs(parsed, "system"), - 'check_function' : lambda item, _no_params, parsed: \ - check_veritas_vcs(item, _no_params, parsed, "system"), - 'service_description' : 'VCS System %s', - 'node_info' : True, + 'group': 'veritas_vcs', + 'inventory_function': lambda parsed: inventory_veritas_vcs(parsed, "system"), + 'check_function': veritas_vcs_get_check_function("system"), + 'service_description': 'VCS System %s', + 'node_info': True, 'default_levels_variable': 'veritas_vcs_defaults', } @@ -269,12 +273,11 @@ check_info['veritas_vcs.system'] = { # '----------------------------------------------------------------------' check_info['veritas_vcs.servicegroup'] = { - 'group' : 'veritas_vcs', - 'inventory_function' : lambda parsed: inventory_veritas_vcs(parsed, 'group'), - 'check_function' : lambda item, _no_params, parsed: \ - check_veritas_vcs(item, _no_params, parsed, 'group'), - 'service_description' : 'VCS Service Group %s', - 'node_info' : True, + 'group': 'veritas_vcs', + 'inventory_function': lambda parsed: inventory_veritas_vcs(parsed, 'group'), + 'check_function': veritas_vcs_get_check_function('group'), + 'service_description': 'VCS Service Group %s', + 'node_info': True, 'default_levels_variable': 'veritas_vcs_defaults', } @@ -289,11 +292,10 @@ check_info['veritas_vcs.servicegroup'] = { # '----------------------------------------------------------------------' check_info['veritas_vcs.resource'] = { - 'group' : 'veritas_vcs', - 'inventory_function' : lambda parsed: inventory_veritas_vcs(parsed, 'resource'), - 'check_function' : lambda item, _no_params, parsed: \ - check_veritas_vcs(item, _no_params, parsed, 'resource'), - 'service_description' : 'VCS Resource %s', - 'node_info' : True, + 'group': 'veritas_vcs', + 'inventory_function': lambda parsed: inventory_veritas_vcs(parsed, 'resource'), + 'check_function': veritas_vcs_get_check_function('resource'), + 'service_description': 'VCS Resource %s', + 'node_info': True, 'default_levels_variable': 'veritas_vcs_defaults', }