Module: check_mk
Branch: master
Commit: abc0dccff6e28674fc0857ac17b27ddcbe99422e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abc0dccff6e286…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Nov 8 12:44:53 2013 +0100
FIX mail notification plugin: replace windows forbidden characters in mail images
---
.werks/32 | 8 ++++++++
ChangeLog | 5 ++++-
notifications/mail | 3 +++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/32 b/.werks/32
new file mode 100644
index 0000000..fdc8b52
--- /dev/null
+++ b/.werks/32
@@ -0,0 +1,8 @@
+Title: mail notification plugin: replace windows forbidden characters in mail images
+Level: 2
+Component: notifications
+Version: 1.2.3i7
+Date: 1383911035
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 83964bd..700b194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,7 +21,10 @@
WATO:
* 0053 New rule for configuring the display_name of a service...
- * 0048 FIX: Fixed locking issue on host diagnose page...
+ * 0048 FIX: Fixed locking issue on host diagnose page
+
+ Notifications:
+ * 0032 FIX: mail notification plugin: replace windows forbidden characters in mail
images
Reporting & Availability:
* 0051 Option for showing timeline directly in availability table...
diff --git a/notifications/mail b/notifications/mail
index 7303115..a4248ec 100755
--- a/notifications/mail
+++ b/notifications/mail
@@ -409,6 +409,9 @@ def main():
svc_desc = '_HOST_'
else:
svc_desc = context['SERVICEDESC'].replace(' ', '_')
+ # replace forbidden windows characters < > ? " : | \ / *
+ for token in ["<", ">", "?",
"\"", ":", "|", "\\", "/",
"*"] :
+ svc_desc = svc_desc.replace(token, "x%s" % ord(token))
name = '%s-%s-%d.png' % (context['HOSTNAME'], svc_desc, source)
attachments.append(('img', name, content, 'inline'))