[checkmk-commits] icons_and_actions_of: The checkname is now optional

Module: check_mk Branch: master Commit: aeb5298db9666c7757fea81154e09040f4d54cbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeb5298db9666c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 13 13:24:16 2016 +0100 icons_and_actions_of: The checkname is now optional --- modules/check_mk.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 438c505..e8c1ad4 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1116,11 +1116,12 @@ 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 = check_info[checkname]["group"] - if checkgroup in [ 'ps', 'services' ] and type(params) == dict: - icon = params.get('icon') - if icon: - actions.add(icon) + if checkname: + checkgroup = check_info[checkname]["group"] + if checkgroup in [ 'ps', 'services' ] and type(params) == dict: + icon = params.get('icon') + if icon: + actions.add(icon) return list(actions)