[checkmk-commits] Check_MK Git: check_mk: added HOST/SERVICEPROBLEMID to notification macros

git version control git at mathias-kettner.de
Sun Nov 18 14:59:14 CET 2012


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

Author: Mathias Kettner <mk at mathias-kettner.de>
Date:   Sun Nov 18 14:59:11 2012 +0100

added HOST/SERVICEPROBLEMID to notification macros

---

 ChangeLog                                |    2 ++
 check_mk_templates.cfg                   |    2 ++
 web/plugins/wato/globals_notification.py |    6 +++++-
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 88d1d14..4d60a59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 1.2.1i3:
+    Core:
+    * added HOST/SERVICEPROBLEMID to notification macros
     Event Console:
     * New performance counter for client request processing time
     * FIX: fixed bug in rule optimizer with ranges of syslog priorities
diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg
index 8e7686c..c99bd1e 100644
--- a/check_mk_templates.cfg
+++ b/check_mk_templates.cfg
@@ -313,6 +313,8 @@ define command {
        NOTIFY_NOTIFICATIONTYPE='$NOTIFICATIONTYPE$' \
        NOTIFY_HOSTNOTIFICATIONNUMBER='$HOSTNOTIFICATIONNUMBER$' \
        NOTIFY_SERVICENOTIFICATIONNUMBER='$SERVICENOTIFICATIONNUMBER$' \
+       NOTIFY_HOSTPROBLEMID='$HOSTPROBLEMID$' \
+       NOTIFY_SERVICEPROBLEMID='$SERVICEPROBLEMID$' \
        NOTIFY_HOSTNAME='$HOSTNAME$' \
        NOTIFY_HOSTALIAS='$HOSTALIAS$' \
        NOTIFY_HOSTADDRESS='$HOSTADDRESS$' \
diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py
index d66af2d..67cba82 100644
--- a/web/plugins/wato/globals_notification.py
+++ b/web/plugins/wato/globals_notification.py
@@ -115,7 +115,11 @@ register_configvar(group,
                   "<tt><b>$SERVICEOUTPUT$</b></tt>: the output of the check command , "
                   "<tt><b>$LONGSERVICEOUTPUT$</b></tt>: the long output of the check command, "
                   "<tt><b>$SERVICEPERFDATA$</b></tt>: the performance data of the check, "
-                  "<tt><b>$SERVICECHECKCOMMAND$</b></tt>: the name of the service check command"
+                  "<tt><b>$SERVICECHECKCOMMAND$</b></tt>: the name of the service check command, "
+                  "<tt><b>HOSTPROBLEMID</b></tt>: a unique ID of the host problem this notification is about, " 
+                  "<tt><b>SERVICEPROBLEMID</b></tt>: the same for service problems, " 
+                  "<tt><b>HOSTNOTIFICATIONNUMBER</b></tt>: the number of notification of this host problem (begins with 1), " 
+                  "<tt><b>SERVICENOTIFICATIONNUMBER</b></tt>: same for service problems, "
                   "<br><br>"
                   "<tt><b>$MONITORING_HOST$</b></tt>: the host name of the monitoring server "
                   "<tt><b>$OMD_ROOT$</b></tt>: the home directory of the OMD site (only on OMD) "



More information about the checkmk-commits mailing list