[omd-commits] OMD Git: omd: Check_MK: Added new version 1.2.4

git version control git at mathias-kettner.de
Thu Feb 13 10:16:18 CET 2014


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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Feb 13 09:30:59 2014 +0100
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Feb 13 09:30:59 2014 +0100

Check_MK: Added new version 1.2.4

---

 Changelog                                          |    1 +
 packages/check_mk/Makefile                         |    2 +-
 packages/check_mk/check_mk-1.2.2p3.tar.gz          |  Bin 5904386 -> 0 bytes
 packages/check_mk/check_mk-1.2.4.tar.gz            |  Bin 0 -> 6590988 bytes
 packages/check_mk/mkeventd-1.2.2p3.tar.gz          |  Bin 91469 -> 0 bytes
 packages/check_mk/mkeventd-1.2.4.tar.gz            |  Bin 0 -> 99670 bytes
 packages/check_mk/skel/etc/check_mk/defaults       |    2 +-
 .../skel/etc/nagios/conf.d/check_mk_templates.cfg  |   35 +++++++++++++++++---
 packages/mk-livestatus/Makefile                    |    2 +-
 .../mk-livestatus/mk-livestatus-1.2.2p3.tar.gz     |  Bin 382030 -> 0 bytes
 packages/mk-livestatus/mk-livestatus-1.2.4.tar.gz  |  Bin 0 -> 434179 bytes
 11 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/Changelog b/Changelog
index d26c5ee..fa549ca 100644
--- a/Changelog
+++ b/Changelog
@@ -14,6 +14,7 @@ This file documents the revision history for the Open Monitoring Distribution
             - Added --apache-reload flag to omd create/rm for executing a
               reload of the system apache instead of a restart
             - Added nagios/icinga reload init hooks
+          - Check_MK/MK Livestatus: new version 1.2.4
 
 1.10     Dec 15 2013
           - omd: More friendly error messages when init scripts do not exist
diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile
index 10a9e38..438a90c 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.2p3
+VERSION = 1.2.4
 DIR = $(NAME)-$(VERSION)
 EDIR = mkeventd-$(VERSION)
 
diff --git a/packages/check_mk/check_mk-1.2.2p3.tar.gz b/packages/check_mk/check_mk-1.2.2p3.tar.gz
deleted file mode 100644
index 9583722..0000000
Binary files a/packages/check_mk/check_mk-1.2.2p3.tar.gz and /dev/null differ
diff --git a/packages/check_mk/check_mk-1.2.4.tar.gz b/packages/check_mk/check_mk-1.2.4.tar.gz
new file mode 100644
index 0000000..b11236c
Binary files /dev/null and b/packages/check_mk/check_mk-1.2.4.tar.gz differ
diff --git a/packages/check_mk/mkeventd-1.2.2p3.tar.gz b/packages/check_mk/mkeventd-1.2.2p3.tar.gz
deleted file mode 100644
index 6ca0081..0000000
Binary files a/packages/check_mk/mkeventd-1.2.2p3.tar.gz and /dev/null differ
diff --git a/packages/check_mk/mkeventd-1.2.4.tar.gz b/packages/check_mk/mkeventd-1.2.4.tar.gz
new file mode 100644
index 0000000..825fae8
Binary files /dev/null and b/packages/check_mk/mkeventd-1.2.4.tar.gz differ
diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults
index 4562fc8..e968fde 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.2p3'
+check_mk_version            = '1.2.4'
 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 77a41d9..929b003 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
@@ -95,7 +95,7 @@ define host {
   retain_status_information       1
   retain_nonstatus_information    1
   process_perf_data	          0
-  check_command                   check-mk-ping
+  check_command                   check-mk-host-ping
   check_interval                  1
   check_period                    24X7
   max_check_attempts              1
@@ -133,7 +133,7 @@ define host {
 define host {
   name				  check_mk_cluster
   use				  check_mk_default
-  check_command                   check-mk-ping-cluster
+  check_command                   check-mk-host-ping-cluster
   register			  0
 }
 
@@ -315,17 +315,39 @@ define command {
   command_line  echo "DUMMY - Always OK"
 }
 
+# Commands for services of PING-only hosts
 define command {
   command_name  check-mk-ping
   command_line  $USER4$/lib/nagios/plugins/check_icmp $ARG1$ $HOSTADDRESS$
 }
 
-# Check for clusters: it is UP if at least one node is up
 define command {
   command_name check-mk-ping-cluster
   command_line $USER4$/lib/nagios/plugins/check_icmp -m 1 $ARG1$ $_HOSTNODEIPS$
 }
 
+# Host check commands
+define command {
+  command_name check-mk-host-ping
+  command_line $USER4$/lib/nagios/plugins/check_icmp $ARG1$ $HOSTADDRESS$
+}
+
+define command {
+  command_name check-mk-host-ping-cluster
+  command_line $USER4$/lib/nagios/plugins/check_icmp -m 1 $ARG1$ $_HOSTNODEIPS$
+}
+
+define command {
+  command_name  check-mk-host-ok
+  command_line  echo "OK - Host is always assumed to be up"
+}
+
+define command {
+  command_name  check-mk-host-tcp
+  command_line  $USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$
+}
+
+
 # General notification script. Details can be configured
 # in main.mk via notification_... options
 define command {
@@ -368,7 +390,12 @@ define command {
        NOTIFY_NOTIFICATIONAUTHORNAME='$NOTIFICATIONAUTHORNAME$' \
        NOTIFY_NOTIFICATIONAUTHORALIAS='$NOTIFICATIONAUTHORALIAS$' \
        NOTIFY_HOSTTAGS='$_HOSTTAGS$' \
-       check_mk --notify 
+       NOTIFY_HOST_SL='$_HOSTEC_SL$' \
+       NOTIFY_SVC_SL='$_SERVICEEC_SL$' \
+       NOTIFY_SERVICE_SL='$_SERVICEEC_SL$' \
+       NOTIFY_HOST_EC_CONTACT='$_HOSTEC_CONTACT$' \
+       NOTIFY_SERVICE_EC_CONTACT='$_SERVICEEC_CONTACT$' \
+       check_mk --notify
 }
 
 
diff --git a/packages/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile
index 5aa760e..5d4d90f 100644
--- a/packages/mk-livestatus/Makefile
+++ b/packages/mk-livestatus/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = mk-livestatus
-VERSION = 1.2.2p3
+VERSION = 1.2.4
 DIR = $(NAME)-$(VERSION)
 
 CONFIGUREOPTS = \
diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2p3.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2p3.tar.gz
deleted file mode 100644
index 01fc3ad..0000000
Binary files a/packages/mk-livestatus/mk-livestatus-1.2.2p3.tar.gz and /dev/null differ
diff --git a/packages/mk-livestatus/mk-livestatus-1.2.4.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.4.tar.gz
new file mode 100644
index 0000000..72b169c
Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.4.tar.gz differ



More information about the omd-commits mailing list