Module: check_mk
Branch: master
Commit: 8660ebed38ea3603e7cd7547b4aef2133f0016c7
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8660ebed38ea36…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Mar 18 16:31:56 2013 +0100
FIX: check_mk: convert service description unicode into utf-8
---
ChangeLog | 1 +
modules/check_mk.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cc07080..79ac01e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,6 +78,7 @@
* Checks can now omit the typical "OK - " or "WARN -". This text
will be added automatically if missing.
* FIX: livecheck: fixed compilation bug
+ * FIX: check_mk: convert service description unicode into utf-8
Checks & Agents:
* FIX: jolokia_metrics.mem - now able to handle negative/missing max values
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 24fa8c8..a710bb3 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -1894,7 +1894,7 @@ define service {
check_command\t\t\t%s
active_checks_enabled\t\t1
%s}
-""" % (template, hostname, description, simulate_command(command),
extraconf))
+""" % (template, hostname, make_utf8(description),
simulate_command(command), extraconf))
# legacy checks via active_checks
actchecks = []
@@ -1936,7 +1936,7 @@ define service {
check_command\t\t\t%s
active_checks_enabled\t\t1
%s}
-""" % (template, hostname, description, simulate_command(command),
extraconf))
+""" % (template, hostname, make_utf8(description),
simulate_command(command), extraconf))
# Legacy checks via custom_checks
@@ -2000,7 +2000,7 @@ define service {
check_command\t\t\t%s
active_checks_enabled\t\t%d
%s%s}
-""" % (template, hostname, description, simulate_command(command),
+""" % (template, hostname, make_utf8(description),
simulate_command(command),
(command_line and not freshness) and 1 or 0, extraconf, freshness))
# Levels for host check