Module: check_mk Branch: master Commit: 356637e3b796f10391e7cc2804eecabc0831cacc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=356637e3b796f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 21 14:09:53 2013 +0100 FIX: allow unicode encoded extra_service_conf --- ChangeLog | 1 + modules/check_mk.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e42011d..7178e6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ 1.2.2b4: Core: * FIX: Fix output of cmk -D: datasource programs were missing + * FIX: allow unicode encoded extra_service_conf * New configuration variable contactgroup_members Checks & Agents: diff --git a/modules/check_mk.py b/modules/check_mk.py index 395a858..74609c9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1745,7 +1745,7 @@ def create_nagios_servicedefs(outfile, hostname): } """ % ( template, hostname, description, logwatch, - extra_service_conf_of(hostname, description), checkname )) + extra_service_conf_of(hostname, description).encode("utf-8"), checkname )) checknames_to_define.add(checkname) have_at_least_one_service = True @@ -1807,7 +1807,7 @@ define service { host_name\t\t\t%s %s service_description\t\tCheck_MK } -""" % (active_service_template, hostname, extra_service_conf_of(hostname, "Check_MK"))) +""" % (active_service_template, hostname, extra_service_conf_of(hostname, "Check_MK").encode("utf-8"))) # Inventory checks - if user has configured them. Not for clusters. if inventory_check_interval and not is_cluster(hostname): outfile.write("""