[checkmk-commits] Check_MK Git: check_mk: #2038 FIX Log complete Email address into monitoring history when notifying explicity addresses

Mathias Kettner mk at mathias-kettner.de
Wed Feb 25 14:19:18 CET 2015


Module: check_mk
Branch: master
Commit: c3ca57c3abce421cca84628183b31c21412020e6
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3ca57c3abce421cca84628183b31c21412020e6

Author: Mathias Kettner <mk at mathias-kettner.de>
Date:   Wed Feb 25 14:19:14 2015 +0100

#2038 FIX Log complete Email address into monitoring history when notifying explicity addresses

---

 .werks/2038       |   10 ++++++++++
 ChangeLog         |    1 +
 modules/notify.py |    4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.werks/2038 b/.werks/2038
new file mode 100644
index 0000000..4b3c32e
--- /dev/null
+++ b/.werks/2038
@@ -0,0 +1,10 @@
+Title: Log complete Email address into monitoring history when notifying explicity addresses
+Level: 1
+Component: notifications
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1424870328
+
+
diff --git a/ChangeLog b/ChangeLog
index 8f16166..ef96ff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -282,6 +282,7 @@
     * 1810 FIX: Rule based notifications: Fixed output of non contact mail recipient address in analyze table...
     * 1988 FIX: Gracefully handle invalid empty bulk notification files from previous buggy versions
     * 2015 FIX: Fixed sending notifications for services with umlauts in names...
+    * 2038 FIX: Log complete Email address into monitoring history when notifying explicity addresses
 
     BI:
     * 1784 FIX: Fix exception in BI Boxes when parents are being used
diff --git a/modules/notify.py b/modules/notify.py
index 7ae330f..c3b4e6b 100644
--- a/modules/notify.py
+++ b/modules/notify.py
@@ -571,7 +571,7 @@ def user_notification_rules():
 
 def rbn_fake_email_contact(email):
     return {
-        "name"  : email.split("@")[0],
+        "name"  : email,
         "alias" : "Explicit email adress " + email,
         "email" : email,
         "pager" : "",
@@ -588,7 +588,7 @@ def rbn_add_contact_information(plugin_context, contact):
     else:
         if contact.startswith("mailto:"): # Fake contact
             contact_dict = {
-                "name"  : contact[7:].split("@")[0],
+                "name"  : contact[7:],
                 "alias" : "Email address " + contact,
                 "email" : contact[7:],
                 "pager" : "" }



More information about the checkmk-commits mailing list