[omd-commits] OMD Git: omd: check_mk: Added 1.2.6p4

git version control git at mathias-kettner.de
Thu May 21 08:36:09 CEST 2015


Module:   omd
Branch:   master
Commit:   be2b8cc79695bdedea5eab8b88cb125270b44240
URL:      http://omdistro.org/projects/omd/repository/revisions/be2b8cc79695bdedea5eab8b88cb125270b44240

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu May 21 08:35:28 2015 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu May 21 08:35:28 2015 +0200

check_mk: Added 1.2.6p4

---

 packages/check_mk/Makefile                         |    2 +-
 ...k_mk-1.2.6p1.tar.gz => check_mk-1.2.6p4.tar.gz} |  Bin 7973024 -> 8038012 bytes
 packages/check_mk/mkeventd-1.2.6p1.tar.gz          |  Bin 109038 -> 0 bytes
 packages/check_mk/mkeventd-1.2.6p4.tar.gz          |  Bin 0 -> 109104 bytes
 packages/check_mk/skel/etc/check_mk/defaults       |    2 +-
 .../skel/etc/nagios/conf.d/check_mk_templates.cfg  |   32 ++++++++++++++------
 6 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile
index 9f57639..ed4081c 100644
--- a/packages/check_mk/Makefile
+++ b/packages/check_mk/Makefile
@@ -2,7 +2,7 @@ include ../../Makefile.omd
 
 SHELL = /bin/bash
 NAME = check_mk
-VERSION = 1.2.6p1
+VERSION = 1.2.6p4
 DIR = $(NAME)-$(VERSION)
 EDIR = mkeventd-$(VERSION)
 
diff --git a/packages/check_mk/check_mk-1.2.6p1.tar.gz b/packages/check_mk/check_mk-1.2.6p4.tar.gz
similarity index 53%
rename from packages/check_mk/check_mk-1.2.6p1.tar.gz
rename to packages/check_mk/check_mk-1.2.6p4.tar.gz
index d895c1a..522d801 100644
Binary files a/packages/check_mk/check_mk-1.2.6p1.tar.gz and b/packages/check_mk/check_mk-1.2.6p4.tar.gz differ
diff --git a/packages/check_mk/mkeventd-1.2.6p1.tar.gz b/packages/check_mk/mkeventd-1.2.6p1.tar.gz
deleted file mode 100644
index 6778ead..0000000
Binary files a/packages/check_mk/mkeventd-1.2.6p1.tar.gz and /dev/null differ
diff --git a/packages/check_mk/mkeventd-1.2.6p4.tar.gz b/packages/check_mk/mkeventd-1.2.6p4.tar.gz
new file mode 100644
index 0000000..d1e5c46
Binary files /dev/null and b/packages/check_mk/mkeventd-1.2.6p4.tar.gz differ
diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults
index 0939c90..3835d1a 100644
--- a/packages/check_mk/skel/etc/check_mk/defaults
+++ b/packages/check_mk/skel/etc/check_mk/defaults
@@ -3,7 +3,7 @@
 # Do not edit this file. It is handled by OMD. Changing something
 # here will break something almost for sure. You have been warned.
 
-check_mk_version            = '1.2.6p1'
+check_mk_version            = '1.2.6p4'
 default_config_dir          = '###ROOT###/etc/check_mk'
 check_mk_configdir          = '###ROOT###/etc/check_mk/conf.d'
 share_dir                   = '###ROOT###/share/check_mk'
diff --git a/packages/check_mk/skel/etc/nagios/conf.d/check_mk_templates.cfg b/packages/check_mk/skel/etc/nagios/conf.d/check_mk_templates.cfg
index 929b003..804d0a1 100644
--- a/packages/check_mk/skel/etc/nagios/conf.d/check_mk_templates.cfg
+++ b/packages/check_mk/skel/etc/nagios/conf.d/check_mk_templates.cfg
@@ -5,7 +5,7 @@
 # |           | |___| | | |  __/ (__|   <    | |  | | . \            |
 # |            \____|_| |_|\___|\___|_|\_\___|_|  |_|_|\_\           |
 # |                                                                  |
-# | Copyright Mathias Kettner 2013             mk at mathias-kettner.de |
+# | Copyright Mathias Kettner 2014             mk at mathias-kettner.de |
 # +------------------------------------------------------------------+
 #
 # This file is part of Check_MK.
@@ -49,7 +49,7 @@
 #     | |   / _ \| '_ \| __/ _` |/ __| __/ __|
 #     | |__| (_) | | | | || (_| | (__| |_\__ \
 #      \____\___/|_| |_|\__\__,_|\___|\__|___/
-#     
+#
 
 # This contact is only needed while you have not configured contacts
 # for your hosts and services with the variables
