[checkmk-commits] Check_MK Git: check_mk: Fixed usage of icons/ actions by services defined by process rules

Module: check_mk Branch: master Commit: e9524d00390320b8f2421625a042e553f9639e24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9524d00390320… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 10:44:38 2015 +0200 Fixed usage of icons/actions by services defined by process rules --- modules/check_mk.py | 2 +- modules/check_mk_base.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 0aadd50..be1f312 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1582,7 +1582,7 @@ def icons_and_actions_of(what, hostname, svcdesc = None, checkname = None, param actions = set(service_extra_conf(hostname, svcdesc, service_icons_and_actions)) # Some WATO rules might register icons on their own - checkgroup = checkgroup_of.get(checkname, checkname) + checkgroup = check_info[checkname]["group"] if checkgroup in [ 'ps', 'services' ] and type(params) == dict: icon = params.get('icon') if icon: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index cd6b67c..2a89ca7 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1581,6 +1581,8 @@ def pack_crash_dump(crash_dir): def check_unimplemented(checkname, params, info): return (3, 'UNKNOWN - Check not implemented') +# FIXME: Clear / unset all legacy variables to prevent confusions in other code trying to +# use the legacy variables which are not set by newer checks. def convert_check_info(): for check_type, info in check_info.items(): basename = check_type.split(".")[0]