From git at mathias-kettner.de Sun Dec 16 11:58:39 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 16 Dec 2012 11:58:39 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: Changed path detections to absolute paths ( to make special things work with local/ hierarchy) Message-ID: <20121216105839.94103841472@mail.mathias-kettner.de> Module: omd Branch: master Commit: c469f02597b8152de2e052fbaa27971950f51e8a URL: http://omdistro.org/projects/omd/repository/revisions/c469f02597b8152de2e052fbaa27971950f51e8a Author: Lars Michelsen Date: Sun Dec 16 11:59:09 2012 +0100 Commiter: Lars Michelsen Date: Sun Dec 16 11:59:09 2012 +0100 nagvis: Changed path detections to absolute paths (to make special things work with local/ hierarchy) --- packages/nagvis/global.php.patch | 49 ++++++++++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 12 deletions(-) diff --git a/packages/nagvis/global.php.patch b/packages/nagvis/global.php.patch index 862e662..2740a0e 100644 --- a/packages/nagvis/global.php.patch +++ b/packages/nagvis/global.php.patch @@ -1,26 +1,51 @@ ---- nagvis-1.5.3/share/server/core/defines/global.php.orig 2010-10-02 19:43:58.000000000 +0200 -+++ nagvis-1.5.3/share/server/core/defines/global.php 2010-10-02 19:47:00.000000000 +0200 -@@ -64,7 +64,7 @@ +--- nagvis-1.7-nightly/share/server/core/defines/global.php.orig 2012-12-16 11:56:58.912708241 +0100 ++++ nagvis-1.7-nightly/share/server/core/defines/global.php 2012-12-16 11:57:59.041006400 +0100 +@@ -38,13 +38,22 @@ + else + error_reporting(E_ALL); + ++$_path_parts = explode('/', dirname($_SERVER["SCRIPT_FILENAME"])); ++if($_path_parts[count($_path_parts) - 6] == 'local') // handle OMD local/ hierarchy ++ $_base_dir = join(array_slice(explode('/' ,dirname($_SERVER["SCRIPT_FILENAME"])), 0, -6), '/'); ++else ++ $_base_dir = join(array_slice(explode('/' ,dirname($_SERVER["SCRIPT_FILENAME"])), 0, -5), '/'); ++ + /** + * Set the search path for included files + */ + set_include_path( + get_include_path() +- .PATH_SEPARATOR.'../../server/core/classes/' +- .PATH_SEPARATOR.'../../server/core/classes/objects/' ++ .PATH_SEPARATOR.$_base_dir.'/local/share/nagvis/htdocs/server/core/classes' ++ .PATH_SEPARATOR.$_base_dir.'/local/share/nagvis/htdocs/server/core/classes/objects' ++ .PATH_SEPARATOR.$_base_dir.'/share/nagvis/htdocs/server/core/classes' ++ .PATH_SEPARATOR.$_base_dir.'/share/nagvis/htdocs/server/core/classes/objects' ++ .PATH_SEPARATOR.$_base_dir.'/share/nagvis/htdocs/server/core/ext/php-gettext-1.0.9' + ); + + // Enable/Disable profiling of NagVis using xhprof. To make use of this the +@@ -64,7 +73,7 @@ define('DEBUGLEVEL', 6); - + // Path to the debug file -define('DEBUGFILE', '../../../var/nagvis-debug.log'); -+define('DEBUGFILE', join(array_slice(explode('/' ,dirname($_SERVER["SCRIPT_FILENAME"])), 0, -5), '/').'/tmp/nagvis/nagvis-debug.log'); - - // It is possible to define a second main configuration file - // to pre-define some options in a file the user may not be -@@ -78,14 +78,14 @@ ++define('DEBUGFILE', $_base_dir.'/tmp/nagvis/nagvis-debug.log'); + + // It is possible to define a conf.d directory for splitting the main + // configuration in several files. Only the values defined in the CONST_MAINCFG +@@ -78,14 +87,14 @@ // The last value wins. // // Path to the main configuration file -define('CONST_MAINCFG', '../../../etc/nagvis.ini.php'); -define('CONST_MAINCFG_CACHE', '../../../var/nagvis-conf'); -+define('CONST_MAINCFG', join(array_slice(explode('/' ,dirname($_SERVER["SCRIPT_FILENAME"])), 0, -5), '/').'/etc/nagvis/nagvis.ini.php'); -+define('CONST_MAINCFG_CACHE', join(array_slice(explode('/' ,dirname($_SERVER["SCRIPT_FILENAME"])), 0, -5), '/').'/tmp/nagvis/nagvis-conf'); ++define('CONST_MAINCFG', $_base_dir.'/etc/nagvis/nagvis.ini.php'); ++define('CONST_MAINCFG_CACHE', $_base_dir.'/tmp/nagvis/nagvis-conf'); // Path to the main configuration conf.d directory -define('CONST_MAINCFG_DIR', '../../../etc/conf.d'); -+define('CONST_MAINCFG_DIR', join(array_slice(explode('/' ,dirname($_SERVER["SCRIPT_FILENAME"])), 0, -5), '/').'/etc/nagvis/conf.d'); ++define('CONST_MAINCFG_DIR', $_base_dir.'/etc/nagvis/conf.d'); // The directory below the NagVis root which is shared by the webserver -define('HTDOCS_DIR', 'share'); From git at mathias-kettner.de Sun Dec 16 12:02:59 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 16 Dec 2012 12:02:59 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: Updated to current build Message-ID: <20121216110259.B0FBA84144F@mail.mathias-kettner.de> Module: omd Branch: master Commit: 51361ea0bf5ad0ceb64f5ff6ff14942563b7bf44 URL: http://omdistro.org/projects/omd/repository/revisions/51361ea0bf5ad0ceb64f5ff6ff14942563b7bf44 Author: Lars Michelsen Date: Sun Dec 16 12:00:42 2012 +0100 Commiter: Lars Michelsen Date: Sun Dec 16 12:00:42 2012 +0100 nagvis: Updated to current build --- packages/nagvis/nagvis-1.7-nightly.tar.gz | Bin 3489833 -> 3490151 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/nagvis/nagvis-1.7-nightly.tar.gz b/packages/nagvis/nagvis-1.7-nightly.tar.gz index 72a9d89..e8df397 100644 Binary files a/packages/nagvis/nagvis-1.7-nightly.tar.gz and b/packages/nagvis/nagvis-1.7-nightly.tar.gz differ From git at mathias-kettner.de Sun Dec 16 12:02:59 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 16 Dec 2012 12:02:59 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: fixed global.php patch Message-ID: <20121216110259.CD2B38407C1@mail.mathias-kettner.de> Module: omd Branch: master Commit: cd2ec925fd7a46a318c37accc88ae3031f84a00d URL: http://omdistro.org/projects/omd/repository/revisions/cd2ec925fd7a46a318c37accc88ae3031f84a00d Author: Lars Michelsen Date: Sun Dec 16 12:02:46 2012 +0100 Commiter: Lars Michelsen Date: Sun Dec 16 12:02:46 2012 +0100 nagvis: fixed global.php patch --- packages/nagvis/global.php.patch | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/nagvis/global.php.patch b/packages/nagvis/global.php.patch index 2740a0e..c45b891 100644 --- a/packages/nagvis/global.php.patch +++ b/packages/nagvis/global.php.patch @@ -1,6 +1,6 @@ --- nagvis-1.7-nightly/share/server/core/defines/global.php.orig 2012-12-16 11:56:58.912708241 +0100 +++ nagvis-1.7-nightly/share/server/core/defines/global.php 2012-12-16 11:57:59.041006400 +0100 -@@ -38,13 +38,22 @@ +@@ -38,14 +38,22 @@ else error_reporting(E_ALL); @@ -15,8 +15,9 @@ */ set_include_path( get_include_path() -- .PATH_SEPARATOR.'../../server/core/classes/' -- .PATH_SEPARATOR.'../../server/core/classes/objects/' +- .PATH_SEPARATOR.'../../server/core/classes' +- .PATH_SEPARATOR.'../../server/core/classes/objects' +- .PATH_SEPARATOR.'../../server/core/ext/php-gettext-1.0.9' + .PATH_SEPARATOR.$_base_dir.'/local/share/nagvis/htdocs/server/core/classes' + .PATH_SEPARATOR.$_base_dir.'/local/share/nagvis/htdocs/server/core/classes/objects' + .PATH_SEPARATOR.$_base_dir.'/share/nagvis/htdocs/server/core/classes' From git at mathias-kettner.de Sun Dec 16 12:27:59 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 16 Dec 2012 12:27:59 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: Updated to current build Message-ID: <20121216112759.A49EF84144F@mail.mathias-kettner.de> Module: omd Branch: master Commit: 8f5f799559fbf85546181c41f1412dece72dc90f URL: http://omdistro.org/projects/omd/repository/revisions/8f5f799559fbf85546181c41f1412dece72dc90f Author: Lars Michelsen Date: Sun Dec 16 12:27:53 2012 +0100 Commiter: Lars Michelsen Date: Sun Dec 16 12:27:53 2012 +0100 nagvis: Updated to current build --- packages/nagvis/nagvis-1.7-nightly.tar.gz | Bin 3490151 -> 3491134 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/nagvis/nagvis-1.7-nightly.tar.gz b/packages/nagvis/nagvis-1.7-nightly.tar.gz index e8df397..39f5555 100644 Binary files a/packages/nagvis/nagvis-1.7-nightly.tar.gz and b/packages/nagvis/nagvis-1.7-nightly.tar.gz differ From git at mathias-kettner.de Sun Dec 16 12:28:35 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 16 Dec 2012 12:28:35 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: Added missing skel/ directories Message-ID: <20121216112836.00A5484144F@mail.mathias-kettner.de> Module: omd Branch: master Commit: 0788286f01b313a629c3d1476099d221c420b9a0 URL: http://omdistro.org/projects/omd/repository/revisions/0788286f01b313a629c3d1476099d221c420b9a0 Author: Lars Michelsen Date: Sun Dec 16 12:28:59 2012 +0100 Commiter: Lars Michelsen Date: Sun Dec 16 12:28:59 2012 +0100 nagvis: Added missing skel/ directories --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/nagvis/skel/local/share/nagvis/htdocs/server/core/classes/objects/.gitignore b/packages/nagvis/skel/local/share/nagvis/htdocs/server/core/classes/objects/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/packages/nagvis/skel/local/share/nagvis/htdocs/userfiles/scripts/.gitignore b/packages/nagvis/skel/local/share/nagvis/htdocs/userfiles/scripts/.gitignore new file mode 100644 index 0000000..e69de29 From git at mathias-kettner.de Mon Dec 17 10:31:22 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 17 Dec 2012 10:31:22 +0100 Subject: [omd-commits] OMD Git: omd: ubuntu12-10: fixed requirements Message-ID: <20121217093122.87480841595@mail.mathias-kettner.de> Module: omd Branch: master Commit: 4d24c8f946d07002b5037249b0aaf7f832d20de5 URL: http://omdistro.org/projects/omd/repository/revisions/4d24c8f946d07002b5037249b0aaf7f832d20de5 Author: Sven Nierlein Date: Mon Dec 17 10:28:17 2012 +0100 Commiter: Sven Nierlein Date: Mon Dec 17 10:28:17 2012 +0100 ubuntu12-10: fixed requirements --- distros/Makefile.UBUNTU_12.10 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/distros/Makefile.UBUNTU_12.10 b/distros/Makefile.UBUNTU_12.10 index 5f08ba9..312ff32 100644 --- a/distros/Makefile.UBUNTU_12.10 +++ b/distros/Makefile.UBUNTU_12.10 @@ -37,7 +37,7 @@ OS_PACKAGES += fping OS_PACKAGES += graphviz OS_PACKAGES += libapache2-mod-fcgid OS_PACKAGES += libapache2-mod-proxy-html -OS_PACKAGES += libboost-program-options1.46.1 +OS_PACKAGES += libboost-program-options1.49.0 OS_PACKAGES += libdbi1 OS_PACKAGES += libevent-1.4-2 OS_PACKAGES += libgd2-xpm From git at mathias-kettner.de Mon Dec 17 10:31:22 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 17 Dec 2012 10:31:22 +0100 Subject: [omd-commits] OMD Git: omd: mod-gearman: removed useless link Message-ID: <20121217093122.AC6A9840FC6@mail.mathias-kettner.de> Module: omd Branch: master Commit: f8055089ed8f857e5b7b5c6b7c575983d88a680b URL: http://omdistro.org/projects/omd/repository/revisions/f8055089ed8f857e5b7b5c6b7c575983d88a680b Author: Sven Nierlein Date: Mon Dec 17 10:31:03 2012 +0100 Commiter: Sven Nierlein Date: Mon Dec 17 10:31:03 2012 +0100 mod-gearman: removed useless link --- packages/mod-gearman/Makefile | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile index 470d92b..52428a2 100644 --- a/packages/mod-gearman/Makefile +++ b/packages/mod-gearman/Makefile @@ -46,7 +46,6 @@ skel: done find $(SKEL)/etc/mod-gearman -name \*.orig -exec rm {} \; mkdir -p $(SKEL)/var/log/mod_gearman - cd $(SKEL)/var/log && ln -s gearman mod_gearman touch $(SKEL)/var/log/mod_gearman/neb.log touch $(SKEL)/var/log/mod_gearman/worker.log From git at mathias-kettner.de Wed Dec 19 14:10:55 2012 From: git at mathias-kettner.de (git version control) Date: Wed, 19 Dec 2012 14:10:55 +0100 Subject: [omd-commits] OMD Git: omd: Added missing OS dependency "cronie" for RH 6.x Message-ID: <20121219131055.4197A8410DB@mail.mathias-kettner.de> Module: omd Branch: master Commit: e946b097c45e1e750df0154d22939180cbbaac02 URL: http://omdistro.org/projects/omd/repository/revisions/e946b097c45e1e750df0154d22939180cbbaac02 Author: Mathias Kettner Date: Wed Dec 19 14:10:48 2012 +0100 Commiter: Mathias Kettner Date: Wed Dec 19 14:10:48 2012 +0100 Added missing OS dependency "cronie" for RH 6.x Without this package a site cannot be started since the command crontab is missing. --- 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.REDHAT_6.0 | 1 + distros/Makefile.REDHAT_6.1 | 1 + 6 files changed, 6 insertions(+), 0 deletions(-) diff --git a/distros/Makefile.CENTOS_6.0 b/distros/Makefile.CENTOS_6.0 index 5f5372c..f5010f1 100644 --- a/distros/Makefile.CENTOS_6.0 +++ b/distros/Makefile.CENTOS_6.0 @@ -59,6 +59,7 @@ OS_PACKAGES += readline OS_PACKAGES += rsync OS_PACKAGES += uuid OS_PACKAGES += xinetd +OS_PACKAGES += cronie OS_PACKAGES += python-ldap # needed for ldap support in multisite USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s diff --git a/distros/Makefile.CENTOS_6.1 b/distros/Makefile.CENTOS_6.1 index 769cea8..fb8f377 100644 --- a/distros/Makefile.CENTOS_6.1 +++ b/distros/Makefile.CENTOS_6.1 @@ -62,6 +62,7 @@ OS_PACKAGES += readline OS_PACKAGES += rsync OS_PACKAGES += uuid OS_PACKAGES += xinetd +OS_PACKAGES += cronie OS_PACKAGES += python-ldap # needed for ldap support in multisite USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s diff --git a/distros/Makefile.CENTOS_6.2 b/distros/Makefile.CENTOS_6.2 index 45c8756..bd7a07b 100644 --- a/distros/Makefile.CENTOS_6.2 +++ b/distros/Makefile.CENTOS_6.2 @@ -62,6 +62,7 @@ OS_PACKAGES += readline OS_PACKAGES += rsync OS_PACKAGES += uuid OS_PACKAGES += xinetd +OS_PACKAGES += cronie OS_PACKAGES += python-ldap # needed for ldap support in multisite USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s diff --git a/distros/Makefile.CENTOS_6.3 b/distros/Makefile.CENTOS_6.3 index dd4e584..26669d5 100644 --- a/distros/Makefile.CENTOS_6.3 +++ b/distros/Makefile.CENTOS_6.3 @@ -62,6 +62,7 @@ OS_PACKAGES += readline OS_PACKAGES += rsync OS_PACKAGES += uuid OS_PACKAGES += xinetd +OS_PACKAGES += cronie OS_PACKAGES += python-ldap # needed for ldap support in multisite USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s diff --git a/distros/Makefile.REDHAT_6.0 b/distros/Makefile.REDHAT_6.0 index 73ab4f4..42c1c87 100644 --- a/distros/Makefile.REDHAT_6.0 +++ b/distros/Makefile.REDHAT_6.0 @@ -58,6 +58,7 @@ OS_PACKAGES += readline OS_PACKAGES += rsync OS_PACKAGES += uuid OS_PACKAGES += xinetd +OS_PACKAGES += cronie OS_PACKAGES += python-ldap # needed for ldap support in multisite USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s diff --git a/distros/Makefile.REDHAT_6.1 b/distros/Makefile.REDHAT_6.1 index 4eb9543..89bf4bb 100644 --- a/distros/Makefile.REDHAT_6.1 +++ b/distros/Makefile.REDHAT_6.1 @@ -61,6 +61,7 @@ OS_PACKAGES += readline OS_PACKAGES += rsync OS_PACKAGES += uuid OS_PACKAGES += xinetd +OS_PACKAGES += cronie OS_PACKAGES += python-ldap # needed for ldap support in multisite USERADD_OPTIONS = -M ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s From git at mathias-kettner.de Wed Dec 19 18:00:48 2012 From: git at mathias-kettner.de (git version control) Date: Wed, 19 Dec 2012 18:00:48 +0100 Subject: [omd-commits] OMD Git: omd: etc/init.d/nagios: allow to skip verification by use of Message-ID: <20121219170048.F097684314E@mail.mathias-kettner.de> Module: omd Branch: master Commit: 75ad215226489397e2892efe371f24f095850f11 URL: http://omdistro.org/projects/omd/repository/revisions/75ad215226489397e2892efe371f24f095850f11 Author: Mathias Kettner Date: Wed Dec 19 18:00:44 2012 +0100 Commiter: Mathias Kettner Date: Wed Dec 19 18:00:44 2012 +0100 etc/init.d/nagios: allow to skip verification by use of environment variable (optimization for Check_MK) --- packages/nagios/skel/etc/init.d/nagios | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/nagios/skel/etc/init.d/nagios b/packages/nagios/skel/etc/init.d/nagios index 7039f7c..a1615a9 100755 --- a/packages/nagios/skel/etc/init.d/nagios +++ b/packages/nagios/skel/etc/init.d/nagios @@ -47,6 +47,13 @@ STATUS_DAT=###ROOT###/tmp/nagios/status.dat USR=###SITE### GRP=###SITE### +# You can set the environment variable CORE_NOVERIFY=yes +# in order to supress a verification of the nagios configuration +# in case of start, restart or reload. This is in order to +# avoid duplicate effort when being called by cmk -R or +# cmk -O. +# export CORE_NOVERIFY=yes + # Make sure that check plugins do not run localized. # check_icmp outputs performance data with german # comma instead of dot and makes it unparsable. @@ -171,9 +178,7 @@ case "$1" in exit 1 fi - if ! verify_config quiet; then - exit 1 - fi + [ "$CORE_NOVERIFY" ] || verify_config quiet || exit 1 if nagios_wait_start; then echo 'OK' @@ -209,9 +214,7 @@ case "$1" in fi ;; restart) - if ! verify_config quiet; then - exit 1 - fi + [ "$CORE_NOVERIFY" ] || verify_config quiet || exit 1 $0 stop || (echo "Unable to stop nagios. Terminating..." && exit 1) echo -n "Starting nagios..." @@ -225,9 +228,7 @@ case "$1" in ;; reload|force-reload) - if ! verify_config quiet; then - exit 1 - fi + [ "$CORE_NOVERIFY" ] || verify_config quiet || exit 1 # Execute a start when nagios is not running if ! pid=$(pidof_nagios) 2>&1; then From git at mathias-kettner.de Thu Dec 20 14:11:45 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 20 Dec 2012 14:11:45 +0100 Subject: [omd-commits] OMD Git: omd: thruk: new upstream release Message-ID: <20121220131146.25A928422A4@mail.mathias-kettner.de> Module: omd Branch: master Commit: c5cf5b27c8bd2680f9ebb2e2aeb45ba055ab497b URL: http://omdistro.org/projects/omd/repository/revisions/c5cf5b27c8bd2680f9ebb2e2aeb45ba055ab497b Author: Sven Nierlein Date: Thu Dec 20 12:21:00 2012 +0100 Commiter: Build Automator Date: Thu Dec 20 12:21:00 2012 +0100 thruk: new upstream release --- Changelog | 2 +- packages/perl-modules/Makefile | 1 + packages/thruk/Makefile | 6 +++- packages/thruk/Thruk-1.54.tar.gz | Bin 5668954 -> 0 bytes packages/thruk/Thruk-1.60-2.tar.gz | Bin 0 -> 6770278 bytes .../thruk/patches/0001-skel_adjustments.skel_patch | 28 +++++++++++-------- packages/thruk/patches/0003-path_thruk.patch | 13 --------- t/20-package_thruk.t | 5 ++- t/TestUtils.pm | 1 + 9 files changed, 26 insertions(+), 30 deletions(-) diff --git a/Changelog b/Changelog index 554e1c2..2d0c9fc 100644 --- a/Changelog +++ b/Changelog @@ -1,7 +1,7 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: - Icinga: Update to 1.8.2 - - Thruk: Update to 1.54 + - Thruk: Update to 1.60 - 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.0p3 diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile index 3e1b31b..4991506 100644 --- a/packages/perl-modules/Makefile +++ b/packages/perl-modules/Makefile @@ -333,6 +333,7 @@ MODULES = \ + build: mkdir -p $(P5TMPDIST)/dest mkdir -p $(P5TMPDIST)/src rsync -av src/. $(P5TMPDIST)/src/. diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile index cc72cca..34ef4f8 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.54 +VERSION = 1.60 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') @@ -9,7 +9,7 @@ PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') build: rm -rf $(DIR) - tar xzf $(DIR).tar.gz + tar xzf $(DIR)*.tar.gz for p in patches/*.patch ; do \ echo "applying $$p..." ; \ ( cd $(DIR) ; patch -p1 ) < $$p || exit 1; \ @@ -22,6 +22,7 @@ install: mkdir -p $(DESTDIR)$(OMD_ROOT)/bin rm -rf $(DESTDIR)$(OMD_ROOT)/share/thruk cp -rp $(DIR)/script/thruk $(DESTDIR)$(OMD_ROOT)/bin/thruk + cp -rp $(DIR)/script/naglint $(DESTDIR)$(OMD_ROOT)/bin/naglint cp -rp $(DIR) $(DESTDIR)$(OMD_ROOT)/share/thruk mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/etc/thruk rm -rf $(DESTDIR)$(OMD_ROOT)/share/thruk/plugins-enabled @@ -29,6 +30,7 @@ install: rm -rf $(DESTDIR)$(OMD_ROOT)/share/thruk/t mv $(DESTDIR)$(OMD_ROOT)/share/thruk/script/thruk $(DESTDIR)$(OMD_ROOT)/bin/thruk chmod 755 $(DESTDIR)$(OMD_ROOT)/bin/thruk + chmod 755 $(DESTDIR)$(OMD_ROOT)/bin/naglint skel: # logfile has to be group writeable for shared apache diff --git a/packages/thruk/Thruk-1.54.tar.gz b/packages/thruk/Thruk-1.54.tar.gz deleted file mode 100644 index edaf2c8..0000000 Binary files a/packages/thruk/Thruk-1.54.tar.gz and /dev/null differ diff --git a/packages/thruk/Thruk-1.60-2.tar.gz b/packages/thruk/Thruk-1.60-2.tar.gz new file mode 100644 index 0000000..ec3c91e Binary files /dev/null and b/packages/thruk/Thruk-1.60-2.tar.gz differ diff --git a/packages/thruk/patches/0001-skel_adjustments.skel_patch b/packages/thruk/patches/0001-skel_adjustments.skel_patch index eafe46f..15e23ba 100644 --- a/packages/thruk/patches/0001-skel_adjustments.skel_patch +++ b/packages/thruk/patches/0001-skel_adjustments.skel_patch @@ -1,5 +1,5 @@ ---- a/etc/thruk/thruk.conf 2012-07-19 13:13:20.000000000 +0200 -+++ b/etc/thruk/thruk.conf 2012-07-19 16:03:03.639789375 +0200 +--- a/etc/thruk/thruk.conf 2012-12-09 11:26:18.000000000 +0100 ++++ b/etc/thruk/thruk.conf 2012-12-09 11:27:09.000000000 +0100 @@ -13,7 +13,7 @@ ###################################### @@ -39,7 +39,7 @@ ###################################### # normally passive checks would be marked as disabled. -@@ -134,35 +134,35 @@ +@@ -134,11 +134,11 @@ ###################################### # temporary directory, used for template cache... @@ -52,6 +52,10 @@ +var_path = ###ROOT###/var/thruk ###################################### + # mode used when creating or saving files +@@ -147,27 +147,27 @@ + + ###################################### # server side includes -#ssi_path = ssi/ +ssi_path = ###ROOT###/etc/thruk/ssi @@ -82,16 +86,16 @@ ###################################### # use paged data instead of all data in one huge page -@@ -222,7 +222,7 @@ +@@ -227,7 +227,7 @@ # Instead of using a general resource_file, you could define one file # per peer in your peer config. # -#resource_file = path_to_your/resource.cfg +resource_file = ###ROOT###/etc/nagios/resource.cfg - # show inline pnp graph if available - # if a service or host has a pnp4nagios action url set -@@ -294,6 +294,7 @@ + # enable a performance bar inside the status/host list which + # create a graph from the performance data of the plugin output. Available +@@ -305,6 +305,7 @@ # check should be rescheduled instead of the passive check. # Have a look at the documentation for a detailed description. #command_reschedule_alias = servicename_or_commandname_pattern;agent_service_name @@ -99,7 +103,7 @@ ###################################### # Time Format Settings -@@ -343,23 +344,23 @@ +@@ -354,23 +355,23 @@ # Specifiy a file which is then completly under the control of Thruk. # It will be used to store cronjobs, ex. for reports. The file has to # be writable by Thruk. @@ -128,7 +132,7 @@ # execute regular scheduled reports with this nice level #report_nice_level = 5 -@@ -390,8 +391,8 @@ +@@ -421,8 +422,8 @@ ###################################### # COOKIE AUTH ###################################### @@ -136,10 +140,10 @@ -cookie_auth_restricted_url = http://localhost/thruk/cgi-bin/restricted.cgi +cookie_auth_login_url = ###SITE###/thruk/cgi-bin/login.cgi +cookie_auth_restricted_url = http://localhost/###SITE###/thruk/cgi-bin/restricted.cgi - cookie_auth_session_timeout = 86400 + cookie_auth_session_timeout = 604800 cookie_auth_session_cache_timeout = 5 -@@ -412,42 +413,19 @@ +@@ -449,42 +450,19 @@ ###################################### # Backend Configuration, enter your backends here @@ -195,7 +199,7 @@ -@@ -461,9 +439,9 @@ +@@ -498,9 +476,9 @@ show_plugin_syntax_helper = 1 diff --git a/packages/thruk/patches/0003-path_thruk.patch b/packages/thruk/patches/0003-path_thruk.patch deleted file mode 100644 index e20e71f..0000000 --- a/packages/thruk/patches/0003-path_thruk.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/script/thruk 2012-03-27 22:26:34.000000000 +0200 -+++ b/script/thruk 2012-03-29 14:08:09.985176993 +0200 -@@ -1,5 +1,10 @@ - #!/usr/bin/perl - -+BEGIN { -+ use lib $ENV{'OMD_ROOT'}.'/share/thruk/lib'; -+ $ENV{'CATALYST_CONFIG'} = $ENV{'OMD_ROOT'}.'/etc/thruk'; -+}; -+ - use strict; - use warnings; - use Getopt::Long; diff --git a/t/20-package_thruk.t b/t/20-package_thruk.t index 09f1d6c..c8851be 100644 --- a/t/20-package_thruk.t +++ b/t/20-package_thruk.t @@ -13,7 +13,7 @@ BEGIN { use lib "$FindBin::Bin/lib/lib/perl5"; } -plan( tests => 2526 ); +plan( tests => 2550 ); ################################################## # create our test site @@ -61,6 +61,7 @@ my $tests = [ { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_http -t 20 -H localhost -a omdadmin:omd -u \"/$site/thruk/cgi-bin/tac.cgi\" -e 200 -r \"Logged in as omdadmin<\/i>\"'", like => '/HTTP OK:/' }, { cmd => "/bin/su - $site -c './bin/thruk -l'", like => "/$site/" }, { cmd => "/bin/su - $site -c './bin/thruk -l --local'", like => "/$site/" }, + { cmd => "/bin/su - $site -c './bin/naglint ./etc/nagios/conf.d/commands.cfg'", like => "/check_local_load/" }, ]; my $own_tests = [ @@ -152,7 +153,7 @@ my $urls = [ { url => '/thruk/cgi-bin/conf.cgi?sub=users&action=change&data.username=omdadmin', like => [ '/Config Tool/', '/remove password/', '/authorized_for_all_services/' ] }, { url => '/thruk/cgi-bin/conf.cgi?sub=objects', like => [ '/Config Tool/', '/select host to change/' ] }, { url => '/thruk/cgi-bin/conf.cgi?sub=objects&apply=yes', like => [ '/Config Tool/', '/There are no pending changes to commit/' ] }, - { url => '/thruk/cgi-bin/conf.cgi?sub=objects&type=host&data.name=generic-host', like => [ '/Config Tool/', '/Template:\s+generic\-host/', '/templates.cfg/' ], skip_html_links => 1 }, + { url => '/thruk/cgi-bin/conf.cgi?sub=objects&type=host&data.name=generic-host', like => [ '/Config Tool/', '/Template: generic\-host/', '/templates.cfg/' ], skip_html_links => 1 }, { url => '/thruk/cgi-bin/conf.cgi?sub=objects&action=browser', like => [ '/Config Tool/', '/commands.cfg/' ] }, # reporting diff --git a/t/TestUtils.pm b/t/TestUtils.pm index 2bb1d63..83a83bd 100644 --- a/t/TestUtils.pm +++ b/t/TestUtils.pm @@ -582,6 +582,7 @@ sub _diag_lint_errors_and_remove_some_exceptions { "Unknown attribute \"start\" for tag
", "Unknown attribute \"end\" for tag
", "for tag ", + "Unknown\ attribute\ \"placeholder\"\ for\ tag\ ", ) { next LINT_ERROR if($err_str =~ m/$exclude_pattern/i); } From git at mathias-kettner.de Thu Dec 20 18:25:31 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 20 Dec 2012 18:25:31 +0100 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.7.7 Message-ID: <20121220172531.8DE278432FE@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7f87cf3b6dacb69e970ab715cb94c3b443e7f176 URL: http://omdistro.org/projects/omd/repository/revisions/7f87cf3b6dacb69e970ab715cb94c3b443e7f176 Author: Gerhard Lausser Date: Thu Dec 20 18:24:24 2012 +0100 Commiter: Gerhard Lausser Date: Thu Dec 20 18:24:24 2012 +0100 check_oracle_health: update to 1.7.7 --- packages/check_oracle_health/Makefile | 2 +- .../check_oracle_health-1.7.7.tar.gz | Bin 0 -> 143755 bytes 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index 8f219e0..e630f19 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.5.1 +VERSION = 1.7.7 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.7.7.tar.gz b/packages/check_oracle_health/check_oracle_health-1.7.7.tar.gz new file mode 100644 index 0000000..4b91d4d Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.7.7.tar.gz differ From git at mathias-kettner.de Thu Dec 20 21:50:39 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 20 Dec 2012 21:50:39 +0100 Subject: [omd-commits] OMD Git: omd: shinken: update to 1.2.2 Message-ID: <20121220205039.66E2A8432FE@mail.mathias-kettner.de> Module: omd Branch: master Commit: 5b4d45138dbab32083485ccd7c3e0896637d6e1e URL: http://omdistro.org/projects/omd/repository/revisions/5b4d45138dbab32083485ccd7c3e0896637d6e1e Author: Gerhard Lausser Date: Thu Dec 20 21:49:12 2012 +0100 Commiter: Gerhard Lausser Date: Thu Dec 20 21:49:28 2012 +0100 shinken: update to 1.2.2 --- packages/shinken/Makefile | 2 +- .../{shinken-1.2.tar.gz => shinken-1.2.2.tar.gz} | Bin 9920043 -> 9956811 bytes 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile index 22868d5..3e5f35b 100644 --- a/packages/shinken/Makefile +++ b/packages/shinken/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd -SHINKEN=shinken-1.2 +SHINKEN=shinken-1.2.2 SHINKEN_FILE=$(SHINKEN).tar.gz SHINKEN_URL=http://shinken-monitoring.org/pub/$(SHINKEN).tar.gz # diff --git a/packages/shinken/shinken-1.2.tar.gz b/packages/shinken/shinken-1.2.2.tar.gz similarity index 55% rename from packages/shinken/shinken-1.2.tar.gz rename to packages/shinken/shinken-1.2.2.tar.gz index 8f62186..b7b2160 100644 Binary files a/packages/shinken/shinken-1.2.tar.gz and b/packages/shinken/shinken-1.2.2.tar.gz differ From git at mathias-kettner.de Fri Dec 21 14:09:29 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 21 Dec 2012 14:09:29 +0100 Subject: [omd-commits] OMD Git: omd: shinken: removed a leftover patch Message-ID: <20121221130929.D6090842466@mail.mathias-kettner.de> Module: omd Branch: master Commit: b9ec3079aae2bd34c2ba4355fabd2dcdc7f78b71 URL: http://omdistro.org/projects/omd/repository/revisions/b9ec3079aae2bd34c2ba4355fabd2dcdc7f78b71 Author: Gerhard Lausser Date: Fri Dec 21 15:18:45 2012 +0300 Commiter: Gerhard Lausser Date: Fri Dec 21 15:19:56 2012 +0300 shinken: removed a leftover patch --- packages/shinken/Makefile | 8 +++--- ...orrect-livestatus-commands-table.-Fix-520.patch | 26 -------------------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile index 3e5f35b..53bd9ca 100644 --- a/packages/shinken/Makefile +++ b/packages/shinken/Makefile @@ -69,10 +69,10 @@ export PYTHONPATH build: test -f ${SHINKEN_FILE} || wget $(SHINKEN_URL) tar xzf $(SHINKEN_FILE) - set -e ; for p in patches/*.patch ; do \ - echo "applying $$p..." ; \ - ( cd $(SHINKEN) ; patch -p1 -b ) < $$p ; \ - done + #set -e ; for p in patches/*.patch ; do \ + # echo "applying $$p..." ; \ + # ( cd $(SHINKEN) ; patch -p1 -b ) < $$p ; \ + #done test -f $(PYRO_FILE) || wget $(PYRO_URL) tar xzf $(PYRO_FILE) test -f $(MP_FILE) || wget $(MP_URL) diff --git a/packages/shinken/patches/0001-Correct-livestatus-commands-table.-Fix-520.patch b/packages/shinken/patches/0001-Correct-livestatus-commands-table.-Fix-520.patch deleted file mode 100644 index ec6c803..0000000 --- a/packages/shinken/patches/0001-Correct-livestatus-commands-table.-Fix-520.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 695d5615fe2be1a1ba46aaa213f15f2c9454ec6e Mon Sep 17 00:00:00 2001 -From: Nicolas DUPEUX -Date: Wed, 5 Sep 2012 15:23:42 +0200 -Subject: [PATCH 1/3] Correct livestatus commands table. Fix #520 - (Fix by: Franky) - ---- - .../modules/livestatus_broker/livestatus_query.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/shinken/modules/livestatus_broker/livestatus_query.py b/shinken/modules/livestatus_broker/livestatus_query.py -index 9a30f3c..8b8dcd2 100644 ---- a/shinken/modules/livestatus_broker/livestatus_query.py -+++ b/shinken/modules/livestatus_broker/livestatus_query.py -@@ -538,7 +538,7 @@ class LiveStatusQuery(object): - objects_get_handlers = { - 'hosts': get_hosts_livedata, - 'services': get_services_livedata, -- 'commands': get_simple_livedata, -+ 'commands': get_filtered_livedata, - 'schedulers': get_simple_livedata, - 'brokers': get_simple_livedata, - 'pollers': get_simple_livedata, --- -1.7.0.4 -