Module: check_mk
Branch: master
Commit: b6a0f4fb841c5856d6076bf4144b7b7dce38fd86
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6a0f4fb841c58…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Mon Jan 19 14:55:40 2015 +0100
Changed Werk 1213
---
.werks/1213 | 5 ++---
ChangeLog | 2 +-
modules/notify.py | 4 ++++
notifications/asciimail | 1 -
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.werks/1213 b/.werks/1213
index 33c573c..d734c0e 100644
--- a/.werks/1213
+++ b/.werks/1213
@@ -1,4 +1,4 @@
-Title: New Macro $SERVICEDESC_FOR_URL$ for asciimail
+Title: New Notification macros $SERVICEFORURL$ and $HOSTFORURL$
Level: 1
Component: notifications
Class: feature
@@ -7,7 +7,6 @@ State: unknown
Version: 1.2.7i1
Date: 1421430462
-The new macrco $SERVICEDESC_FOR_URL$ can be used in the body of asciimails. The Macro
replaces
-whitespaces in the servicename with %20. This makes it possible to create custom urls who
can e.g. be used
+The two new macrcos can be used in notifications to create custom urls who can e.g. be
used
to ackknowledge services.
diff --git a/ChangeLog b/ChangeLog
index 0f3d229..0cf7f34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -122,7 +122,7 @@
Notifications:
* 1662 notification plugin spectrum: finalized script. now able to handle host
notications
- * 1213 New Macro $SERVICEDESC_FOR_URL$ for asciimail...
+ * 1213 New Notification macros $SERVICEFORURL$ and $HOSTFORURL$...
* 1661 FIX: mknotifyd: improved performance when receiving forwarded notifications
* 1664 FIX: mknotifyd: further performance improvements for notification forwarding
* 1205 FIX: RBN: Fixed match contactgroup condition...
diff --git a/modules/notify.py b/modules/notify.py
index a94d260..bc28896 100644
--- a/modules/notify.py
+++ b/modules/notify.py
@@ -1757,6 +1757,10 @@ def complete_raw_context(raw_context):
if key.endswith("STATE"):
raw_context[key[:-5] + "SHORTSTATE"] = value[:4]
+ if raw_context["WHAT"] == "SERVICE":
+ raw_context['SERVICEFORURL'] =
urllib.quote(raw_context['SERVICEDESC'])
+ raw_context['HOSTFORURL'] = urllib.quote(raw_context['HOSTNAME'])
+
convert_context_to_unicode(raw_context)
diff --git a/notifications/asciimail b/notifications/asciimail
index 9de5fa0..5d6b203 100644
--- a/notifications/asciimail
+++ b/notifications/asciimail
@@ -159,7 +159,6 @@ def construct_content(context):
tmpl_body += context["PARAMETER_SERVICE_BODY"]
else:
tmpl_body += tmpl_service_body
- context['SERVICEDESC_FOR_URL'] =
context['SERVICEDESC'].replace(' ','%20')
context['SUBJECT'] = substitute_context(tmpl, context)
body = substitute_context(tmpl_body, context)