[checkmk-commits] Abstracted common code for cmc/nagios config

Module: check_mk Branch: master Commit: 99d219fbc2eb7b2f12b2eb1810ca54c1bf8e2336 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99d219fbc2eb7b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 15 09:09:22 2015 +0200 Abstracted common code for cmc/nagios config --- modules/check_mk.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index d4f42fc..44d4ed3 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -445,6 +445,9 @@ def output_check_info(): sys.stderr.write("ERROR in check_type %s: %s\n" % (check_type, e)) +def active_check_service_description(act_info, params): + return sanitize_service_description(act_info["service_description"](params).replace('$HOSTNAME$', g_hostname)) + #. # .--Host tags-----------------------------------------------------------. # | _ _ _ _ | @@ -2643,9 +2646,7 @@ define service { g_hostname = hostname has_perfdata = act_info.get('has_perfdata', False) - description = sanitize_service_description( - act_info["service_description"](params) - .replace('$HOSTNAME$', g_hostname)) + description = active_check_service_description(act_info, params) if do_omit_service(hostname, description): continue