From git at mathias-kettner.de Tue Apr 2 11:34:03 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 02 Apr 2013 11:34:03 +0200 Subject: [omd-commits] OMD Git: omd: thruk: update 1.66-2 Message-ID: <20130402093403.A0624843948@mail.mathias-kettner.de> Module: omd Branch: master Commit: e830abad165d26d482c8ee29433b03a8c2442d29 URL: http://omdistro.org/projects/omd/repository/revisions/e830abad165d26d482c8ee29433b03a8c2442d29 Author: Sven Nierlein Date: Tue Apr 2 11:33:41 2013 +0200 Commiter: Sven Nierlein Date: Tue Apr 2 11:33:41 2013 +0200 thruk: update 1.66-2 --- Changelog | 2 +- packages/thruk/Thruk-1.66.tar.gz | Bin 7337341 -> 7337919 bytes 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Changelog b/Changelog index dcda6f2..6dc5577 100644 --- a/Changelog +++ b/Changelog @@ -2,7 +2,7 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: - Icinga: Update to 1.8.4 - - Thruk: Update to 1.66 + - Thruk: Update to 1.66-2 - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode - Check_MK/MK Livestatus: diff --git a/packages/thruk/Thruk-1.66.tar.gz b/packages/thruk/Thruk-1.66.tar.gz index b2edc31..7e8e930 100644 Binary files a/packages/thruk/Thruk-1.66.tar.gz and b/packages/thruk/Thruk-1.66.tar.gz differ From git at mathias-kettner.de Tue Apr 2 13:23:58 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 02 Apr 2013 13:23:58 +0200 Subject: [omd-commits] OMD Git: omd: thruk: update cronjobs on omd update Message-ID: <20130402112358.C754E8409A7@mail.mathias-kettner.de> Module: omd Branch: master Commit: cd7ceb5de0146ac2b7a53717784f698538c4a1bf URL: http://omdistro.org/projects/omd/repository/revisions/cd7ceb5de0146ac2b7a53717784f698538c4a1bf Author: Sven Nierlein Date: Tue Apr 2 13:23:18 2013 +0200 Commiter: Sven Nierlein Date: Tue Apr 2 13:23:18 2013 +0200 thruk: update cronjobs on omd update --- packages/thruk/THRUK.hook | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/packages/thruk/THRUK.hook b/packages/thruk/THRUK.hook index c5dd991..af9cf26 100755 --- a/packages/thruk/THRUK.hook +++ b/packages/thruk/THRUK.hook @@ -6,6 +6,7 @@ case "$1" in if [ -e etc/cron.d/thruk.auto ]; then newversion=$(basename $(readlink version)) sed -i etc/cron.d/thruk.auto -e "s|/omd/versions/[0-9\.]*/|/omd/versions/$newversion/|g" || echo "Updating Thruk Jobs Failed" + ./bin/thruk -a installcron > /dev/null fi ;; esac From git at mathias-kettner.de Tue Apr 2 15:34:39 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 02 Apr 2013 15:34:39 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20130402133439.255A78409F1@mail.mathias-kettner.de> Module: omd Branch: master Commit: 426e6d88a8c272bd7c36a5b7603bd31d827ad6c8 URL: http://omdistro.org/projects/omd/repository/revisions/426e6d88a8c272bd7c36a5b7603bd31d827ad6c8 Author: Lars Michelsen Date: Tue Apr 2 15:34:01 2013 +0200 Commiter: Lars Michelsen Date: Tue Apr 2 15:34:01 2013 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Tue Apr 2 15:34:39 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 02 Apr 2013 15:34:39 +0200 Subject: [omd-commits] OMD Git: omd: nagvis: updated to 1.7.7 Message-ID: <20130402133439.334F184095D@mail.mathias-kettner.de> Module: omd Branch: master Commit: a4a14fc01af91ab51144107d9d71f538bb7f6a88 URL: http://omdistro.org/projects/omd/repository/revisions/a4a14fc01af91ab51144107d9d71f538bb7f6a88 Author: Lars Michelsen Date: Tue Apr 2 15:33:37 2013 +0200 Commiter: Lars Michelsen Date: Tue Apr 2 15:33:37 2013 +0200 nagvis: updated to 1.7.7 --- Changelog | 2 +- packages/nagvis/Makefile | 2 +- .../{nagvis-1.7.6.tar.gz => nagvis-1.7.7.tar.gz} | Bin 3504571 -> 3514779 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index dcda6f2..7e2c28b 100644 --- a/Changelog +++ b/Changelog @@ -10,7 +10,7 @@ This file documents the revision history for the Open Monitoring Distribution - integrated Event Console - Changed path for check manpages from share/doc/check_mk/checks to share/check_mk/checkman to match the local/ path - - NagVis: Update to 1.7.5 + - NagVis: Update to 1.7.7 - omd: new option --no-autostart, -A for omd create (set AUTOSTART to off right at creation, useful for test sites!) - PNP4Nagios: Updated to version 0.6.21 diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile index 10c8939..2568c0a 100644 --- a/packages/nagvis/Makefile +++ b/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.7.6 +VERSION = 1.7.7 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/nagvis/nagvis-1.7.6.tar.gz b/packages/nagvis/nagvis-1.7.7.tar.gz similarity index 54% rename from packages/nagvis/nagvis-1.7.6.tar.gz rename to packages/nagvis/nagvis-1.7.7.tar.gz index a1a5757..2e47836 100644 Binary files a/packages/nagvis/nagvis-1.7.6.tar.gz and b/packages/nagvis/nagvis-1.7.7.tar.gz differ From git at mathias-kettner.de Wed Apr 3 08:55:18 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 03 Apr 2013 08:55:18 +0200 Subject: [omd-commits] OMD Git: omd: nagios: Changed init script to kill still running processes during Message-ID: <20130403065518.C345A8431EB@mail.mathias-kettner.de> Module: omd Branch: master Commit: 0f6d6556a317d8a023a692af15bd318cd40b4713 URL: http://omdistro.org/projects/omd/repository/revisions/0f6d6556a317d8a023a692af15bd318cd40b4713 Author: Lars Michelsen Date: Wed Apr 3 08:54:56 2013 +0200 Commiter: Lars Michelsen Date: Wed Apr 3 08:54:56 2013 +0200 nagios: Changed init script to kill still running processes during "stop" call after 60 seconds waiting --- Changelog | 3 ++- packages/nagios/skel/etc/init.d/nagios | 13 ++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index afee4d5..8a6afd7 100644 --- a/Changelog +++ b/Changelog @@ -24,7 +24,8 @@ This file documents the revision history for the Open Monitoring Distribution sys.path set during interpreter initialization - Dokuwiki: Now supporting the new multisite cookie format - rrdtool: compile and install Python binding - + - nagios: Changed init script to kill still running processes during + "stop" call after 60 seconds waiting 0.56 Sep 25 2012 - omd: diff --git a/packages/nagios/skel/etc/init.d/nagios b/packages/nagios/skel/etc/init.d/nagios index 81439a6..3ad4952 100755 --- a/packages/nagios/skel/etc/init.d/nagios +++ b/packages/nagios/skel/etc/init.d/nagios @@ -128,7 +128,18 @@ nagios_wait_stop() { kill $pid while kill -0 $pid >/dev/null 2>&1; do if [ $I = '60' ]; then - return 1 + echo " Nagios still running.. sending SIGKILL" + kill -9 $pid + I=0 + while kill -0 $pid >/dev/null 2>&1; do + if [ $I = '10' ]; then + return 1 + else + echo -n "." + I=$(($I+1)) + sleep 1 + fi + done else echo -n "." I=$(($I+1)) From git at mathias-kettner.de Wed Apr 3 09:52:40 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 03 Apr 2013 09:52:40 +0200 Subject: [omd-commits] OMD Git: omd: Reworked last nagios init script patch Message-ID: <20130403075241.D51808431ED@mail.mathias-kettner.de> Module: omd Branch: master Commit: f14bd4af86be388452547c2be52ef1e742f6dc35 URL: http://omdistro.org/projects/omd/repository/revisions/f14bd4af86be388452547c2be52ef1e742f6dc35 Author: Lars Michelsen Date: Wed Apr 3 09:52:35 2013 +0200 Commiter: Lars Michelsen Date: Wed Apr 3 09:52:35 2013 +0200 Reworked last nagios init script patch --- packages/nagios/skel/etc/init.d/nagios | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/packages/nagios/skel/etc/init.d/nagios b/packages/nagios/skel/etc/init.d/nagios index 3ad4952..e6bb6c7 100755 --- a/packages/nagios/skel/etc/init.d/nagios +++ b/packages/nagios/skel/etc/init.d/nagios @@ -128,23 +128,15 @@ nagios_wait_stop() { kill $pid while kill -0 $pid >/dev/null 2>&1; do if [ $I = '60' ]; then - echo " Nagios still running.. sending SIGKILL" + echo -ne "\nsending SIGKILL" kill -9 $pid - I=0 - while kill -0 $pid >/dev/null 2>&1; do - if [ $I = '10' ]; then - return 1 - else - echo -n "." - I=$(($I+1)) - sleep 1 - fi - done - else - echo -n "." - I=$(($I+1)) - sleep 1 + elif [ $I = '70' ]; then + return 1 fi + + echo -n "." + I=$(($I+1)) + sleep 1 done # Is there another proc with ppid 1? pid=$(pidof_nagios) || break From git at mathias-kettner.de Wed Apr 3 16:05:53 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 03 Apr 2013 16:05:53 +0200 Subject: [omd-commits] OMD Git: omd: Check_MK: new version 1.2.2b6 Message-ID: <20130403140553.5236E8431AB@mail.mathias-kettner.de> Module: omd Branch: master Commit: 9d41976ff3320ed66b43ec6d5984912303545590 URL: http://omdistro.org/projects/omd/repository/revisions/9d41976ff3320ed66b43ec6d5984912303545590 Author: Lars Michelsen Date: Wed Apr 3 16:04:17 2013 +0200 Commiter: Lars Michelsen Date: Wed Apr 3 16:04:17 2013 +0200 Check_MK: new version 1.2.2b6 --- Changelog | 2 +- packages/check_mk/Makefile | 2 +- ...k_mk-1.2.2b5.tar.gz => check_mk-1.2.2b6.tar.gz} | Bin 12343340 -> 12436036 bytes packages/check_mk/mkeventd-1.2.2b5.tar.gz | Bin 87653 -> 0 bytes packages/check_mk/mkeventd-1.2.2b6.tar.gz | Bin 0 -> 87954 bytes packages/check_mk/skel/etc/check_mk/defaults | 2 +- packages/mk-livestatus/Makefile | 2 +- .../mk-livestatus/mk-livestatus-1.2.2b5.tar.gz | Bin 381117 -> 0 bytes .../mk-livestatus/mk-livestatus-1.2.2b6.tar.gz | Bin 0 -> 381136 bytes 9 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 8a6afd7..05323e5 100644 --- a/Changelog +++ b/Changelog @@ -6,7 +6,7 @@ This file documents the revision history for the Open Monitoring Distribution - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode - Check_MK/MK Livestatus: - - new version 1.2.2b5 + - new version 1.2.2b6 - integrated Event Console - Changed path for check manpages from share/doc/check_mk/checks to share/check_mk/checkman to match the local/ path diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile index 52cf23a..d7e2bbc 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.2b5 +VERSION = 1.2.2b6 DIR = $(NAME)-$(VERSION) EDIR = mkeventd-$(VERSION) diff --git a/packages/check_mk/check_mk-1.2.2b5.tar.gz b/packages/check_mk/check_mk-1.2.2b6.tar.gz similarity index 60% rename from packages/check_mk/check_mk-1.2.2b5.tar.gz rename to packages/check_mk/check_mk-1.2.2b6.tar.gz index 40ec2cd..6d336a4 100644 Binary files a/packages/check_mk/check_mk-1.2.2b5.tar.gz and b/packages/check_mk/check_mk-1.2.2b6.tar.gz differ diff --git a/packages/check_mk/mkeventd-1.2.2b5.tar.gz b/packages/check_mk/mkeventd-1.2.2b5.tar.gz deleted file mode 100644 index 5b518bd..0000000 Binary files a/packages/check_mk/mkeventd-1.2.2b5.tar.gz and /dev/null differ diff --git a/packages/check_mk/mkeventd-1.2.2b6.tar.gz b/packages/check_mk/mkeventd-1.2.2b6.tar.gz new file mode 100644 index 0000000..147b132 Binary files /dev/null and b/packages/check_mk/mkeventd-1.2.2b6.tar.gz differ diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults index 0677634..bba1e73 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.2b5' +check_mk_version = '1.2.2b6' 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/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile index 3453612..7ac4c88 100644 --- a/packages/mk-livestatus/Makefile +++ b/packages/mk-livestatus/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mk-livestatus -VERSION = 1.2.2b5 +VERSION = 1.2.2b6 DIR = $(NAME)-$(VERSION) CONFIGUREOPTS = \ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2b5.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2b5.tar.gz deleted file mode 100644 index d3761dc..0000000 Binary files a/packages/mk-livestatus/mk-livestatus-1.2.2b5.tar.gz and /dev/null differ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2b6.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2b6.tar.gz new file mode 100644 index 0000000..c28a3f8 Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.2b6.tar.gz differ From git at mathias-kettner.de Wed Apr 3 17:56:09 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 03 Apr 2013 17:56:09 +0200 Subject: [omd-commits] OMD Git: omd: thruk: reload crontab only if already running Message-ID: <20130403155610.0C91C840F30@mail.mathias-kettner.de> Module: omd Branch: master Commit: 1d82bb820b87f5d7862cfa2fdcf96c7c7923c2fd URL: http://omdistro.org/projects/omd/repository/revisions/1d82bb820b87f5d7862cfa2fdcf96c7c7923c2fd Author: Sven Nierlein Date: Wed Apr 3 16:30:26 2013 +0200 Commiter: Sven Nierlein Date: Wed Apr 3 16:30:55 2013 +0200 thruk: reload crontab only if already running --- packages/thruk/skel/etc/thruk/reload_cron.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/packages/thruk/skel/etc/thruk/reload_cron.sh b/packages/thruk/skel/etc/thruk/reload_cron.sh index e2761b5..f47b7db 100644 --- a/packages/thruk/skel/etc/thruk/reload_cron.sh +++ b/packages/thruk/skel/etc/thruk/reload_cron.sh @@ -7,4 +7,5 @@ if [ "$CONFIG_APACHE_MODE" = "shared" -a $(/usr/bin/id -un) != $OMD_SITE ]; then exit 0 fi -omd restart crontab +$OMD_ROOT/etc/init.d/crontab status >/dev/null && $OMD_ROOT/etc/init.d/crontab restart +exit 0 From git at mathias-kettner.de Wed Apr 3 22:48:50 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 03 Apr 2013 22:48:50 +0200 Subject: [omd-commits] OMD Git: omd: Check_MK: new version 1.2.2b7 Message-ID: <20130403204850.C9AAB840E86@mail.mathias-kettner.de> Module: omd Branch: master Commit: 634daeb506484308a6d486b01520de7142fa3603 URL: http://omdistro.org/projects/omd/repository/revisions/634daeb506484308a6d486b01520de7142fa3603 Author: Andreas Boesl Date: Wed Apr 3 22:44:46 2013 +0200 Commiter: Andreas Boesl Date: Wed Apr 3 22:44:46 2013 +0200 Check_MK: new version 1.2.2b7 --- Changelog | 2 +- packages/check_mk/Makefile | 2 +- ...k_mk-1.2.2b6.tar.gz => check_mk-1.2.2b7.tar.gz} | Bin 12436036 -> 12435924 bytes packages/check_mk/mkeventd-1.2.2b6.tar.gz | Bin 87954 -> 0 bytes packages/check_mk/mkeventd-1.2.2b7.tar.gz | Bin 0 -> 87953 bytes packages/check_mk/skel/etc/check_mk/defaults | 2 +- packages/mk-livestatus/Makefile | 2 +- .../mk-livestatus/mk-livestatus-1.2.2b6.tar.gz | Bin 381136 -> 0 bytes .../mk-livestatus/mk-livestatus-1.2.2b7.tar.gz | Bin 0 -> 381140 bytes 9 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 05323e5..4b0dfb2 100644 --- a/Changelog +++ b/Changelog @@ -6,7 +6,7 @@ This file documents the revision history for the Open Monitoring Distribution - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode - Check_MK/MK Livestatus: - - new version 1.2.2b6 + - new version 1.2.2b7 - integrated Event Console - Changed path for check manpages from share/doc/check_mk/checks to share/check_mk/checkman to match the local/ path diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile index d7e2bbc..11b8e29 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.2b6 +VERSION = 1.2.2b7 DIR = $(NAME)-$(VERSION) EDIR = mkeventd-$(VERSION) diff --git a/packages/check_mk/check_mk-1.2.2b6.tar.gz b/packages/check_mk/check_mk-1.2.2b7.tar.gz similarity index 65% rename from packages/check_mk/check_mk-1.2.2b6.tar.gz rename to packages/check_mk/check_mk-1.2.2b7.tar.gz index 6d336a4..2ce803b 100644 Binary files a/packages/check_mk/check_mk-1.2.2b6.tar.gz and b/packages/check_mk/check_mk-1.2.2b7.tar.gz differ diff --git a/packages/check_mk/mkeventd-1.2.2b6.tar.gz b/packages/check_mk/mkeventd-1.2.2b6.tar.gz deleted file mode 100644 index 147b132..0000000 Binary files a/packages/check_mk/mkeventd-1.2.2b6.tar.gz and /dev/null differ diff --git a/packages/check_mk/mkeventd-1.2.2b7.tar.gz b/packages/check_mk/mkeventd-1.2.2b7.tar.gz new file mode 100644 index 0000000..c2f26aa Binary files /dev/null and b/packages/check_mk/mkeventd-1.2.2b7.tar.gz differ diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults index bba1e73..4fdda4b 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.2b6' +check_mk_version = '1.2.2b7' 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/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile index 7ac4c88..f40ee09 100644 --- a/packages/mk-livestatus/Makefile +++ b/packages/mk-livestatus/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mk-livestatus -VERSION = 1.2.2b6 +VERSION = 1.2.2b7 DIR = $(NAME)-$(VERSION) CONFIGUREOPTS = \ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2b6.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2b6.tar.gz deleted file mode 100644 index c28a3f8..0000000 Binary files a/packages/mk-livestatus/mk-livestatus-1.2.2b6.tar.gz and /dev/null differ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2b7.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2b7.tar.gz new file mode 100644 index 0000000..693dd1d Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.2b7.tar.gz differ From git at mathias-kettner.de Fri Apr 5 11:52:08 2013 From: git at mathias-kettner.de (git version control) Date: Fri, 05 Apr 2013 11:52:08 +0200 Subject: [omd-commits] OMD Git: omd: python-modules: added gitignore Message-ID: <20130405095208.5FF748432BD@mail.mathias-kettner.de> Module: omd Branch: master Commit: f07d429bffc82f624a820821f674f3e45d1ae828 URL: http://omdistro.org/projects/omd/repository/revisions/f07d429bffc82f624a820821f674f3e45d1ae828 Author: Lars Michelsen Date: Fri Apr 5 11:51:48 2013 +0200 Commiter: Lars Michelsen Date: Fri Apr 5 11:51:48 2013 +0200 python-modules: added gitignore --- packages/python-modules/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/packages/python-modules/.gitignore b/packages/python-modules/.gitignore new file mode 100644 index 0000000..89ea643 --- /dev/null +++ b/packages/python-modules/.gitignore @@ -0,0 +1 @@ +dest From git at mathias-kettner.de Fri Apr 5 11:52:08 2013 From: git at mathias-kettner.de (git version control) Date: Fri, 05 Apr 2013 11:52:08 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20130405095208.88DBF842F6D@mail.mathias-kettner.de> Module: omd Branch: master Commit: 894fc31dcd0a78e39ab2f84419351b65251960f2 URL: http://omdistro.org/projects/omd/repository/revisions/894fc31dcd0a78e39ab2f84419351b65251960f2 Author: Lars Michelsen Date: Fri Apr 5 11:52:02 2013 +0200 Commiter: Lars Michelsen Date: Fri Apr 5 11:52:02 2013 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Fri Apr 5 11:52:08 2013 From: git at mathias-kettner.de (git version control) Date: Fri, 05 Apr 2013 11:52:08 +0200 Subject: [omd-commits] OMD Git: omd: Added python module pysphere to make ESX monitoring easier Message-ID: <20130405095208.A66968430E0@mail.mathias-kettner.de> Module: omd Branch: master Commit: 9f2733a855fbd3bebafe708a31a32620164fa5cc URL: http://omdistro.org/projects/omd/repository/revisions/9f2733a855fbd3bebafe708a31a32620164fa5cc Author: Lars Michelsen Date: Fri Apr 5 11:51:10 2013 +0200 Commiter: Lars Michelsen Date: Fri Apr 5 11:51:13 2013 +0200 Added python module pysphere to make ESX monitoring easier --- Changelog | 1 + Makefile | 1 + packages/python-modules/Makefile | 31 ++++++++++++++++++++++++ packages/python-modules/src/pysphere-0.1.7.zip | Bin 0 -> 516848 bytes 4 files changed, 33 insertions(+), 0 deletions(-) diff --git a/Changelog b/Changelog index 05323e5..4ce4ab9 100644 --- a/Changelog +++ b/Changelog @@ -26,6 +26,7 @@ This file documents the revision history for the Open Monitoring Distribution - rrdtool: compile and install Python binding - nagios: Changed init script to kill still running processes during "stop" call after 60 seconds waiting + - Added python module pysphere to make ESX monitoring easier 0.56 Sep 25 2012 - omd: diff --git a/Makefile b/Makefile index 7d73346..56b6bec 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ SHELL = /bin/bash # You can select a subset of the packages by overriding this # variale, e.g. make PACKAGES='nagios rrdtool' pack PACKAGES=perl-modules \ + python-modules \ apache-omd \ mod_python \ check_logfiles \ diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile new file mode 100644 index 0000000..2952e17 --- /dev/null +++ b/packages/python-modules/Makefile @@ -0,0 +1,31 @@ +include ../../Makefile.omd + +NAME = python-modules +VERSION = $(OMD_VERSION) +DISTRO = $(shell ../../distro) + +MODULES = pysphere-0.1.7.zip + +build: + mkdir -p dest + cd dest && \ + for M in $(MODULES); do \ + unzip -o ../src/$$M ; \ + cd $M ; \ + done + +install: + mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python + pwd + cd dest && \ + export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \ + for M in $(shell ls dest); do \ + cd $$M ; \ + python setup.py install --home=$(DESTDIR)$(OMD_ROOT) ; \ + cd .. ; \ + done + +skel: + +clean: + rm -rf dest diff --git a/packages/python-modules/src/pysphere-0.1.7.zip b/packages/python-modules/src/pysphere-0.1.7.zip new file mode 100644 index 0000000..576fbc2 Binary files /dev/null and b/packages/python-modules/src/pysphere-0.1.7.zip differ From git at mathias-kettner.de Fri Apr 5 12:53:36 2013 From: git at mathias-kettner.de (git version control) Date: Fri, 05 Apr 2013 12:53:36 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20130405105336.D92D68432BF@mail.mathias-kettner.de> Module: omd Branch: master Commit: d174c6fa07e9a15a8c479dd76b015737a0eb6664 URL: http://omdistro.org/projects/omd/repository/revisions/d174c6fa07e9a15a8c479dd76b015737a0eb6664 Author: Gerhard Lausser Date: Fri Apr 5 12:53:35 2013 +0200 Commiter: Gerhard Lausser Date: Fri Apr 5 12:53:35 2013 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Fri Apr 5 12:53:36 2013 From: git at mathias-kettner.de (git version control) Date: Fri, 05 Apr 2013 12:53:36 +0200 Subject: [omd-commits] OMD Git: omd: shinken: make sure processes are really stopped in omd stop Message-ID: <20130405105337.23A808432BD@mail.mathias-kettner.de> Module: omd Branch: master Commit: 98fd2be41e0e8d039efb3fd10a0dc9e554a888fb URL: http://omdistro.org/projects/omd/repository/revisions/98fd2be41e0e8d039efb3fd10a0dc9e554a888fb Author: Gerhard Lausser Date: Fri Apr 5 10:01:37 2013 +0200 Commiter: Gerhard Lausser Date: Fri Apr 5 10:01:37 2013 +0200 shinken: make sure processes are really stopped in omd stop --- packages/shinken/skel/etc/init.d/shinken | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/packages/shinken/skel/etc/init.d/shinken b/packages/shinken/skel/etc/init.d/shinken index e68b8ff..f9e5883 100644 --- a/packages/shinken/skel/etc/init.d/shinken +++ b/packages/shinken/skel/etc/init.d/shinken @@ -347,6 +347,11 @@ do_stop() { done if [ $running -gt 0 ]; then echo "FAIL" + # stop means stop + for cpid in $(ps -aefw | grep $pid | grep "shinken-" | awk '{print $2}' | sort -g -r); do + kill -9 $cpid > /dev/null 2>&1 + #printf "." + done else echo "OK" fi From git at mathias-kettner.de Fri Apr 5 19:52:18 2013 From: git at mathias-kettner.de (git version control) Date: Fri, 05 Apr 2013 19:52:18 +0200 Subject: [omd-commits] OMD Git: omd: mk-livestatus: fixed livestatus_tcp-hook, start xinetd not when shinken is the core Message-ID: <20130405175219.083BB843339@mail.mathias-kettner.de> Module: omd Branch: master Commit: e9fab39d3c05ae3629eb2caaa991c860ddbd4c51 URL: http://omdistro.org/projects/omd/repository/revisions/e9fab39d3c05ae3629eb2caaa991c860ddbd4c51 Author: Gerhard Lausser Date: Fri Apr 5 19:38:31 2013 +0200 Commiter: Gerhard Lausser Date: Fri Apr 5 19:38:31 2013 +0200 mk-livestatus: fixed livestatus_tcp-hook, start xinetd not when shinken is the core --- packages/mk-livestatus/LIVESTATUS_TCP.hook | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/mk-livestatus/LIVESTATUS_TCP.hook b/packages/mk-livestatus/LIVESTATUS_TCP.hook index 55f2d1b..1c240b7 100755 --- a/packages/mk-livestatus/LIVESTATUS_TCP.hook +++ b/packages/mk-livestatus/LIVESTATUS_TCP.hook @@ -17,7 +17,7 @@ case "$1" in echo "off: disable" ;; set) - if [ "$2" == "on" ] + if [ "$2" == "on" -a "$CONFIG_CORE" != "shinken" ] then mkdir -p $OMD_ROOT/etc/xinetd.d ln -sfn ../mk-livestatus/xinetd.conf $OMD_ROOT/etc/xinetd.d/mk-livestatus From git at mathias-kettner.de Fri Apr 5 19:52:18 2013 From: git at mathias-kettner.de (git version control) Date: Fri, 05 Apr 2013 19:52:18 +0200 Subject: [omd-commits] OMD Git: omd: shinken: bugfix in the init-script, handle multiple mongodbs Message-ID: <20130405175219.6E22B842F85@mail.mathias-kettner.de> Module: omd Branch: master Commit: 65e7252bb77e2fc0c2473c54c31c3774a3805b91 URL: http://omdistro.org/projects/omd/repository/revisions/65e7252bb77e2fc0c2473c54c31c3774a3805b91 Author: Gerhard Lausser Date: Fri Apr 5 19:38:27 2013 +0200 Commiter: Gerhard Lausser Date: Fri Apr 5 19:38:27 2013 +0200 shinken: bugfix in the init-script, handle multiple mongodbs --- packages/shinken/skel/etc/init.d/shinken | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/packages/shinken/skel/etc/init.d/shinken b/packages/shinken/skel/etc/init.d/shinken index f9e5883..aa8f95a 100644 --- a/packages/shinken/skel/etc/init.d/shinken +++ b/packages/shinken/skel/etc/init.d/shinken @@ -78,6 +78,7 @@ NSCA=${CONFIG_NSCA:=off} NSCA_TCP_PORT=${CONFIG_NSCA_TCP_PORT:=5667} PNP4NAGIOS=${CONFIG_PNP4NAGIOS:=on} MONGODB=${CONFIG_MONGODB:=off} +MONGODB_TCP_PORT=${CONFIG_MONGODB_TCP_PORT:=27017} # # Pyro and multiprocessing have been installed locally @@ -170,6 +171,12 @@ EOTXT #fi if [ "$MONGODB" = "on" ]; then sed -ri 's/^([[:space:]]*modules[[:space:]]*)(.+)/\1mongologs/' $TARGET_ETC/shinken-specific.d/module_livestatus.cfg + sed -ri 's/^([[:space:]]*mongodb_uri[[:space:]]*)(.+)/\1mongodb:\/\/MONGODB_TCP_PORT/' $TARGET_ETC/shinken-specific.d/module_livestatus.cfg + if [ "${MONGODB_TCP_PORT##*:}" = "${MONGODB_TCP_PORT%%:*}" ]; then + sed -ri "s/MONGODB_TCP_PORT/127.0.0.1:$MONGODB_TCP_PORT/" $TARGET_ETC/shinken-specific.d/module_livestatus.cfg + else + sed -ri "s/MONGODB_TCP_PORT/$MONGODB_TCP_PORT/" $TARGET_ETC/shinken-specific.d/module_livestatus.cfg + fi else sed -ri 's/^([[:space:]]*modules[[:space:]]*)(.+)/\1sqlitelogs/' $TARGET_ETC/shinken-specific.d/module_livestatus.cfg fi From git at mathias-kettner.de Fri Apr 5 19:52:18 2013 From: git at mathias-kettner.de (git version control) Date: Fri, 05 Apr 2013 19:52:18 +0200 Subject: [omd-commits] OMD Git: omd: shinken: update mongodb to 2.4.1 Message-ID: <20130405175219.A52DE842F6D@mail.mathias-kettner.de> Module: omd Branch: master Commit: 028760b8d7c1249bea28bfca7bdb8718da0a290f URL: http://omdistro.org/projects/omd/repository/revisions/028760b8d7c1249bea28bfca7bdb8718da0a290f Author: Gerhard Lausser Date: Fri Apr 5 13:07:33 2013 +0200 Commiter: Gerhard Lausser Date: Fri Apr 5 13:07:33 2013 +0200 shinken: update mongodb to 2.4.1 --- packages/shinken/Makefile | 4 ++-- packages/shinken/mongodb-linux-i686-2.4.1.tgz | Bin 0 -> 93077588 bytes .../shinken/mongodb-linux-i686-static-2.0.3.tgz | Bin 37806658 -> 0 bytes packages/shinken/mongodb-linux-x86_64-2.4.1.tgz | Bin 0 -> 94251134 bytes .../mongodb-linux-x86_64-static-legacy-2.0.3.tgz | Bin 40437881 -> 0 bytes 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile index dba2f58..3ca88b5 100644 --- a/packages/shinken/Makefile +++ b/packages/shinken/Makefile @@ -36,9 +36,9 @@ SQLITE_FILE=$(SQLITE).tar.gz SQLITE_URL=http://pysqlite.googlecode.com/files/$(SQLITE_FILE) # # MongoDB -MONGODB=mongodb-linux-i686-static-2.0.3 +MONGODB=mongodb-linux-i686-2.4.1 ifeq ($(shell uname -m),x86_64) - MONGODB=mongodb-linux-x86_64-static-legacy-2.0.3 + MONGODB=mongodb-linux-x86_64-2.4.1 endif MONGODB_FILE=$(MONGODB).tgz MONGODB_URL=http://fastdl.mongodb.org/linux/$(MONGODB_FILE) diff --git a/packages/shinken/mongodb-linux-i686-2.4.1.tgz b/packages/shinken/mongodb-linux-i686-2.4.1.tgz new file mode 100644 index 0000000..27308fa Binary files /dev/null and b/packages/shinken/mongodb-linux-i686-2.4.1.tgz differ diff --git a/packages/shinken/mongodb-linux-i686-static-2.0.3.tgz b/packages/shinken/mongodb-linux-i686-static-2.0.3.tgz deleted file mode 100644 index 8f113e1..0000000 Binary files a/packages/shinken/mongodb-linux-i686-static-2.0.3.tgz and /dev/null differ diff --git a/packages/shinken/mongodb-linux-x86_64-2.4.1.tgz b/packages/shinken/mongodb-linux-x86_64-2.4.1.tgz new file mode 100644 index 0000000..27a505f Binary files /dev/null and b/packages/shinken/mongodb-linux-x86_64-2.4.1.tgz differ diff --git a/packages/shinken/mongodb-linux-x86_64-static-legacy-2.0.3.tgz b/packages/shinken/mongodb-linux-x86_64-static-legacy-2.0.3.tgz deleted file mode 100644 index ff22313..0000000 Binary files a/packages/shinken/mongodb-linux-x86_64-static-legacy-2.0.3.tgz and /dev/null differ From git at mathias-kettner.de Mon Apr 8 18:01:19 2013 From: git at mathias-kettner.de (git version control) Date: Mon, 08 Apr 2013 18:01:19 +0200 Subject: [omd-commits] OMD Git: omd: Check_MK: 1.2.2 Message-ID: <20130408160120.3C4CF840E6B@mail.mathias-kettner.de> Module: omd Branch: master Commit: 89cafa9598f9d9ccb3bdeca868a6304324d96fd0 URL: http://omdistro.org/projects/omd/repository/revisions/89cafa9598f9d9ccb3bdeca868a6304324d96fd0 Author: Andreas Boesl Date: Mon Apr 8 18:00:43 2013 +0200 Commiter: Andreas Boesl Date: Mon Apr 8 18:00:43 2013 +0200 Check_MK: 1.2.2 --- Changelog | 2 +- packages/check_mk/Makefile | 2 +- ...eck_mk-1.2.2b7.tar.gz => check_mk-1.2.2.tar.gz} | Bin 12435924 -> 12436336 bytes packages/check_mk/mkeventd-1.2.2.tar.gz | Bin 0 -> 88388 bytes packages/check_mk/mkeventd-1.2.2b7.tar.gz | Bin 87953 -> 0 bytes packages/check_mk/skel/etc/check_mk/defaults | 2 +- packages/mk-livestatus/Makefile | 2 +- packages/mk-livestatus/mk-livestatus-1.2.2.tar.gz | Bin 0 -> 381118 bytes .../mk-livestatus/mk-livestatus-1.2.2b7.tar.gz | Bin 381140 -> 0 bytes 9 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 32e92ff..947812c 100644 --- a/Changelog +++ b/Changelog @@ -6,7 +6,7 @@ This file documents the revision history for the Open Monitoring Distribution - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode - Check_MK/MK Livestatus: - - new version 1.2.2b7 + - new version 1.2.2 - integrated Event Console - Changed path for check manpages from share/doc/check_mk/checks to share/check_mk/checkman to match the local/ path diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile index 11b8e29..b8d06fd 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.2b7 +VERSION = 1.2.2 DIR = $(NAME)-$(VERSION) EDIR = mkeventd-$(VERSION) diff --git a/packages/check_mk/check_mk-1.2.2b7.tar.gz b/packages/check_mk/check_mk-1.2.2.tar.gz similarity index 75% rename from packages/check_mk/check_mk-1.2.2b7.tar.gz rename to packages/check_mk/check_mk-1.2.2.tar.gz index 2ce803b..9a94cae 100644 Binary files a/packages/check_mk/check_mk-1.2.2b7.tar.gz and b/packages/check_mk/check_mk-1.2.2.tar.gz differ diff --git a/packages/check_mk/mkeventd-1.2.2.tar.gz b/packages/check_mk/mkeventd-1.2.2.tar.gz new file mode 100644 index 0000000..9ae0909 Binary files /dev/null and b/packages/check_mk/mkeventd-1.2.2.tar.gz differ diff --git a/packages/check_mk/mkeventd-1.2.2b7.tar.gz b/packages/check_mk/mkeventd-1.2.2b7.tar.gz deleted file mode 100644 index c2f26aa..0000000 Binary files a/packages/check_mk/mkeventd-1.2.2b7.tar.gz and /dev/null differ diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults index 4fdda4b..2d570f5 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.2b7' +check_mk_version = '1.2.2' 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/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile index f40ee09..97688c1 100644 --- a/packages/mk-livestatus/Makefile +++ b/packages/mk-livestatus/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mk-livestatus -VERSION = 1.2.2b7 +VERSION = 1.2.2 DIR = $(NAME)-$(VERSION) CONFIGUREOPTS = \ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2.tar.gz new file mode 100644 index 0000000..6775d6b Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.2.tar.gz differ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2b7.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2b7.tar.gz deleted file mode 100644 index 693dd1d..0000000 Binary files a/packages/mk-livestatus/mk-livestatus-1.2.2b7.tar.gz and /dev/null differ From git at mathias-kettner.de Tue Apr 9 18:17:09 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 09 Apr 2013 18:17:09 +0200 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.7.8.1 Message-ID: <20130409161709.9211784099B@mail.mathias-kettner.de> Module: omd Branch: master Commit: 60c2c5ff40d751917b408f8411d896a74cf9e266 URL: http://omdistro.org/projects/omd/repository/revisions/60c2c5ff40d751917b408f8411d896a74cf9e266 Author: Gerhard Lausser Date: Tue Apr 9 18:15:09 2013 +0200 Commiter: Gerhard Lausser Date: Tue Apr 9 18:15:09 2013 +0200 check_oracle_health: update to 1.7.8.1 --- packages/check_oracle_health/Makefile | 2 +- .../check_oracle_health-1.7.7.3.tar.gz | Bin 143798 -> 0 bytes .../check_oracle_health-1.7.8.1.tar.gz | Bin 0 -> 143955 bytes 3 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index 520adfb..2fe13a4 100644 --- a/packages/check_oracle_health/Makefile +++ b/packages/check_oracle_health/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_oracle_health -VERSION = 1.7.7.3 +VERSION = 1.7.8.1 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.7.7.3.tar.gz b/packages/check_oracle_health/check_oracle_health-1.7.7.3.tar.gz deleted file mode 100644 index 3d1143c..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.7.7.3.tar.gz and /dev/null differ diff --git a/packages/check_oracle_health/check_oracle_health-1.7.8.1.tar.gz b/packages/check_oracle_health/check_oracle_health-1.7.8.1.tar.gz new file mode 100644 index 0000000..e760da2 Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.7.8.1.tar.gz differ From git at mathias-kettner.de Tue Apr 9 23:16:32 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 09 Apr 2013 23:16:32 +0200 Subject: [omd-commits] OMD Git: omd: Thruk: Update to 1.68 Message-ID: <20130409211633.2200E843631@mail.mathias-kettner.de> Module: omd Branch: master Commit: fbf43761a3f76314dc8411496c60e22457b003b8 URL: http://omdistro.org/projects/omd/repository/revisions/fbf43761a3f76314dc8411496c60e22457b003b8 Author: Sven Nierlein Date: Tue Apr 9 23:15:47 2013 +0200 Commiter: Sven Nierlein Date: Tue Apr 9 23:16:20 2013 +0200 Thruk: Update to 1.68 --- Changelog | 2 +- packages/thruk/Makefile | 2 +- .../thruk/{Thruk-1.66.tar.gz => Thruk-1.68.tar.gz} | Bin 7337919 -> 7365428 bytes t/20-package_thruk.t | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 947812c..805e58b 100644 --- a/Changelog +++ b/Changelog @@ -2,7 +2,7 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: - Icinga: Update to 1.8.4 - - Thruk: Update to 1.66-2 + - Thruk: Update to 1.68 - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode - Check_MK/MK Livestatus: diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile index bfdfadf..6b0683e 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.66 +VERSION = 1.68 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/Thruk-1.66.tar.gz b/packages/thruk/Thruk-1.68.tar.gz similarity index 50% rename from packages/thruk/Thruk-1.66.tar.gz rename to packages/thruk/Thruk-1.68.tar.gz index 7e8e930..d6a7001 100644 Binary files a/packages/thruk/Thruk-1.66.tar.gz and b/packages/thruk/Thruk-1.68.tar.gz differ diff --git a/t/20-package_thruk.t b/t/20-package_thruk.t index f70a1bc..6a69705 100644 --- a/t/20-package_thruk.t +++ b/t/20-package_thruk.t @@ -167,8 +167,8 @@ my $urls = [ { url => '/thruk/cgi-bin/reports2.cgi?action=remove&report=9999', like => '/report removed/' }, # recurring downtimes - { url => '/thruk/cgi-bin/extinfo.cgi?type=6&recurring=save&old_host=&host='.$host.'&comment=automatic+downtime&send_type_1=month&send_day_1=1&week_day_1=&send_hour_1=0&send_minute_1=0&duration=120&childoptions=0', like => '/recurring downtime saved/' }, - { url => '/thruk/cgi-bin/extinfo.cgi?type=6&recurring=remove&host='.$host, like => '/recurring downtime removed/' }, + { url => '/thruk/cgi-bin/extinfo.cgi?type=6&recurring=save&old_host=&host='.$host.'&comment=automatic+downtime&send_type_1=month&send_day_1=1&week_day_1=&send_hour_1=0&send_minute_1=0&duration=120&childoptions=0&nr=999', like => '/recurring downtime saved/' }, + { url => '/thruk/cgi-bin/extinfo.cgi?type=6&recurring=remove&nr=999&host='.$host, like => '/recurring downtime removed/' }, ]; # complete the url From git at mathias-kettner.de Mon Apr 15 14:59:51 2013 From: git at mathias-kettner.de (git version control) Date: Mon, 15 Apr 2013 14:59:51 +0200 Subject: [omd-commits] OMD Git: omd: omd: update: Ensure execution of the target versions hooks Message-ID: <20130415125951.6EC3582D45@mail.mathias-kettner.de> Module: omd Branch: master Commit: c249412699a209e89a686dc78d5129727c51d92c URL: http://omdistro.org/projects/omd/repository/revisions/c249412699a209e89a686dc78d5129727c51d92c Author: Lars Michelsen Date: Mon Apr 15 14:59:49 2013 +0200 Commiter: Lars Michelsen Date: Mon Apr 15 14:59:49 2013 +0200 omd: update: Ensure execution of the target versions hooks --- Changelog | 6 ++++-- packages/omd/omd | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Changelog b/Changelog index 805e58b..c8f7743 100644 --- a/Changelog +++ b/Changelog @@ -11,8 +11,10 @@ This file documents the revision history for the Open Monitoring Distribution - Changed path for check manpages from share/doc/check_mk/checks to share/check_mk/checkman to match the local/ path - NagVis: Update to 1.7.7 - - omd: new option --no-autostart, -A for omd create (set AUTOSTART - to off right at creation, useful for test sites!) + - omd: + - new option --no-autostart, -A for omd create (set AUTOSTART + to off right at creation, useful for test sites!) + - update: Ensure execution of the target versions hooks - PNP4Nagios: Updated to version 0.6.21 - Added INIT hooks to npcd and pnp_gearman_worker scripts - Support Ubuntu 12.10 (Quantal) diff --git a/packages/omd/omd b/packages/omd/omd index 34e8ada..1b54ca2 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -1689,10 +1689,9 @@ def load_hook_dependencies(): hook["active"] = False else: hook["active"] = True - -def refresh_hooks(): - config_load_hooks() +def refresh_hooks(force_reload = False): + config_load_hooks(force_reload) config_set_all() # execute 'set' functions with current values call_all_hooks("refresh") config_save() @@ -2696,7 +2695,9 @@ def main_update(args, options={}): create_version_symlink(g_sitename, to_version) # Let hooks do their work and update configuration - refresh_hooks() + # Ensure the hooks are reloaded prior to execution to be sure + # the hooks of the target version are executed + refresh_hooks(True) def main_umount(args, options = {}): global g_sitename From git at mathias-kettner.de Mon Apr 15 16:25:05 2013 From: git at mathias-kettner.de (git version control) Date: Mon, 15 Apr 2013 16:25:05 +0200 Subject: [omd-commits] OMD Git: omd: omd update: Added update log ~/var/log/update.log Message-ID: <20130415142505.4506982CCE@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7fa34fc8b8d46e9be6c87faa96a943226e9b6084 URL: http://omdistro.org/projects/omd/repository/revisions/7fa34fc8b8d46e9be6c87faa96a943226e9b6084 Author: Lars Michelsen Date: Mon Apr 15 16:25:02 2013 +0200 Commiter: Lars Michelsen Date: Mon Apr 15 16:25:02 2013 +0200 omd update: Added update log ~/var/log/update.log --- Changelog | 1 + packages/omd/omd | 53 ++++++++++++++++++++++++++++-- packages/omd/skel/etc/logrotate.d/update | 7 ++++ 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index c8f7743..cd1f0bb 100644 --- a/Changelog +++ b/Changelog @@ -15,6 +15,7 @@ This file documents the revision history for the Open Monitoring Distribution - new option --no-autostart, -A for omd create (set AUTOSTART to off right at creation, useful for test sites!) - update: Ensure execution of the target versions hooks + - update: Added update log ~/var/log/update.log - PNP4Nagios: Updated to version 0.6.21 - Added INIT hooks to npcd and pnp_gearman_worker scripts - Support Ubuntu 12.10 (Quantal) diff --git a/packages/omd/omd b/packages/omd/omd index 1b54ca2..2df19b7 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -90,6 +90,50 @@ opt_force = False g_hooks = None +# Is used to duplicate output from stdout/stderr to a logfiles. This +# is e.g. used during "omd update" to have a chance to analyze errors +# during past updates +class Log(object): + def __init__(self, fd, logfile): + self.log = open(logfile, 'a') + self.fd = fd + + if self.fd == 1: + self.orig = sys.stdout + sys.stdout = self + else: + self.orig = sys.stderr + sys.stderr = self + + self.color_replace = re.compile("\033\[\d{1,2}m", re.UNICODE) + + def __del__(self): + if self.fd == 1: + sys.stdout = self.orig + else: + sys.stderr = self.orig + self.log.close() + + def write(self, data): + self.orig.write(data) + self.log.write(self.color_replace.sub('', data)) + + def flush(self): + self.log.flush() + self.orig.flush() + +g_stdout_log = None +g_stderr_log = None +def start_logging(logfile): + global g_stdout_log, g_stderr_log + g_stdout_log = Log(1, logfile) + g_stderr_log = Log(2, logfile) + +def stop_logging(): + global g_stdout_log, g_stderr_log + g_stdout_log = None + g_stderr_log = None + def show_success(exit_code): if exit_code == True or exit_code == 0: ok() @@ -2666,8 +2710,10 @@ def main_update(args, options={}): "Update!", "Abort"): bail_out("Aborted.") - sys.stdout.write("Updating site '%s' from version %s to %s...\n\n" % - (g_sitename, from_version, to_version)) + start_logging(g_sitedir + '/var/log/update.log') + + sys.stdout.write("%s - Updating site '%s' from version %s to %s...\n\n" % + (time.strftime('%Y-%m-%d %H:%M:%S'), g_sitename, from_version, to_version)) # Now apply changes of skeleton files. This can be done # in two ways: @@ -2699,6 +2745,9 @@ def main_update(args, options={}): # the hooks of the target version are executed refresh_hooks(True) + sys.stdout.write('Finished update.\n\n') + stop_logging() + def main_umount(args, options = {}): global g_sitename global g_sitedir diff --git a/packages/omd/skel/etc/logrotate.d/update b/packages/omd/skel/etc/logrotate.d/update new file mode 100644 index 0000000..f761877 --- /dev/null +++ b/packages/omd/skel/etc/logrotate.d/update @@ -0,0 +1,7 @@ +###ROOT###/var/log/update.log { + missingok + rotate 7 + compress + delaycompress + create 640 ###SITE### ###SITE### +} From git at mathias-kettner.de Tue Apr 16 11:02:50 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 16 Apr 2013 11:02:50 +0200 Subject: [omd-commits] OMD Git: omd: New Makefile.UBUNTU_13.04 Message-ID: <20130416090250.5FEA58315A@mail.mathias-kettner.de> Module: omd Branch: master Commit: 764a98a62bb9c7d70c79f40d2cb81ec41c38d390 URL: http://omdistro.org/projects/omd/repository/revisions/764a98a62bb9c7d70c79f40d2cb81ec41c38d390 Author: Andreas Boesl Date: Tue Apr 16 11:02:47 2013 +0200 Commiter: Andreas Boesl Date: Tue Apr 16 11:02:47 2013 +0200 New Makefile.UBUNTU_13.04 --- Changelog | 1 + distros/Makefile.UBUNTU_13.04 | 86 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/Changelog b/Changelog index cd1f0bb..a46ab18 100644 --- a/Changelog +++ b/Changelog @@ -19,6 +19,7 @@ This file documents the revision history for the Open Monitoring Distribution - PNP4Nagios: Updated to version 0.6.21 - Added INIT hooks to npcd and pnp_gearman_worker scripts - Support Ubuntu 12.10 (Quantal) + - Support Ubuntu 13.04 (Raising) - Webinject: Update to 1.76 - NRPE: Update to 2.13 - check_multi: updated to 0.26_581 diff --git a/distros/Makefile.UBUNTU_13.04 b/distros/Makefile.UBUNTU_13.04 new file mode 100644 index 0000000..976cbac --- /dev/null +++ b/distros/Makefile.UBUNTU_13.04 @@ -0,0 +1,86 @@ +DISTRO_CODE = quantal +BUILD_PACKAGES = +BUILD_PACKAGES += build-essential +BUILD_PACKAGES += dpatch +BUILD_PACKAGES += dnsutils +BUILD_PACKAGES += fping +BUILD_PACKAGES += git-buildpackage +BUILD_PACKAGES += libboost-all-dev +BUILD_PACKAGES += libcloog-ppl0 +BUILD_PACKAGES += libcairo2-dev +BUILD_PACKAGES += libcurl4-openssl-dev # needed by perl modules / thruk +BUILD_PACKAGES += libevent-dev +BUILD_PACKAGES += libgd2-xpm-dev +BUILD_PACKAGES += libglib2.0-dev +BUILD_PACKAGES += libgnutls-dev +BUILD_PACKAGES += libldap2-dev +BUILD_PACKAGES += libltdl-dev +BUILD_PACKAGES += libmcrypt-dev +BUILD_PACKAGES += libmysqlclient15-dev +BUILD_PACKAGES += libpango1.0-dev +BUILD_PACKAGES += libperl-dev +BUILD_PACKAGES += libreadline-dev +BUILD_PACKAGES += libssl-dev +BUILD_PACKAGES += libxml2-dev +BUILD_PACKAGES += patch +BUILD_PACKAGES += python-dev +BUILD_PACKAGES += python-setuptools +BUILD_PACKAGES += uuid-dev +BUILD_PACKAGES += snmp +BUILD_PACKAGES += apache2-threaded-dev # compiling mod_python +BUILD_PACKAGES += apache2 # compiling mod_python +BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman +OS_PACKAGES = +OS_PACKAGES += curl +OS_PACKAGES += dialog +OS_PACKAGES += dnsutils +OS_PACKAGES += fping +OS_PACKAGES += graphviz +OS_PACKAGES += libapache2-mod-fcgid +OS_PACKAGES += libapache2-mod-proxy-html +OS_PACKAGES += libboost-program-options1.49.0 +OS_PACKAGES += libdbi1 +OS_PACKAGES += libevent-1.4-2 +OS_PACKAGES += libgd2-xpm +OS_PACKAGES += libltdl7 +OS_PACKAGES += libnet-snmp-perl +OS_PACKAGES += libpango1.0-0 +OS_PACKAGES += libperl5.14 +OS_PACKAGES += libreadline5 +OS_PACKAGES += libsnmp-perl +OS_PACKAGES += libuuid1 +OS_PACKAGES += libxml2 +OS_PACKAGES += mysql-server +OS_PACKAGES += patch +OS_PACKAGES += php5-cli +OS_PACKAGES += php5-cgi +OS_PACKAGES += php5-gd +OS_PACKAGES += php5-mcrypt +OS_PACKAGES += php5-sqlite +OS_PACKAGES += php-pear +OS_PACKAGES += pyro +OS_PACKAGES += rsync +OS_PACKAGES += smbclient +OS_PACKAGES += snmp +OS_PACKAGES += unzip +OS_PACKAGES += xinetd +OS_PACKAGES += xvfb # used for thruks pdf generator +OS_PACKAGES += python-ldap # needed for ldap support in multisite +USERADD_OPTIONS = +ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s +PACKAGE_INSTALL = aptitude -y update ; aptitude -y install +ACTIVATE_INITSCRIPT = update-rc.d %s defaults +APACHE_CONF_DIR = /etc/apache2/conf.d +APACHE_INIT = /etc/init.d/apache2 +APACHE_USER = www-data +APACHE_GROUP = www-data +APACHE_BIN = /usr/sbin/apache2 +APACHE_CTL = /usr/sbin/apache2ctl +APACHE_MODULE_DIR = /usr/lib/apache2/modules +APACHE_MODULE_DIR_64 = /usr/lib/apache2/modules +APACHE_FCGID_MODULE = mod_fcgid.so +APACHE_ENMOD = a2enmod %s +PHP_FCGI_BIN = /usr/bin/php5-cgi +BECOME_ROOT = sudo su -c +ARCH = $(shell dpkg --print-architecture) +MOUNT_OPTIONS = From git at mathias-kettner.de Tue Apr 16 14:08:07 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 16 Apr 2013 14:08:07 +0200 Subject: [omd-commits] OMD Git: omd: Updated to jmx4perl 1.07 and Jolokia 1.1.1 Message-ID: <20130416120807.BEFB1830C5@mail.mathias-kettner.de> Module: omd Branch: master Commit: d9db60acd032f9ca5dd612e131fd25fdf4cba9bc URL: http://omdistro.org/projects/omd/repository/revisions/d9db60acd032f9ca5dd612e131fd25fdf4cba9bc Author: roland Date: Tue Apr 16 14:05:42 2013 +0200 Commiter: roland Date: Tue Apr 16 14:05:42 2013 +0200 Updated to jmx4perl 1.07 and Jolokia 1.1.1 --- packages/jmx4perl/Makefile | 4 ++-- packages/jmx4perl/jmx4perl-1.07.tar.gz | Bin 0 -> 351986 bytes packages/jmx4perl/jolokia-agents/1.1.1/jolokia-jvm.jar | Bin 0 -> 329969 bytes packages/jmx4perl/jolokia-agents/1.1.1/jolokia-mule.jar | Bin 0 -> 280650 bytes packages/jmx4perl/jolokia-agents/1.1.1/jolokia-osgi-bundle.jar | Bin 0 -> 1271124 bytes packages/jmx4perl/jolokia-agents/1.1.1/jolokia-osgi.jar | Bin 0 -> 308598 bytes packages/jmx4perl/jolokia-agents/1.1.1/jolokia.war | Bin 0 -> 256357 bytes packages/perl-modules/Makefile | 1 + packages/perl-modules/src/Sys-SigAction-0.15.tar.gz | Bin 0 -> 19264 bytes 9 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/jmx4perl/Makefile b/packages/jmx4perl/Makefile index 8bcc757..9b310c9 100644 --- a/packages/jmx4perl/Makefile +++ b/packages/jmx4perl/Makefile @@ -1,8 +1,8 @@ include ../../Makefile.omd NAME = jmx4perl -VERSION = 1.06 -JOLOKIA_VERSION = 1.0.5 +VERSION = 1.07 +JOLOKIA_VERSION = 1.1.1 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/jmx4perl/jmx4perl-1.07.tar.gz b/packages/jmx4perl/jmx4perl-1.07.tar.gz new file mode 100644 index 0000000..22e32aa Binary files /dev/null and b/packages/jmx4perl/jmx4perl-1.07.tar.gz differ diff --git a/packages/jmx4perl/jolokia-agents/1.1.1/jolokia-jvm.jar b/packages/jmx4perl/jolokia-agents/1.1.1/jolokia-jvm.jar new file mode 100644 index 0000000..6323e48 Binary files /dev/null and b/packages/jmx4perl/jolokia-agents/1.1.1/jolokia-jvm.jar differ diff --git a/packages/jmx4perl/jolokia-agents/1.1.1/jolokia-mule.jar b/packages/jmx4perl/jolokia-agents/1.1.1/jolokia-mule.jar new file mode 100644 index 0000000..63f7f98 Binary files /dev/null and b/packages/jmx4perl/jolokia-agents/1.1.1/jolokia-mule.jar differ diff --git a/packages/jmx4perl/jolokia-agents/1.1.1/jolokia-osgi-bundle.jar b/packages/jmx4perl/jolokia-agents/1.1.1/jolokia-osgi-bundle.jar new file mode 100644 index 0000000..57f74a9 Binary files /dev/null and b/packages/jmx4perl/jolokia-agents/1.1.1/jolokia-osgi-bundle.jar differ diff --git a/packages/jmx4perl/jolokia-agents/1.1.1/jolokia-osgi.jar b/packages/jmx4perl/jolokia-agents/1.1.1/jolokia-osgi.jar new file mode 100644 index 0000000..191458d Binary files /dev/null and b/packages/jmx4perl/jolokia-agents/1.1.1/jolokia-osgi.jar differ diff --git a/packages/jmx4perl/jolokia-agents/1.1.1/jolokia.war b/packages/jmx4perl/jolokia-agents/1.1.1/jolokia.war new file mode 100644 index 0000000..9c765da Binary files /dev/null and b/packages/jmx4perl/jolokia-agents/1.1.1/jolokia.war differ diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile index fdce58c..e1d5eed 100644 --- a/packages/perl-modules/Makefile +++ b/packages/perl-modules/Makefile @@ -115,6 +115,7 @@ MODULES = \ Sub-Install-0.926.tar.gz \ Sub-Name-0.05.tar.gz \ Sys-Syslog-0.32.tar.gz \ + Sys-SigAction-0.15.tar.gz \ Task-Weaken-1.04.tar.gz \ Template-Toolkit-2.24.tar.gz \ Term-ReadLine-Gnu-1.20.tar.gz \ diff --git a/packages/perl-modules/src/Sys-SigAction-0.15.tar.gz b/packages/perl-modules/src/Sys-SigAction-0.15.tar.gz new file mode 100644 index 0000000..042a982 Binary files /dev/null and b/packages/perl-modules/src/Sys-SigAction-0.15.tar.gz differ From git at mathias-kettner.de Tue Apr 16 14:08:07 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 16 Apr 2013 14:08:07 +0200 Subject: [omd-commits] OMD Git: omd: Removed old jmx4perl packages. Message-ID: <20130416120807.D7BE6830C4@mail.mathias-kettner.de> Module: omd Branch: master Commit: fc45304601fff662a36cd9dff85f33691c8cbd71 URL: http://omdistro.org/projects/omd/repository/revisions/fc45304601fff662a36cd9dff85f33691c8cbd71 Author: roland Date: Tue Apr 16 14:06:29 2013 +0200 Commiter: roland Date: Tue Apr 16 14:06:29 2013 +0200 Removed old jmx4perl packages. --- packages/jmx4perl/jmx4perl-1.06.tar.gz | Bin 347520 -> 0 bytes packages/jmx4perl/jolokia-agents/1.0.5/jolokia-jvm6.jar | Bin 301486 -> 0 bytes packages/jmx4perl/jolokia-agents/1.0.5/jolokia-mule.jar | Bin 254841 -> 0 bytes packages/jmx4perl/jolokia-agents/1.0.5/jolokia-osgi-bundle.jar | Bin 1243251 -> 0 bytes packages/jmx4perl/jolokia-agents/1.0.5/jolokia-osgi.jar | Bin 281082 -> 0 bytes packages/jmx4perl/jolokia-agents/1.0.5/jolokia.war | Bin 232057 -> 0 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/jmx4perl/jmx4perl-1.06.tar.gz b/packages/jmx4perl/jmx4perl-1.06.tar.gz deleted file mode 100644 index 8a227b0..0000000 Binary files a/packages/jmx4perl/jmx4perl-1.06.tar.gz and /dev/null differ diff --git a/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-jvm6.jar b/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-jvm6.jar deleted file mode 100644 index 7a0e192..0000000 Binary files a/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-jvm6.jar and /dev/null differ diff --git a/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-mule.jar b/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-mule.jar deleted file mode 100644 index 747fd60..0000000 Binary files a/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-mule.jar and /dev/null differ diff --git a/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-osgi-bundle.jar b/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-osgi-bundle.jar deleted file mode 100644 index 6b4dd76..0000000 Binary files a/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-osgi-bundle.jar and /dev/null differ diff --git a/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-osgi.jar b/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-osgi.jar deleted file mode 100644 index c224739..0000000 Binary files a/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-osgi.jar and /dev/null differ diff --git a/packages/jmx4perl/jolokia-agents/1.0.5/jolokia.war b/packages/jmx4perl/jolokia-agents/1.0.5/jolokia.war deleted file mode 100644 index 946787c..0000000 Binary files a/packages/jmx4perl/jolokia-agents/1.0.5/jolokia.war and /dev/null differ From git at mathias-kettner.de Tue Apr 16 14:22:55 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 16 Apr 2013 14:22:55 +0200 Subject: [omd-commits] OMD Git: omd: Updated changelog for new jmx4perl version Message-ID: <20130416122255.8E90982F79@mail.mathias-kettner.de> Module: omd Branch: master Commit: 9c8ddfe94243e4a822de556880c455e9a217bb72 URL: http://omdistro.org/projects/omd/repository/revisions/9c8ddfe94243e4a822de556880c455e9a217bb72 Author: Roland Huss Date: Tue Apr 16 14:22:37 2013 +0200 Commiter: Roland Huss Date: Tue Apr 16 14:22:37 2013 +0200 Updated changelog for new jmx4perl version --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index a46ab18..a4fbf03 100644 --- a/Changelog +++ b/Changelog @@ -31,6 +31,8 @@ This file documents the revision history for the Open Monitoring Distribution - nagios: Changed init script to kill still running processes during "stop" call after 60 seconds waiting - Added python module pysphere to make ESX monitoring easier + - Jmx4Perl: Update to 1.07 (Jolokia: 1.1.1) + 0.56 Sep 25 2012 - omd: From git at mathias-kettner.de Tue Apr 16 14:25:59 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 16 Apr 2013 14:25:59 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of ssh://mathias-kettner.de/omd Message-ID: <20130416122559.DC22982F88@mail.mathias-kettner.de> Module: omd Branch: master Commit: 465d703f4a111d0c52b85be3dda639499349f4fd URL: http://omdistro.org/projects/omd/repository/revisions/465d703f4a111d0c52b85be3dda639499349f4fd Author: Mathias Kettner Date: Tue Apr 16 14:25:53 2013 +0200 Commiter: Mathias Kettner Date: Tue Apr 16 14:25:53 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/omd --- From git at mathias-kettner.de Tue Apr 16 14:25:59 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 16 Apr 2013 14:25:59 +0200 Subject: [omd-commits] OMD Git: omd: Fix compile problem on ARM in nrpe (thanks to Holger Oettel) Message-ID: <20130416122559.ED27E82F87@mail.mathias-kettner.de> Module: omd Branch: master Commit: 095280c3e3fdcc2ac9ca8b7a964b9e3b67dfeba2 URL: http://omdistro.org/projects/omd/repository/revisions/095280c3e3fdcc2ac9ca8b7a964b9e3b67dfeba2 Author: Mathias Kettner Date: Tue Apr 16 14:24:51 2013 +0200 Commiter: Mathias Kettner Date: Tue Apr 16 14:24:51 2013 +0200 Fix compile problem on ARM in nrpe (thanks to Holger Oettel) --- .../nrpe/patches/0001-fix-ssl-libraries-not-found-on-oneiric.dif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nrpe/patches/0001-fix-ssl-libraries-not-found-on-oneiric.dif b/packages/nrpe/patches/0001-fix-ssl-libraries-not-found-on-oneiric.dif index c7dca2d..d404cb6 100644 --- a/packages/nrpe/patches/0001-fix-ssl-libraries-not-found-on-oneiric.dif +++ b/packages/nrpe/patches/0001-fix-ssl-libraries-not-found-on-oneiric.dif @@ -5,7 +5,7 @@ echo $ECHO_N "checking for SSL libraries... $ECHO_C" >&6 found_ssl=no - for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl; do -+ for dir in $ssl_lib_dir $ssl_dir /usr/lib/*-linux-gnu /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl; do ++ for dir in $ssl_lib_dir $ssl_dir /usr/lib/*-linux-gnu* /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl; do ssllibdir="$dir" if test -f "$dir/libssl.so"; then found_ssl=yes From git at mathias-kettner.de Tue Apr 16 14:37:16 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 16 Apr 2013 14:37:16 +0200 Subject: [omd-commits] OMD Git: omd: Added traceroute to OS_PACKAGES Message-ID: <20130416123716.F3F6C830D0@mail.mathias-kettner.de> Module: omd Branch: master Commit: 5230c79d309b11df372cac150356e2cc8a104520 URL: http://omdistro.org/projects/omd/repository/revisions/5230c79d309b11df372cac150356e2cc8a104520 Author: Mathias Kettner Date: Tue Apr 16 14:37:14 2013 +0200 Commiter: Mathias Kettner Date: Tue Apr 16 14:37:14 2013 +0200 Added traceroute to OS_PACKAGES Sorry for this new dependency, but traceroute is needed for Check_MK parent scan and is just a small package, anyway. --- distros/Makefile.CENTOS_5.4 | 1 + distros/Makefile.CENTOS_5.5 | 1 + distros/Makefile.CENTOS_5.6 | 1 + distros/Makefile.CENTOS_5.7 | 1 + distros/Makefile.CENTOS_5.8 | 1 + distros/Makefile.CENTOS_5.9 | 1 + distros/Makefile.CENTOS_6.0 | 1 + distros/Makefile.CENTOS_6.1 | 1 + distros/Makefile.CENTOS_6.2 | 1 + distros/Makefile.CENTOS_6.3 | 1 + distros/Makefile.CENTOS_6.4 | 1 + distros/Makefile.DEBIAN_5.0 | 1 + distros/Makefile.DEBIAN_6.0 | 1 + distros/Makefile.DEBIAN_7.0 | 1 + distros/Makefile.OPENSUSE_12.1 | 1 + distros/Makefile.REDHAT_6.0 | 1 + distros/Makefile.REDHAT_6.1 | 1 + distros/Makefile.REDHAT_6.3 | 1 + distros/Makefile.REDHAT_6.4 | 1 + distros/Makefile.SLES_11 | 1 + distros/Makefile.SLES_11SP1 | 1 + distros/Makefile.SLES_11SP2 | 1 + distros/Makefile.UBUNTU_10.04 | 1 + distros/Makefile.UBUNTU_10.10 | 1 + distros/Makefile.UBUNTU_11.04 | 1 + distros/Makefile.UBUNTU_11.10 | 1 + distros/Makefile.UBUNTU_12.04 | 1 + distros/Makefile.UBUNTU_12.10 | 1 + distros/Makefile.UBUNTU_13.04 | 1 + 29 files changed, 29 insertions(+) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=5230c79d309b11df372cac150356e2cc8a104520 From git at mathias-kettner.de Wed Apr 17 13:39:33 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 17 Apr 2013 13:39:33 +0200 Subject: [omd-commits] OMD Git: omd: livestatus: installing livestatus python api module now Message-ID: <20130417113933.1EA4080D9F@mail.mathias-kettner.de> Module: omd Branch: master Commit: 08fb99a5ca6950d926824a4c126a8ec5488e87d5 URL: http://omdistro.org/projects/omd/repository/revisions/08fb99a5ca6950d926824a4c126a8ec5488e87d5 Author: Lars Michelsen Date: Wed Apr 17 13:39:09 2013 +0200 Commiter: Lars Michelsen Date: Wed Apr 17 13:39:09 2013 +0200 livestatus: installing livestatus python api module now --- Changelog | 1 + packages/mk-livestatus/Makefile | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Changelog b/Changelog index cd1f0bb..9caec9d 100644 --- a/Changelog +++ b/Changelog @@ -10,6 +10,7 @@ This file documents the revision history for the Open Monitoring Distribution - integrated Event Console - Changed path for check manpages from share/doc/check_mk/checks to share/check_mk/checkman to match the local/ path + - Installing livestatus python API module now - NagVis: Update to 1.7.7 - omd: - new option --no-autostart, -A for omd create (set AUTOSTART diff --git a/packages/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile index 97688c1..3fea395 100644 --- a/packages/mk-livestatus/Makefile +++ b/packages/mk-livestatus/Makefile @@ -16,6 +16,8 @@ install: $(MAKE) DESTDIR=$(DESTDIR) -C $(DIR) install mkdir -p $(DESTDIR)$(OMD_ROOT)/bin install -m 755 lq $(DESTDIR)$(OMD_ROOT)/bin + mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python + install -m 644 $(DIR)/api/python/livestatus.py $(DESTDIR)$(OMD_ROOT)/lib/python skel: From git at mathias-kettner.de Wed Apr 17 13:39:33 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 17 Apr 2013 13:39:33 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20130417113933.2DC5E80502@mail.mathias-kettner.de> Module: omd Branch: master Commit: ce919d89922ffc8eb71498e3298e2f82e7c09281 URL: http://omdistro.org/projects/omd/repository/revisions/ce919d89922ffc8eb71498e3298e2f82e7c09281 Author: Lars Michelsen Date: Wed Apr 17 13:39:17 2013 +0200 Commiter: Lars Michelsen Date: Wed Apr 17 13:39:17 2013 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Wed Apr 17 15:00:43 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 17 Apr 2013 15:00:43 +0200 Subject: [omd-commits] OMD Git: omd: New hook MULTISITE_AUTHORISATION Message-ID: <20130417130043.127B182FB4@mail.mathias-kettner.de> Module: omd Branch: master Commit: af978e0dc56b011587e29559ce999963d96c7a1c URL: http://omdistro.org/projects/omd/repository/revisions/af978e0dc56b011587e29559ce999963d96c7a1c Author: Lars Michelsen Date: Wed Apr 17 15:00:19 2013 +0200 Commiter: Lars Michelsen Date: Wed Apr 17 15:00:19 2013 +0200 New hook MULTISITE_AUTHORISATION Added config hook MULTISITE_AUTHORISATION to control some user permissions in NagVis and pnp4nagios via multisite permissions --- Changelog | 2 + packages/check_mk/MULTISITE_AUTHORISATION.hook | 54 ++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/Changelog b/Changelog index e839876..d5d65a5 100644 --- a/Changelog +++ b/Changelog @@ -11,6 +11,8 @@ This file documents the revision history for the Open Monitoring Distribution - Changed path for check manpages from share/doc/check_mk/checks to share/check_mk/checkman to match the local/ path - Installing livestatus python API module now + - Added config hook MULTISITE_AUTHORISATION to control some user + permissions in NagVis and pnp4nagios via multisite permissions - NagVis: Update to 1.7.7 - omd: - new option --no-autostart, -A for omd create (set AUTOSTART diff --git a/packages/check_mk/MULTISITE_AUTHORISATION.hook b/packages/check_mk/MULTISITE_AUTHORISATION.hook new file mode 100644 index 0000000..a199218 --- /dev/null +++ b/packages/check_mk/MULTISITE_AUTHORISATION.hook @@ -0,0 +1,54 @@ +#!/bin/bash + +# Alias: Control permissions in addons with Multisite +# Menu: Web GUI +# Description: +# Multisite can be used to manage the permissions of +# the users in the addons e.g. if a user can edit NagVis +# maps. + +case "$1" in + default) + echo "off" + ;; + choices) + echo "on: control user permissions" + echo "off: disable permission control" + ;; + set) + NAGVIS_CFG=${OMD_ROOT}/etc/nagvis/conf.d/authorisation.ini.php + PNP_CFG=${OMD_ROOT}/etc/pnp4nagios/config.d/authorisation.php + if [ "$2" == "on" ]; then + cat > $NAGVIS_CFG < $PNP_CFG < +EOF + else + [ -f $NAGVIS_CFG ] && rm $NAGVIS_CFG + [ -f $PNP_CFG ] && rm $PNP_CFG + fi + ;; +esac From git at mathias-kettner.de Wed Apr 17 15:08:53 2013 From: git at mathias-kettner.de (git version control) Date: Wed, 17 Apr 2013 15:08:53 +0200 Subject: [omd-commits] OMD Git: omd: Fixed permissions Message-ID: <20130417130853.17E09830B4@mail.mathias-kettner.de> Module: omd Branch: master Commit: fa04a5514956820d0308a8fa761f55998cdd68f0 URL: http://omdistro.org/projects/omd/repository/revisions/fa04a5514956820d0308a8fa761f55998cdd68f0 Author: Lars Michelsen Date: Wed Apr 17 15:08:50 2013 +0200 Commiter: Lars Michelsen Date: Wed Apr 17 15:08:50 2013 +0200 Fixed permissions --- 0 files changed diff --git a/packages/check_mk/MULTISITE_AUTHORISATION.hook b/packages/check_mk/MULTISITE_AUTHORISATION.hook old mode 100644 new mode 100755 From git at mathias-kettner.de Fri Apr 19 17:25:49 2013 From: git at mathias-kettner.de (git version control) Date: Fri, 19 Apr 2013 17:25:49 +0200 Subject: [omd-commits] OMD Git: omd: perl: update net::http module Message-ID: <20130419152549.D946082FAD@mail.mathias-kettner.de> Module: omd Branch: master Commit: edc544ab306b64348ddd79fa5738398c3acc9586 URL: http://omdistro.org/projects/omd/repository/revisions/edc544ab306b64348ddd79fa5738398c3acc9586 Author: Sven Nierlein Date: Fri Apr 19 16:56:40 2013 +0200 Commiter: Sven Nierlein Date: Fri Apr 19 16:56:40 2013 +0200 perl: update net::http module --- packages/perl-modules/Makefile | 2 +- packages/perl-modules/src/Net-HTTP-6.05.tar.gz | Bin 15532 -> 0 bytes packages/perl-modules/src/Net-HTTP-6.06.tar.gz | Bin 0 -> 15609 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile index e1d5eed..ae56c0f 100644 --- a/packages/perl-modules/Makefile +++ b/packages/perl-modules/Makefile @@ -85,7 +85,7 @@ MODULES = \ Module-Load-0.22.tar.gz \ Monitoring-Availability-0.42.tar.gz \ NEXT-0.65.tar.gz \ - Net-HTTP-6.05.tar.gz \ + Net-HTTP-6.06.tar.gz \ Net-Server-2.007.tar.gz \ OLE-Storage_Lite-0.19.tar.gz \ PAR-Dist-0.49.tar.gz \ diff --git a/packages/perl-modules/src/Net-HTTP-6.05.tar.gz b/packages/perl-modules/src/Net-HTTP-6.05.tar.gz deleted file mode 100644 index 843ce15..0000000 Binary files a/packages/perl-modules/src/Net-HTTP-6.05.tar.gz and /dev/null differ diff --git a/packages/perl-modules/src/Net-HTTP-6.06.tar.gz b/packages/perl-modules/src/Net-HTTP-6.06.tar.gz new file mode 100644 index 0000000..5f5dcaa Binary files /dev/null and b/packages/perl-modules/src/Net-HTTP-6.06.tar.gz differ From git at mathias-kettner.de Tue Apr 30 16:32:20 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 30 Apr 2013 16:32:20 +0200 Subject: [omd-commits] OMD Git: omd: nagvis: Updated to 1.7.8 Message-ID: <20130430143220.1942683B81@mail.mathias-kettner.de> Module: omd Branch: master Commit: 9c00d82a34609a4a08572d6974d909c578082a4d URL: http://omdistro.org/projects/omd/repository/revisions/9c00d82a34609a4a08572d6974d909c578082a4d Author: Lars Michelsen Date: Tue Apr 30 16:32:12 2013 +0200 Commiter: Lars Michelsen Date: Tue Apr 30 16:32:12 2013 +0200 nagvis: Updated to 1.7.8 --- Changelog | 2 +- packages/nagvis/Makefile | 2 +- packages/nagvis/{nagvis-1.7.7.tar.gz => nagvis-1.7.8.tar.gz} | Bin 3514779 -> 3514202 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index d5d65a5..2a4a2b7 100644 --- a/Changelog +++ b/Changelog @@ -13,7 +13,7 @@ This file documents the revision history for the Open Monitoring Distribution - Installing livestatus python API module now - Added config hook MULTISITE_AUTHORISATION to control some user permissions in NagVis and pnp4nagios via multisite permissions - - NagVis: Update to 1.7.7 + - NagVis: Update to 1.7.8 - omd: - new option --no-autostart, -A for omd create (set AUTOSTART to off right at creation, useful for test sites!) diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile index 2568c0a..25ade71 100644 --- a/packages/nagvis/Makefile +++ b/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.7.7 +VERSION = 1.7.8 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/nagvis/nagvis-1.7.7.tar.gz b/packages/nagvis/nagvis-1.7.8.tar.gz similarity index 56% rename from packages/nagvis/nagvis-1.7.7.tar.gz rename to packages/nagvis/nagvis-1.7.8.tar.gz index 2e47836..587cfc4 100644 Binary files a/packages/nagvis/nagvis-1.7.7.tar.gz and b/packages/nagvis/nagvis-1.7.8.tar.gz differ From git at mathias-kettner.de Tue Apr 30 16:41:13 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 30 Apr 2013 16:41:13 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of ssh://mathias-kettner.de/omd Message-ID: <20130430144113.4B65C82D4A@mail.mathias-kettner.de> Module: omd Branch: master Commit: 96d72f5c94c655f32e8ca053e322290b4ae63cdf URL: http://omdistro.org/projects/omd/repository/revisions/96d72f5c94c655f32e8ca053e322290b4ae63cdf Author: Mathias Kettner Date: Tue Apr 30 16:41:11 2013 +0200 Commiter: Mathias Kettner Date: Tue Apr 30 16:41:11 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/omd --- From git at mathias-kettner.de Tue Apr 30 16:41:13 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 30 Apr 2013 16:41:13 +0200 Subject: [omd-commits] OMD Git: omd: added os-dependency to time (/usr/bin/time) Message-ID: <20130430144113.5A53D82D48@mail.mathias-kettner.de> Module: omd Branch: master Commit: c8a9e3777046a890dbece7ac22a3a7c859b96d60 URL: http://omdistro.org/projects/omd/repository/revisions/c8a9e3777046a890dbece7ac22a3a7c859b96d60 Author: Mathias Kettner Date: Tue Apr 30 16:41:06 2013 +0200 Commiter: Mathias Kettner Date: Tue Apr 30 16:41:06 2013 +0200 added os-dependency to time (/usr/bin/time) Except for SUSE: here it is in util-linux --- distros/Makefile.CENTOS_5.4 | 1 + distros/Makefile.CENTOS_5.5 | 1 + distros/Makefile.CENTOS_5.6 | 1 + distros/Makefile.CENTOS_5.7 | 1 + distros/Makefile.CENTOS_5.8 | 1 + distros/Makefile.CENTOS_5.9 | 1 + distros/Makefile.CENTOS_6.0 | 1 + distros/Makefile.CENTOS_6.1 | 1 + distros/Makefile.CENTOS_6.2 | 1 + distros/Makefile.CENTOS_6.3 | 1 + distros/Makefile.CENTOS_6.4 | 1 + distros/Makefile.DEBIAN_5.0 | 1 + distros/Makefile.DEBIAN_6.0 | 1 + distros/Makefile.DEBIAN_7.0 | 1 + distros/Makefile.REDHAT_6.0 | 1 + distros/Makefile.REDHAT_6.1 | 1 + distros/Makefile.REDHAT_6.3 | 1 + distros/Makefile.REDHAT_6.4 | 1 + distros/Makefile.UBUNTU_10.04 | 1 + distros/Makefile.UBUNTU_10.10 | 1 + distros/Makefile.UBUNTU_11.04 | 1 + distros/Makefile.UBUNTU_11.10 | 1 + distros/Makefile.UBUNTU_12.04 | 1 + distros/Makefile.UBUNTU_12.10 | 1 + distros/Makefile.UBUNTU_13.04 | 1 + 25 files changed, 25 insertions(+) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=c8a9e3777046a890dbece7ac22a3a7c859b96d60 From git at mathias-kettner.de Tue Apr 30 16:57:19 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 30 Apr 2013 16:57:19 +0200 Subject: [omd-commits] OMD Git: omd: check_mk: New version 1.2.2p1 Message-ID: <20130430145719.4D43F83475@mail.mathias-kettner.de> Module: omd Branch: master Commit: ee97bac24f111a62d06ed5a9f380eabb1bae9046 URL: http://omdistro.org/projects/omd/repository/revisions/ee97bac24f111a62d06ed5a9f380eabb1bae9046 Author: Lars Michelsen Date: Tue Apr 30 16:57:02 2013 +0200 Commiter: Lars Michelsen Date: Tue Apr 30 16:57:02 2013 +0200 check_mk: New version 1.2.2p1 --- Changelog | 2 +- packages/check_mk/Makefile | 2 +- packages/check_mk/{check_mk-1.2.2.tar.gz => check_mk-1.2.2p1.tar.gz} | Bin 12436336 -> 12462234 bytes packages/check_mk/mkeventd-1.2.2.tar.gz | Bin 88388 -> 0 bytes packages/check_mk/mkeventd-1.2.2p1.tar.gz | Bin 0 -> 90781 bytes packages/check_mk/skel/etc/check_mk/defaults | 2 +- packages/mk-livestatus/Makefile | 2 +- packages/mk-livestatus/mk-livestatus-1.2.2.tar.gz | Bin 381118 -> 0 bytes packages/mk-livestatus/mk-livestatus-1.2.2p1.tar.gz | Bin 0 -> 382025 bytes 9 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 2a4a2b7..bad78d3 100644 --- a/Changelog +++ b/Changelog @@ -6,7 +6,7 @@ This file documents the revision history for the Open Monitoring Distribution - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode - Check_MK/MK Livestatus: - - new version 1.2.2 + - new version 1.2.2p1 - integrated Event Console - Changed path for check manpages from share/doc/check_mk/checks to share/check_mk/checkman to match the local/ path diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile index b8d06fd..bec892d 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.2 +VERSION = 1.2.2p1 DIR = $(NAME)-$(VERSION) EDIR = mkeventd-$(VERSION) diff --git a/packages/check_mk/check_mk-1.2.2.tar.gz b/packages/check_mk/check_mk-1.2.2p1.tar.gz similarity index 60% rename from packages/check_mk/check_mk-1.2.2.tar.gz rename to packages/check_mk/check_mk-1.2.2p1.tar.gz index 9a94cae..aa7aa7b 100644 Binary files a/packages/check_mk/check_mk-1.2.2.tar.gz and b/packages/check_mk/check_mk-1.2.2p1.tar.gz differ diff --git a/packages/check_mk/mkeventd-1.2.2.tar.gz b/packages/check_mk/mkeventd-1.2.2.tar.gz deleted file mode 100644 index 9ae0909..0000000 Binary files a/packages/check_mk/mkeventd-1.2.2.tar.gz and /dev/null differ diff --git a/packages/check_mk/mkeventd-1.2.2p1.tar.gz b/packages/check_mk/mkeventd-1.2.2p1.tar.gz new file mode 100644 index 0000000..1642ce9 Binary files /dev/null and b/packages/check_mk/mkeventd-1.2.2p1.tar.gz differ diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults index 2d570f5..9cda63c 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.2' +check_mk_version = '1.2.2p1' 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/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile index 3fea395..ea7c5d9 100644 --- a/packages/mk-livestatus/Makefile +++ b/packages/mk-livestatus/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mk-livestatus -VERSION = 1.2.2 +VERSION = 1.2.2p1 DIR = $(NAME)-$(VERSION) CONFIGUREOPTS = \ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2.tar.gz deleted file mode 100644 index 6775d6b..0000000 Binary files a/packages/mk-livestatus/mk-livestatus-1.2.2.tar.gz and /dev/null differ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.2p1.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.2p1.tar.gz new file mode 100644 index 0000000..5c74604 Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.2p1.tar.gz differ From git at mathias-kettner.de Tue Apr 30 16:57:19 2013 From: git at mathias-kettner.de (git version control) Date: Tue, 30 Apr 2013 16:57:19 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20130430145719.5E58E83473@mail.mathias-kettner.de> Module: omd Branch: master Commit: 35cf1994ea8549c678c49c75662cec75451452ca URL: http://omdistro.org/projects/omd/repository/revisions/35cf1994ea8549c678c49c75662cec75451452ca Author: Lars Michelsen Date: Tue Apr 30 16:57:04 2013 +0200 Commiter: Lars Michelsen Date: Tue Apr 30 16:57:04 2013 +0200 Merge branch 'master' of mathias-kettner.de:omd ---