[checkmk-commits] Split computation of default and effective check parameters

Module: check_mk Branch: master Commit: 38170570b6df39575132b22408abbcc186a080df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38170570b6df39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 29 10:29:24 2017 +0100 Split computation of default and effective check parameters Change-Id: I513f0643ecf225fd4341f82943bb545199a62f76 --- cmk_base/checks.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 4fb4ecb..195789d 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -513,6 +513,13 @@ def compute_check_parameters(host, checktype, item, params): if checktype not in check_info: # handle vanished checktype return None + params = _update_with_default_check_parameters(checktype, params) + params = _update_with_configured_check_parameters(host, checktype, item, params) + + return params + + +def _update_with_default_check_parameters(checktype, params): # Handle dictionary based checks def_levels_varname = check_info[checktype].get("default_levels_variable") # TODO: Can we skip this? @@ -552,6 +559,10 @@ def compute_check_parameters(host, checktype, item, params): new_params.update(params) params = new_params + return params + + +def _update_with_configured_check_parameters(host, checktype, item, params): descr = config.service_description(host, checktype, item) # Get parameters configured via checkgroup_parameters