From git at mathias-kettner.de Thu Aug 7 10:30:11 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 07 Aug 2014 10:30:11 +0200 Subject: [omd-commits] OMD Git: omd: thruk: update 1.84-6 Message-ID: <20140807083011.941E480614@mail.mathias-kettner.de> Module: omd Branch: master Commit: eeadb5affe0a184fd04dc5eb97c3400244a00311 URL: http://omdistro.org/projects/omd/repository/revisions/eeadb5affe0a184fd04dc5eb97c3400244a00311 Author: Sven Nierlein Date: Thu Aug 7 10:29:00 2014 +0200 Commiter: Sven Nierlein Date: Thu Aug 7 10:29:00 2014 +0200 thruk: update 1.84-6 --- Changelog | 2 +- packages/thruk/Makefile | 2 +- packages/thruk/{Thruk-1.84-5.tar.gz => Thruk-1.84-6.tar.gz} | Bin 8792225 -> 8803965 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 2a6edb5..65b5fdc 100644 --- a/Changelog +++ b/Changelog @@ -25,7 +25,7 @@ This file documents the revision history for the Open Monitoring Distribution - diskspace: Fixed error messages in syslog which were caused by exit codes of 3 when diskspace cleanup has not been configured - Check_MK/MK Livestatus: new version 1.2.4p5 - - Thruk: Update to 1.84-5 + - Thruk: Update to 1.84-6 - PNP4Nagios: Update to 0.6.24 - Icinga: Update to 1.11.4 - NagVis: Update to 1.8b5 diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile index 6ea7780..7f8607b 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.84-5 +VERSION = 1.84-6 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/Thruk-1.84-5.tar.gz b/packages/thruk/Thruk-1.84-6.tar.gz similarity index 53% rename from packages/thruk/Thruk-1.84-5.tar.gz rename to packages/thruk/Thruk-1.84-6.tar.gz index 12f9d52..9cb0b37 100644 Binary files a/packages/thruk/Thruk-1.84-5.tar.gz and b/packages/thruk/Thruk-1.84-6.tar.gz differ From git at mathias-kettner.de Tue Aug 12 17:17:12 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 12 Aug 2014 17:17:12 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140812151712.ADC6C80706@mail.mathias-kettner.de> Module: omd Branch: master Commit: 460b9a22f6b4714b5f046d2547a7ed0e4ce985ac URL: http://omdistro.org/projects/omd/repository/revisions/460b9a22f6b4714b5f046d2547a7ed0e4ce985ac Author: Lars Michelsen Date: Tue Aug 12 17:16:52 2014 +0200 Commiter: Lars Michelsen Date: Tue Aug 12 17:16:52 2014 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Tue Aug 12 17:17:12 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 12 Aug 2014 17:17:12 +0200 Subject: [omd-commits] OMD Git: omd: nagvis: updated to 1.8b6 Message-ID: <20140812151712.BEE98806E2@mail.mathias-kettner.de> Module: omd Branch: master Commit: c35080a22005ee3a3675f6c1b9a708fc79fec378 URL: http://omdistro.org/projects/omd/repository/revisions/c35080a22005ee3a3675f6c1b9a708fc79fec378 Author: Lars Michelsen Date: Tue Aug 12 16:45:07 2014 +0200 Commiter: Lars Michelsen Date: Tue Aug 12 16:45:07 2014 +0200 nagvis: updated to 1.8b6 --- Changelog | 2 +- packages/nagvis/Makefile | 2 +- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1484077 -> 0 bytes packages/nagvis/nagvis-1.8b6.tar.gz | Bin 0 -> 1455497 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 522f643..68fb5ca 100644 --- a/Changelog +++ b/Changelog @@ -28,7 +28,7 @@ This file documents the revision history for the Open Monitoring Distribution - Thruk: Update to 1.84-5 - PNP4Nagios: Update to 0.6.22 - Icinga: Update to 1.11.4 - - NagVis: Update to 1.8b5 + - NagVis: Update to 1.8b6 - Dokuwiki: Fixed integration with multisite cookie authentication - Added build support for Ubuntu 14.04 - Added build support for CentOS 7.0 diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile index 923bd57..ab70da6 100644 --- a/packages/nagvis/Makefile +++ b/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.8-nightly +VERSION = 1.8b6 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz deleted file mode 100644 index a3629b6..0000000 Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and /dev/null differ diff --git a/packages/nagvis/nagvis-1.8b6.tar.gz b/packages/nagvis/nagvis-1.8b6.tar.gz new file mode 100644 index 0000000..7ec20f0 Binary files /dev/null and b/packages/nagvis/nagvis-1.8b6.tar.gz differ From git at mathias-kettner.de Wed Aug 20 10:09:48 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 20 Aug 2014 10:09:48 +0200 Subject: [omd-commits] OMD Git: omd: FIX: Fixed logrotation when var/tmp does not exist Message-ID: <20140820080948.F0F3680064@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3d7cc46460dc7298df8c9594c98cc0016d580dfd URL: http://omdistro.org/projects/omd/repository/revisions/3d7cc46460dc7298df8c9594c98cc0016d580dfd Author: Lars Michelsen Date: Wed Aug 20 10:09:43 2014 +0200 Commiter: Lars Michelsen Date: Wed Aug 20 10:09:43 2014 +0200 FIX: Fixed logrotation when var/tmp does not exist --- Changelog | 2 ++ packages/maintenance/logrotate | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Changelog b/Changelog index 1b85ec0..a517ae6 100644 --- a/Changelog +++ b/Changelog @@ -24,6 +24,8 @@ This file documents the revision history for the Open Monitoring Distribution already running (Modified nagios, apache and rrdcached scripts) - diskspace: Fixed error messages in syslog which were caused by exit codes of 3 when diskspace cleanup has not been configured + - FIX: Fixed logrotation when var/tmp does not exist + (seem to only be created when xinetd had been enabled before within a site) - Check_MK/MK Livestatus: new version 1.2.4p5 - Thruk: Update to 1.84-6 - PNP4Nagios: Update to 0.6.24 diff --git a/packages/maintenance/logrotate b/packages/maintenance/logrotate index 41a860a..d94c3c2 100755 --- a/packages/maintenance/logrotate +++ b/packages/maintenance/logrotate @@ -18,6 +18,10 @@ LOCAL_LOGROTATE=$OMD_ROOT/var/tmp/logrotate if [ ! -x $LOCAL_LOGROTATE ] || \ [ $(stat --dereference --format "%s" $LOCAL_LOGROTATE) -ne \ $(stat --dereference --format "%s" $SBIN_LOGROTATE) ]; then + DIR=$(dirname $LOCAL_LOGROTATE) + if [ ! -d $DIR ]; then + mkdir -p $DIR + fi cp -f $SBIN_LOGROTATE $LOCAL_LOGROTATE fi $LOCAL_LOGROTATE $@ From git at mathias-kettner.de Wed Aug 27 15:56:30 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 27 Aug 2014 15:56:30 +0200 Subject: [omd-commits] OMD Git: omd: released 1.20 Message-ID: <20140827135631.0AAC3828AF@mail.mathias-kettner.de> Module: omd Branch: master Commit: 89ff50284cb59d23aa763aa75990205cfcfa89fb URL: http://omdistro.org/projects/omd/repository/revisions/89ff50284cb59d23aa763aa75990205cfcfa89fb Author: Sven Nierlein Date: Tue Aug 12 17:28:17 2014 +0200 Commiter: Sven Nierlein Date: Wed Aug 20 10:17:05 2014 +0200 released 1.20 Signed-off-by: Sven Nierlein --- Changelog | 4 ++-- Makefile.omd | 4 ++-- packages/omd/omd | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Changelog b/Changelog index a517ae6..b06eb2f 100644 --- a/Changelog +++ b/Changelog @@ -1,10 +1,10 @@ This file documents the revision history for the Open Monitoring Distribution -1.20 +1.20 Aug 25 2014 - apache: Changed order of apache daemon startup/stopping The webserver is now started after the monitoring core, but more important, it is now stopped after the core. This should reduce - the time needed to bring down all worker processes, since there + the time needed to bring down all worker processes, since there are no hanging livestatus connections started by web clients anymore. - debian packge: Removed non existant URL from changelog - perl-modules: diff --git a/Makefile.omd b/Makefile.omd index 3aabcf7..7dfe931 100644 --- a/Makefile.omd +++ b/Makefile.omd @@ -1,7 +1,7 @@ # General settings included by all packages -OMD_VERSION = 1.10 -OMD_SERIAL = 31 +OMD_VERSION = 1.20 +OMD_SERIAL = 33 OMD_BASE = /omd OMD_PHYSICAL_BASE = /opt/omd OMD_ROOT = $(OMD_BASE)/versions/$(OMD_VERSION) diff --git a/packages/omd/omd b/packages/omd/omd index 8018ef1..1837cc3 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -27,7 +27,7 @@ import sys, os, shutil, pwd, grp, re, time, pprint, tty, termios, traceback from subprocess import * -OMD_VERSION = "1.10" +OMD_VERSION = "1.20" # colored output, if stdout is a tty on_tty = sys.stdout.isatty() From git at mathias-kettner.de Wed Aug 27 15:56:30 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 27 Aug 2014 15:56:30 +0200 Subject: [omd-commits] OMD Git: omd: Fixing some typos. Message-ID: <20140827135631.1D921828AD@mail.mathias-kettner.de> Module: omd Branch: master Commit: c51f63f62f75b717126ff3a6dca488547d20ed0a URL: http://omdistro.org/projects/omd/repository/revisions/c51f63f62f75b717126ff3a6dca488547d20ed0a Author: Daniel Hoherd Date: Tue Aug 26 15:11:18 2014 -0700 Commiter: Sven Nierlein Date: Wed Aug 27 15:55:08 2014 +0200 Fixing some typos. --- README | 10 +++++----- packages/omd/index.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 85974fa..189d76d 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ -For installing Nagios you have a choice: compiling the neccessary packages from +For installing Nagios you have a choice: compiling the necessary packages from source by yourself. Or you use the precompiled packages from your distribution. Self compiling and installing means you have some manual work to do. If you will use the packages from your distribution Nagios and other packages may not always @@ -12,7 +12,7 @@ be up to date. This is what OMD tries to solve: more current software releases but not all the manual work of self compiling. And last but not least: you get the same -installation paths and directories on all plattforms. The plan is to release +installation paths and directories on all platforms. The plan is to release more often than normal linux distribution do. We try to integrate vital patches in order to close the gap between releasing the patch and including it in the mainstream source. @@ -59,7 +59,7 @@ Features * Script based tarball building If you decide to compile omd for yourself, you get a single tarball with all - neccessary paths and binaries. Installing this tarball on hosts is as simple + necessary paths and binaries. Installing this tarball on hosts is as simple as extracting a common tar file. * Simple creation of new sites @@ -73,9 +73,9 @@ Features in your test environment. There is an omd upgrade available, but at this time don't rely on it, it is experimental! -* Plattform independent paths +* Platform independent paths - OMD installs to /opt/omd on all plattforms. If you don't like this, you can + OMD installs to /opt/omd on all platforms. If you don't like this, you can symlink omd to every location you want. Licensing diff --git a/packages/omd/index.py b/packages/omd/index.py index 2cc68f0..0311e5b 100644 --- a/packages/omd/index.py +++ b/packages/omd/index.py @@ -110,14 +110,14 @@ def page_welcome(req): 'well in large installations.'), ('check_mk', 'Check_MK Multisite', 'share/check_mk/web', - 'Check_MK Multisite is a fast and flexibile status GUI written ' + 'Check_MK Multisite is a fast and flexible status GUI written ' 'in Python. It supports user definable views and is able to ' 'display the status of several sites in one combined view. It ' 'uses MK Livestatus for getting the status data from the sites.'), ('thruk', 'Thruk Monitoring Webinterface', 'share/thruk', 'Thruk is a complete rework of the classic interface ' - 'in Perl. While maintainig the original look and feel it ' + 'in Perl. While maintaining the original look and feel it ' 'brings lots of improvements and new features. Just as Multisite ' 'it uses MK Livestatus as backend and supports the visualization ' 'of multiple sites.'), From git at mathias-kettner.de Thu Aug 28 08:28:43 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 28 Aug 2014 08:28:43 +0200 Subject: [omd-commits] OMD Git: omd: Added version to changelog ; fixed gitignore Message-ID: <20140828062843.4D6C280A89@mail.mathias-kettner.de> Module: omd Branch: master Commit: 05d551c65d568f3ce74a65731a1846b85b575797 URL: http://omdistro.org/projects/omd/repository/revisions/05d551c65d568f3ce74a65731a1846b85b575797 Author: Lars Michelsen Date: Thu Aug 28 08:28:34 2014 +0200 Commiter: Lars Michelsen Date: Thu Aug 28 08:28:34 2014 +0200 Added version to changelog ; fixed gitignore --- Changelog | 2 ++ packages/monitoring-plugins/.gitignore | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index b06eb2f..d0ddf8d 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,7 @@ This file documents the revision history for the Open Monitoring Distribution +1.30 + 1.20 Aug 25 2014 - apache: Changed order of apache daemon startup/stopping The webserver is now started after the monitoring core, but more diff --git a/packages/monitoring-plugins/.gitignore b/packages/monitoring-plugins/.gitignore index 52005ca..04fb4bb 100644 --- a/packages/monitoring-plugins/.gitignore +++ b/packages/monitoring-plugins/.gitignore @@ -1,2 +1,2 @@ -nagios-plugins-[0-9].[0-9] -nagios-plugins-[0-9].[0-9].[0-9][0-9] +monitoring-plugins-[0-9].[0-9] +monitoring-plugins-[0-9].[0-9].[0-9][0-9] From git at mathias-kettner.de Thu Aug 28 08:28:43 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 28 Aug 2014 08:28:43 +0200 Subject: [omd-commits] OMD Git: omd: nagvis: Updated to current nightly build Message-ID: <20140828062843.5FCB280966@mail.mathias-kettner.de> Module: omd Branch: master Commit: 95850e58da1ba5e4f9353ffc8ff7d8baa3230d70 URL: http://omdistro.org/projects/omd/repository/revisions/95850e58da1ba5e4f9353ffc8ff7d8baa3230d70 Author: Lars Michelsen Date: Thu Aug 28 08:27:08 2014 +0200 Commiter: Lars Michelsen Date: Thu Aug 28 08:27:08 2014 +0200 nagvis: Updated to current nightly build --- packages/nagvis/.gitignore | 1 + packages/nagvis/Makefile | 2 +- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 0 -> 1485412 bytes packages/nagvis/nagvis-1.8b6.tar.gz | Bin 1455497 -> 0 bytes 4 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/nagvis/.gitignore b/packages/nagvis/.gitignore index 2c8bcb9..a7b9d72 100644 --- a/packages/nagvis/.gitignore +++ b/packages/nagvis/.gitignore @@ -1,4 +1,5 @@ nagvis-[0-9].[0-9] nagvis-[0-9].[0-9].[0-9] nagvis-[0-9].[0-9].[0-9][0-9] +nagvis-[0-9].[0-9]b[0-9] nagvis-[0-9].[0-9]-nightly diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile index ab70da6..923bd57 100644 --- a/packages/nagvis/Makefile +++ b/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.8b6 +VERSION = 1.8-nightly DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz new file mode 100644 index 0000000..7a0aa8d Binary files /dev/null and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ diff --git a/packages/nagvis/nagvis-1.8b6.tar.gz b/packages/nagvis/nagvis-1.8b6.tar.gz deleted file mode 100644 index 7ec20f0..0000000 Binary files a/packages/nagvis/nagvis-1.8b6.tar.gz and /dev/null differ