[checkmk-commits] Check_MK Git: check_mk: Add variable CONTACTPAGER to allowed macros in notifications

Module: check_mk Branch: master Commit: 51075a9c37997bca34a57afee5dcb88cc5787329 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51075a9c37997b… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Tue Jul 3 10:38:28 2012 +0200 Add variable CONTACTPAGER to allowed macros in notifications --- ChangeLog | 1 + check_mk_templates.cfg | 1 + web/plugins/wato/globals_notification.py | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea14d5b..93837a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * FIX: fixed problem with disabled sites in WATO * FIX: massive speedup when changing roles/users and activing changes (especially when you have a larger number of users and folders) + * Add variable CONTACTPAGER to allowed macros in notifications BI: * New iterators FOREACH_CHILD and FOREACH_PARENT diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index b1879b3..ec5f600 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -309,6 +309,7 @@ define command { command_line \ NOTIFY_CONTACTNAME='$CONTACTNAME$' \ NOTIFY_CONTACTEMAIL='$CONTACTEMAIL$' \ + NOTIFY_CONTACTPAGER='$CONTACTPAGER$' \ NOTIFY_NOTIFICATIONTYPE='$NOTIFICATIONTYPE$' \ NOTIFY_HOSTNAME='$HOSTNAME$' \ NOTIFY_HOSTALIAS='$HOSTALIAS$' \ diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index af3db6c..f97441a 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -98,6 +98,7 @@ register_configvar(group, "The following macros are available in all templates:<br><br>" "<tt><b>$CONTACTNAME$</b></tt>: login name of the contact person, " "<tt><b>$CONTACTEMAIL$</b></tt>: email address of the contact person, " + "<tt><b>$CONTACTPAGER$</b></tt>: pager address of the contact person, " "<tt><b>$NOTIFICATIONTYPE$</b></tt>: one of PROBLEM, RECOVERY, ACKNOWLEDGEMENT, FLAPPINGSTART, FLAPPINGSTOP, FLAPPINGDISABLED, DOWNTIMESTART, DOWNTIMEEND, or DOWNTIMECANCELLED, " "<tt><b>$HOSTNAME$</b></tt>: the name of the host, " "<tt><b>$HOSTALIAS$</b></tt>: the alias of the host, "