[checkmk-commits] Check_MK Git: check_mk: #2193 FIX Remove duplicate performance data from host notifications

Module: check_mk Branch: master Commit: 2b4168a3c33ba6e5ec0fe0b040ee9152f4d71a16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b4168a3c33ba6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 18:11:42 2015 +0200 #2193 FIX Remove duplicate performance data from host notifications In HTML emails for host notifications the row for the host performance data appeared twice. The second appearance was now moved to the services notification - for which it originally was intended. --- .werks/2193 | 12 ++++++++++++ ChangeLog | 1 + notifications/mail | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2193 b/.werks/2193 new file mode 100644 index 0000000..59cf202 --- /dev/null +++ b/.werks/2193 @@ -0,0 +1,12 @@ +Title: Remove duplicate performance data from host notifications +Level: 2 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428509406 + +In HTML emails for host notifications the row for the host performance +data appeared twice. The second appearance was now moved to the services +notification - for which it originally was intended. diff --git a/ChangeLog b/ChangeLog index 54ff2fb..30ae717 100644 --- a/ChangeLog +++ b/ChangeLog @@ -439,6 +439,7 @@ * 2015 FIX: Fixed sending notifications for services with umlauts in names... * 2038 FIX: Log complete Email address into monitoring history when notifying explicity addresses * 2081 FIX: Improved logging of mkeventd in error cases + * 2193 FIX: Remove duplicate performance data from host notifications... BI: * 1784 FIX: Fix exception in BI Boxes when parents are being used diff --git a/notifications/mail b/notifications/mail index d4aad2e..5aa984b 100755 --- a/notifications/mail +++ b/notifications/mail @@ -280,7 +280,7 @@ body_elements = [ "$SERVICEACKCOMMENT$", "$SERVICEACKCOMMENT$",), - ( "perfdata", "host", False, "Performance Data", + ( "perfdata", "service", False, "Performance Data", "$HOSTPERFDATA$", "$HOSTPERFDATA$",),