@@ -151,7 +151,7 @@ define host {
 #     \___ \ / _ \ '__\ \ / / |/ __/ _ \/ __|
 #      ___) |  __/ |   \ V /| | (_|  __/\__ \
 #     |____/ \___|_|    \_/ |_|\___\___||___/
-#     
+#
 
 # Template used by all other check_mk templates
 define service {
@@ -230,7 +230,7 @@ define service {
 }
 
 # This template is used for aggregated services (on the
-# summary hosts). The never have performance data. A 
+# summary hosts). The never have performance data. A
 # check command must be defined - even if never called.
 # Notifications for aggregated services are disabled.
 # Otherwise you would get them twice.
@@ -267,7 +267,7 @@ define service {
 
 # This template is used by service dependencies created via
 # the configuration variable service_dependencies. Since we
-# only deal with passive checks the dependencies are not 
+# only deal with passive checks the dependencies are not
 # used to suppress service checks. But they are very useful
 # for suppressing notifications. If you set inherits_parent
 # to 1, then if A depends on B and B depends on C, A will
@@ -288,7 +288,7 @@ define servicedependency {
 #     | |   / _ \| '_ ` _ \| '_ ` _ \ / _` | '_ \ / _` / __|
 #     | |__| (_) | | | | | | | | | | | (_| | | | | (_| \__ \
 #      \____\___/|_| |_| |_|_| |_| |_|\__,_|_| |_|\__,_|___/
-#     
+#
 
 
 # Calling check_mk with precompiled checks
@@ -301,7 +301,7 @@ define command {
 # checks (which is not recommended):
 # define command {
 #  command_name	check-mk
-#  command_line check_mk $HOSTNAME$ $HOSTADDRESS$ 
+#  command_line check_mk $HOSTNAME$ $HOSTADDRESS$
 #}
 
 # Inventory check
@@ -364,23 +364,29 @@ define command {
        NOTIFY_HOSTNAME='$HOSTNAME$' \
        NOTIFY_HOSTALIAS='$HOSTALIAS$' \
        NOTIFY_HOSTADDRESS='$HOSTADDRESS$' \
+       NOTIFY_HOSTATTEMPT='$HOSTATTEMPT$' \
        NOTIFY_LASTHOSTSTATE='$LASTHOSTSTATE$' \
+       NOTIFY_LASTHOSTSTATEID='$LASTHOSTSTATEID$' \
        NOTIFY_LASTHOSTSTATECHANGE='$LASTHOSTSTATECHANGE$' \
+       NOTIFY_LASTHOSTUP='$LASTHOSTUP$' \
        NOTIFY_HOSTSTATE='$HOSTSTATE$' \
        NOTIFY_HOSTSTATEID='$HOSTSTATEID$' \
-       NOTIFY_HOSTCHECKCOMMAND='$HOSTCHECKCOMMAND$' \
+       NOTIFY_HOSTCHECKCOMMAND="$HOSTCHECKCOMMAND$" \
        NOTIFY_HOSTOUTPUT='$HOSTOUTPUT$' \
        NOTIFY_HOSTPERFDATA='$HOSTPERFDATA$' \
        NOTIFY_LONGHOSTOUTPUT='$LONGHOSTOUTPUT$' \
        NOTIFY_SERVICEDESC='$SERVICEDESC$' \
        NOTIFY_LASTSERVICESTATE='$LASTSERVICESTATE$' \
+       NOTIFY_LASTSERVICESTATEID='$LASTSERVICESTATEID$' \
        NOTIFY_LASTSERVICESTATECHANGE='$LASTSERVICESTATECHANGE$' \
+       NOTIFY_LASTSERVICEOK='$LASTSERVICEOK$' \
+       NOTIFY_SERVICEATTEMPT='$SERVICEATTEMPT$' \
        NOTIFY_SERVICESTATE='$SERVICESTATE$' \
        NOTIFY_SERVICESTATEID='$SERVICESTATEID$' \
        NOTIFY_SERVICEOUTPUT='$SERVICEOUTPUT$' \
        NOTIFY_LONGSERVICEOUTPUT='$LONGSERVICEOUTPUT$' \
        NOTIFY_SERVICEPERFDATA='$SERVICEPERFDATA$' \
-       NOTIFY_SERVICECHECKCOMMAND='$SERVICECHECKCOMMAND$' \
+       NOTIFY_SERVICECHECKCOMMAND="$SERVICECHECKCOMMAND$" \
        NOTIFY_DATE='$DATE$' \
        NOTIFY_SHORTDATETIME='$SHORTDATETIME$' \
        NOTIFY_LONGDATETIME='$LONGDATETIME$' \
@@ -389,6 +395,12 @@ define command {
        NOTIFY_NOTIFICATIONAUTHOR='$NOTIFICATIONAUTHOR$' \
        NOTIFY_NOTIFICATIONAUTHORNAME='$NOTIFICATIONAUTHORNAME$' \
        NOTIFY_NOTIFICATIONAUTHORALIAS='$NOTIFICATIONAUTHORALIAS$' \
+       NOTIFY_SERVICEACKAUTHOR='$SERVICEACKAUTHOR$' \
+       NOTIFY_SERVICEACKCOMMENT='$SERVICEACKCOMMENT$' \
+       NOTIFY_SERVICEGROUPNAMES='$SERVICEGROUPNAMES$' \
+       NOTIFY_HOSTACKAUTHOR='$HOSTACKAUTHOR$' \
+       NOTIFY_HOSTACKCOMMENT='$HOSTACKCOMMENT$' \
+       NOTIFY_HOSTGROUPNAMES='$HOSTGROUPNAMES$' \
        NOTIFY_HOSTTAGS='$_HOSTTAGS$' \
        NOTIFY_HOST_SL='$_HOSTEC_SL$' \
        NOTIFY_SVC_SL='$_SERVICEEC_SL$' \
@@ -405,7 +417,7 @@ define command {
 #       | | | | | | | | |  __/ |_) |  __/ |  | | (_) | (_| \__ \
 #       |_| |_|_| |_| |_|\___| .__/ \___|_|  |_|\___/ \__,_|___/
 #                            |_|
-#     
+#
 
 # Make sure, timeperiod used in default template is available
 



More information about the omd-commits mailing list