From git at mathias-kettner.de Fri Oct 5 11:09:11 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 05 Oct 2012 11:09:11 +0200 Subject: [omd-commits] OMD Git: omd: Updated Check_MK and Livestatus to 1.2.0p3 Message-ID: <20121005090912.2380C843098@mail.mathias-kettner.de> Module: omd Branch: master Commit: 38239d370bf9281a399165460217cf6776783a72 URL: http://omdistro.org/projects/omd/repository/revisions/38239d370bf9281a399165460217cf6776783a72 Author: Mathias Kettner Date: Fri Oct 5 11:07:13 2012 +0200 Commiter: Mathias Kettner Date: Fri Oct 5 11:07:13 2012 +0200 Updated Check_MK and Livestatus to 1.2.0p3 --- Changelog | 2 ++ packages/check_mk/Makefile | 2 +- ...k_mk-1.2.0p2.tar.gz => check_mk-1.2.0p3.tar.gz} | Bin 11643327 -> 11716046 bytes packages/check_mk/skel/etc/check_mk/defaults | 2 +- packages/mk-livestatus/Makefile | 2 +- .../mk-livestatus/mk-livestatus-1.2.0p2.tar.gz | Bin 371580 -> 0 bytes .../mk-livestatus/mk-livestatus-1.2.0p3.tar.gz | Bin 0 -> 371779 bytes 7 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 9c87bb0..2a29e75 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,6 @@ This file documents the revision history for the Open Monitoring Distribution +0.58: + - Check_MK/MK Livestatus: new version 1.2.0p3 0.56 Sep 25 2012 - omd: diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile index 5550259..090811c 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.0p2 +VERSION = 1.2.0p3 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_mk/check_mk-1.2.0p2.tar.gz b/packages/check_mk/check_mk-1.2.0p3.tar.gz similarity index 71% rename from packages/check_mk/check_mk-1.2.0p2.tar.gz rename to packages/check_mk/check_mk-1.2.0p3.tar.gz index 5e9114b..7c4e18d 100644 Binary files a/packages/check_mk/check_mk-1.2.0p2.tar.gz and b/packages/check_mk/check_mk-1.2.0p3.tar.gz differ diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults index 425ec2a..c553322 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.0p2' +check_mk_version = '1.2.0p3' 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 970c822..228ada7 100644 --- a/packages/mk-livestatus/Makefile +++ b/packages/mk-livestatus/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mk-livestatus -VERSION = 1.2.0p2 +VERSION = 1.2.0p3 DIR = $(NAME)-$(VERSION) CONFIGUREOPTS = \ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.0p2.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.0p2.tar.gz deleted file mode 100644 index d89f6d8..0000000 Binary files a/packages/mk-livestatus/mk-livestatus-1.2.0p2.tar.gz and /dev/null differ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.0p3.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.0p3.tar.gz new file mode 100644 index 0000000..ae50a47 Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.0p3.tar.gz differ From git at mathias-kettner.de Fri Oct 5 14:29:49 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 05 Oct 2012 14:29:49 +0200 Subject: [omd-commits] OMD Git: omd: updated changelog Message-ID: <20121005122949.54399842E0C@mail.mathias-kettner.de> Module: omd Branch: master Commit: 880df50334770e3d8d64aab862f899a4d6be9287 URL: http://omdistro.org/projects/omd/repository/revisions/880df50334770e3d8d64aab862f899a4d6be9287 Author: Sven Nierlein Date: Fri Oct 5 14:27:17 2012 +0200 Commiter: Sven Nierlein Date: Fri Oct 5 14:29:43 2012 +0200 updated changelog --- Changelog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Changelog b/Changelog index 2a29e75..2d1e769 100644 --- a/Changelog +++ b/Changelog @@ -18,6 +18,8 @@ This file documents the revision history for the Open Monitoring Distribution - NagVis: Update to 1.7.1 - Icinga: Update to 1.7.2 - Check_MK: Added 1.2.0p2 release + - Shinken: Update to 1.2 + - jmx4perl: Update 1.05 - Support Ubuntu 12.04 (Precise) - set log_initial_states=1 per default From git at mathias-kettner.de Mon Oct 8 16:06:03 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 08 Oct 2012 16:06:03 +0200 Subject: [omd-commits] OMD Git: omd: Apache: Enabling mod_status (if available) for 127.0.0. 1 in own mode Message-ID: <20121008140603.79C14840907@mail.mathias-kettner.de> Module: omd Branch: master Commit: 9527370ea21ded908a16d662b23b402fe4a7d076 URL: http://omdistro.org/projects/omd/repository/revisions/9527370ea21ded908a16d662b23b402fe4a7d076 Author: Lars Michelsen Date: Mon Oct 8 16:06:46 2012 +0200 Commiter: Lars Michelsen Date: Mon Oct 8 16:06:46 2012 +0200 Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode --- Changelog | 1 + packages/apache-omd/skel/etc/apache/apache.conf | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/Changelog b/Changelog index 2d1e769..f950131 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: + - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode - Check_MK/MK Livestatus: new version 1.2.0p3 0.56 Sep 25 2012 diff --git a/packages/apache-omd/skel/etc/apache/apache.conf b/packages/apache-omd/skel/etc/apache/apache.conf index 69532ee..d871f2f 100644 --- a/packages/apache-omd/skel/etc/apache/apache.conf +++ b/packages/apache-omd/skel/etc/apache/apache.conf @@ -116,6 +116,7 @@ LoadModule dir_module ###APACHE_MODULE_DIR###/mod_dir.so LoadModule alias_module ###APACHE_MODULE_DIR###/mod_alias.so LoadModule rewrite_module ###APACHE_MODULE_DIR###/mod_rewrite.so LoadModule cgi_module ###APACHE_MODULE_DIR###/mod_cgi.so +LoadModule status_module /usr/lib/apache2/modules/mod_status.so Options FollowSymLinks @@ -123,6 +124,21 @@ LoadModule cgi_module ###APACHE_MODULE_DIR###/mod_cgi.so # +# Configure mod_status (if available) +# + + + SetHandler server-status + Order deny,allow + Deny from all + Allow from 127.0.0.1 ::1 + + + # Keep track of extended status information for each request + ExtendedStatus On + + +# # The following lines prevent .htaccess and .htpasswd files from being # viewed by Web clients. # From git at mathias-kettner.de Wed Oct 10 08:28:52 2012 From: git at mathias-kettner.de (git version control) Date: Wed, 10 Oct 2012 08:28:52 +0200 Subject: [omd-commits] OMD Git: omd: Apache: Removed hardcoded path from status module load line Message-ID: <20121010062852.6C67B8415F1@mail.mathias-kettner.de> Module: omd Branch: master Commit: f803707777b1424e807a3d81e6b93d9d92f9ae8a URL: http://omdistro.org/projects/omd/repository/revisions/f803707777b1424e807a3d81e6b93d9d92f9ae8a Author: Lars Michelsen Date: Wed Oct 10 08:29:36 2012 +0200 Commiter: Lars Michelsen Date: Wed Oct 10 08:29:36 2012 +0200 Apache: Removed hardcoded path from status module load line --- packages/apache-omd/skel/etc/apache/apache.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/apache-omd/skel/etc/apache/apache.conf b/packages/apache-omd/skel/etc/apache/apache.conf index d871f2f..2041f52 100644 --- a/packages/apache-omd/skel/etc/apache/apache.conf +++ b/packages/apache-omd/skel/etc/apache/apache.conf @@ -116,7 +116,7 @@ LoadModule dir_module ###APACHE_MODULE_DIR###/mod_dir.so LoadModule alias_module ###APACHE_MODULE_DIR###/mod_alias.so LoadModule rewrite_module ###APACHE_MODULE_DIR###/mod_rewrite.so LoadModule cgi_module ###APACHE_MODULE_DIR###/mod_cgi.so -LoadModule status_module /usr/lib/apache2/modules/mod_status.so +LoadModule status_module ###APACHE_MODULE_DIR###/mod_status.so Options FollowSymLinks From git at mathias-kettner.de Thu Oct 11 23:36:24 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 11 Oct 2012 23:36:24 +0200 Subject: [omd-commits] OMD Git: omd: thruk: added cookie based authentication Message-ID: <20121011213624.28F60840C7F@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3b9dc8a9b54c210f576021a99aa7a4411c918fac URL: http://omdistro.org/projects/omd/repository/revisions/3b9dc8a9b54c210f576021a99aa7a4411c918fac Author: Sven Nierlein Date: Sun Sep 30 12:31:44 2012 +0200 Commiter: Sven Nierlein Date: Thu Oct 11 23:35:37 2012 +0200 thruk: added cookie based authentication --- Changelog | 2 + packages/thruk/Makefile | 2 +- packages/thruk/THRUK_COOKIE_AUTH.hook | 44 ++++++++++++++++++++ packages/thruk/Thruk-1.50.tar.gz | Bin 5654326 -> 0 bytes packages/thruk/Thruk-1.52.tar.gz | Bin 0 -> 5669237 bytes .../thruk/patches/0001-skel_adjustments.skel_patch | 15 ++++++- 6 files changed, 60 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index f950131..06f990c 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,7 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: + - Thruk: Update to 1.52 + - 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/thruk/Makefile b/packages/thruk/Makefile index 16badcf..7c635a3 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.50 +VERSION = 1.52 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/THRUK_COOKIE_AUTH.hook b/packages/thruk/THRUK_COOKIE_AUTH.hook new file mode 100755 index 0000000..fa211ba --- /dev/null +++ b/packages/thruk/THRUK_COOKIE_AUTH.hook @@ -0,0 +1,44 @@ +#!/bin/bash + +# Alias: Use thruk cookie auth +# Menu: Web GUI +# Description: +# Thruk provides a cookie based authentication which can be +# used as alternative to the default basic authentication. +# The cookie authentication is done by Thruk but it +# covers all other addons as well. + +case "$1" in + default) + echo "off" + ;; + choices) + echo "on: use cookie authentication" + echo "off: use basic authentication" + ;; + set) + APACHE_CFG=${OMD_ROOT}/etc/apache/conf.d/thruk_cookie_auth.conf + if [ "$2" == "on" ]; then + cat > $APACHE_CFG < + Order allow,deny + Allow from all + Satisfy any + +EOF + else + rm -f $APACHE_CFG + fi + ;; +esac diff --git a/packages/thruk/Thruk-1.50.tar.gz b/packages/thruk/Thruk-1.50.tar.gz deleted file mode 100644 index 6c4eb22..0000000 Binary files a/packages/thruk/Thruk-1.50.tar.gz and /dev/null differ diff --git a/packages/thruk/Thruk-1.52.tar.gz b/packages/thruk/Thruk-1.52.tar.gz new file mode 100644 index 0000000..33f395b Binary files /dev/null and b/packages/thruk/Thruk-1.52.tar.gz differ diff --git a/packages/thruk/patches/0001-skel_adjustments.skel_patch b/packages/thruk/patches/0001-skel_adjustments.skel_patch index f0230d6..eafe46f 100644 --- a/packages/thruk/patches/0001-skel_adjustments.skel_patch +++ b/packages/thruk/patches/0001-skel_adjustments.skel_patch @@ -128,7 +128,18 @@ # execute regular scheduled reports with this nice level #report_nice_level = 5 -@@ -401,42 +402,19 @@ +@@ -390,8 +391,8 @@ + ###################################### + # COOKIE AUTH + ###################################### +-cookie_auth_login_url = thruk/cgi-bin/login.cgi +-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_cache_timeout = 5 + +@@ -412,42 +413,19 @@ ###################################### # Backend Configuration, enter your backends here @@ -184,7 +195,7 @@ -@@ -450,9 +428,9 @@ +@@ -461,9 +439,9 @@ show_plugin_syntax_helper = 1 From git at mathias-kettner.de Sat Oct 13 22:14:47 2012 From: git at mathias-kettner.de (git version control) Date: Sat, 13 Oct 2012 22:14:47 +0200 Subject: [omd-commits] OMD Git: omd: Updated to Jmx4Perl 1.0.6 and added latest Jolokia agents, so that no extra download is required anymore. Message-ID: <20121013201447.6AF82840C5B@mail.mathias-kettner.de> Module: omd Branch: master Commit: 1aafd24f1a082a401d50a0267b26a78b85fb4305 URL: http://omdistro.org/projects/omd/repository/revisions/1aafd24f1a082a401d50a0267b26a78b85fb4305 Author: roland Date: Sat Oct 13 22:12:43 2012 +0200 Commiter: roland Date: Sat Oct 13 22:12:43 2012 +0200 Updated to Jmx4Perl 1.0.6 and added latest Jolokia agents, so that no extra download is required anymore. --- packages/jmx4perl/Makefile | 8 +++++++- packages/jmx4perl/jmx4perl-1.05.tar.gz | Bin 342571 -> 0 bytes packages/jmx4perl/jmx4perl-1.06.tar.gz | Bin 0 -> 347520 bytes .../jmx4perl/jolokia-agents/1.0.5/jolokia-jvm6.jar | Bin 0 -> 301486 bytes .../jmx4perl/jolokia-agents/1.0.5/jolokia-mule.jar | Bin 0 -> 254841 bytes .../jolokia-agents/1.0.5/jolokia-osgi-bundle.jar | Bin 0 -> 1243251 bytes .../jmx4perl/jolokia-agents/1.0.5/jolokia-osgi.jar | Bin 0 -> 281082 bytes packages/jmx4perl/jolokia-agents/1.0.5/jolokia.war | Bin 0 -> 232057 bytes 8 files changed, 7 insertions(+), 1 deletions(-) diff --git a/packages/jmx4perl/Makefile b/packages/jmx4perl/Makefile index c54eb19..8bcc757 100644 --- a/packages/jmx4perl/Makefile +++ b/packages/jmx4perl/Makefile @@ -1,7 +1,8 @@ include ../../Makefile.omd NAME = jmx4perl -VERSION = 1.05 +VERSION = 1.06 +JOLOKIA_VERSION = 1.0.5 DIR = $(NAME)-$(VERSION) .PHONY: skel @@ -33,6 +34,11 @@ install: test -d $(DESTDIR)$(OMD_ROOT)/share/doc/jmx4perl || \ mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/jmx4perl install -m 644 README $(DESTDIR)$(OMD_ROOT)/share/doc/jmx4perl +# Jolokia Agents + rm -rf $(DESTDIR)$(OMD_ROOT)/share/jmx4perl + mkdir -p $(DESTDIR)$(OMD_ROOT)/share/jmx4perl/jolokia-$(JOLOKIA_VERSION) + rsync -a jolokia-agents/$(JOLOKIA_VERSION)/ $(DESTDIR)$(OMD_ROOT)/share/jmx4perl/jolokia-$(JOLOKIA_VERSION)/ + chmod 644 $(DESTDIR)$(OMD_ROOT)/share/jmx4perl/jolokia-$(JOLOKIA_VERSION)/* skel: diff --git a/packages/jmx4perl/jmx4perl-1.05.tar.gz b/packages/jmx4perl/jmx4perl-1.05.tar.gz deleted file mode 100644 index d250a44..0000000 Binary files a/packages/jmx4perl/jmx4perl-1.05.tar.gz and /dev/null differ diff --git a/packages/jmx4perl/jmx4perl-1.06.tar.gz b/packages/jmx4perl/jmx4perl-1.06.tar.gz new file mode 100644 index 0000000..8a227b0 Binary files /dev/null and b/packages/jmx4perl/jmx4perl-1.06.tar.gz 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 new file mode 100644 index 0000000..7a0e192 Binary files /dev/null and b/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-jvm6.jar 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 new file mode 100644 index 0000000..747fd60 Binary files /dev/null and b/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-mule.jar 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 new file mode 100644 index 0000000..6b4dd76 Binary files /dev/null and b/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-osgi-bundle.jar 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 new file mode 100644 index 0000000..c224739 Binary files /dev/null and b/packages/jmx4perl/jolokia-agents/1.0.5/jolokia-osgi.jar differ diff --git a/packages/jmx4perl/jolokia-agents/1.0.5/jolokia.war b/packages/jmx4perl/jolokia-agents/1.0.5/jolokia.war new file mode 100644 index 0000000..946787c Binary files /dev/null and b/packages/jmx4perl/jolokia-agents/1.0.5/jolokia.war differ From git at mathias-kettner.de Tue Oct 16 16:32:11 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 16 Oct 2012 16:32:11 +0200 Subject: [omd-commits] OMD Git: omd: OpenSUSE 12.1: add python to OS dependencies, Message-ID: <20121016143211.737C484085D@mail.mathias-kettner.de> since this is not included in the minimal installation User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: omd Branch: master Commit: 42123a07ea06574d96c819d280e00df32cd4a434 URL: http://omdistro.org/projects/omd/repository/revisions/42123a07ea06574d96c819d280e00df32cd4a434 Author: Mathias Kettner Date: Tue Oct 16 16:31:53 2012 +0200 Commiter: Mathias Kettner Date: Tue Oct 16 16:31:53 2012 +0200 OpenSUSE 12.1: add python to OS dependencies, since this is not included in the minimal installation --- distros/Makefile.OPENSUSE_12.1 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/distros/Makefile.OPENSUSE_12.1 b/distros/Makefile.OPENSUSE_12.1 index 5295782..65b2a91 100644 --- a/distros/Makefile.OPENSUSE_12.1 +++ b/distros/Makefile.OPENSUSE_12.1 @@ -63,6 +63,7 @@ OS_PACKAGES += samba-client OS_PACKAGES += unzip OS_PACKAGES += xinetd OS_PACKAGES += xorg-x11-fonts +OS_PACKAGES += python USERADD_OPTIONS = -M ADD_USER_TO_GROUP = groupmod -A %(user)s %(group)s PACKAGE_INSTALL = zypper -n refresh ; zypper install -n From git at mathias-kettner.de Tue Oct 16 16:32:11 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 16 Oct 2012 16:32:11 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of ssh://mathias-kettner.de/omd Message-ID: <20121016143211.EC03084051C@mail.mathias-kettner.de> Module: omd Branch: master Commit: 69f72c4d32d7b9293a0b84fc192198d947a8916d URL: http://omdistro.org/projects/omd/repository/revisions/69f72c4d32d7b9293a0b84fc192198d947a8916d Author: Mathias Kettner Date: Tue Oct 16 16:32:09 2012 +0200 Commiter: Mathias Kettner Date: Tue Oct 16 16:32:09 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/omd --- From git at mathias-kettner.de Thu Oct 18 13:10:56 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 18 Oct 2012 13:10:56 +0200 Subject: [omd-commits] OMD Git: omd: Updated changelog Message-ID: <20121018111056.BBF62840983@mail.mathias-kettner.de> Module: omd Branch: master Commit: a2a53580f2e2c4bf659ac5096c603b610dd221ff URL: http://omdistro.org/projects/omd/repository/revisions/a2a53580f2e2c4bf659ac5096c603b610dd221ff Author: Lars Michelsen Date: Thu Oct 18 13:11:11 2012 +0200 Commiter: Lars Michelsen Date: Thu Oct 18 13:11:11 2012 +0200 Updated changelog --- Changelog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Changelog b/Changelog index 06f990c..5038f04 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,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.0p3 + - NagVis: Update to 1.7.2 0.56 Sep 25 2012 - omd: From git at mathias-kettner.de Thu Oct 18 13:10:56 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 18 Oct 2012 13:10:56 +0200 Subject: [omd-commits] OMD Git: omd: Updated nagvis to 1.7.2 Message-ID: <20121018111056.E4F128406A1@mail.mathias-kettner.de> Module: omd Branch: master Commit: df9a7a381ad5bd7b96a849ff5f4790d366e91bd7 URL: http://omdistro.org/projects/omd/repository/revisions/df9a7a381ad5bd7b96a849ff5f4790d366e91bd7 Author: Lars Michelsen Date: Thu Oct 18 13:10:48 2012 +0200 Commiter: Lars Michelsen Date: Thu Oct 18 13:10:48 2012 +0200 Updated nagvis to 1.7.2 --- packages/nagvis/Makefile | 2 +- packages/nagvis/nagvis-1.7-nightly.tar.gz | Bin 3488328 -> 0 bytes .../{nagvis-1.7.1.tar.gz => nagvis-1.7.2.tar.gz} | Bin 3488146 -> 3488966 bytes packages/nagvis/update-nagvis | 5 ++++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile index a5adb10..5c1c3d3 100644 --- a/packages/nagvis/Makefile +++ b/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.7-nightly +VERSION = 1.7.2 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/nagvis/nagvis-1.7-nightly.tar.gz b/packages/nagvis/nagvis-1.7-nightly.tar.gz deleted file mode 100644 index 76845b8..0000000 Binary files a/packages/nagvis/nagvis-1.7-nightly.tar.gz and /dev/null differ diff --git a/packages/nagvis/nagvis-1.7.1.tar.gz b/packages/nagvis/nagvis-1.7.2.tar.gz similarity index 54% rename from packages/nagvis/nagvis-1.7.1.tar.gz rename to packages/nagvis/nagvis-1.7.2.tar.gz index 5e1ff7e..b2d620d 100644 Binary files a/packages/nagvis/nagvis-1.7.1.tar.gz and b/packages/nagvis/nagvis-1.7.2.tar.gz differ diff --git a/packages/nagvis/update-nagvis b/packages/nagvis/update-nagvis index 31025c3..87df78a 100755 --- a/packages/nagvis/update-nagvis +++ b/packages/nagvis/update-nagvis @@ -2,13 +2,16 @@ if [ "$1" = "nightly" ]; then VERSION=1.7-nightly echo "Adding current nightly build..." + git rm nagvis-*.tar.gz wget -O nagvis-$VERSION.tar.gz http://www.nagvis.org/share/nagvis-$VERSION.tar.gz else - VERSION=$(wget -O - http://nagvis.org/stable_release.php 2>/dev/null) + VERSION=$(wget -O - http://www.nagvis.org/stable_release.php 2>/dev/null) [ -z "$VERSION" ] && echo "ERROR: Got no version." && exit 1 + git rm nagvis-*.tar.gz echo "Adding current VERSION ($VERSION)..." wget -O nagvis-$VERSION.tar.gz https://sourceforge.net/projects/nagvis/files/NagVis%20${VERSION%.*}/nagvis-$VERSION.tar.gz/download 2>/dev/null fi +git add nagvis-$VERSION.tar.gz sed -i "s/^VERSION = .*$/VERSION = $VERSION/g" Makefile exit 0 From git at mathias-kettner.de Mon Oct 22 16:56:42 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 22 Oct 2012 16:56:42 +0200 Subject: [omd-commits] OMD Git: omd: thruk: update 1.54 Message-ID: <20121022145642.460B68414DB@mail.mathias-kettner.de> Module: omd Branch: master Commit: 5af8868eca703e25d9aa9e050f2804525c13efec URL: http://omdistro.org/projects/omd/repository/revisions/5af8868eca703e25d9aa9e050f2804525c13efec Author: Sven Nierlein Date: Mon Oct 22 16:56:23 2012 +0200 Commiter: Sven Nierlein Date: Mon Oct 22 16:56:23 2012 +0200 thruk: update 1.54 --- Changelog | 2 +- packages/thruk/Makefile | 2 +- packages/thruk/Thruk-1.52.tar.gz | Bin 5669237 -> 0 bytes packages/thruk/Thruk-1.54.tar.gz | Bin 0 -> 5668954 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 5038f04..a4e9be1 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,6 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: - - Thruk: Update to 1.52 + - Thruk: Update to 1.54 - 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/thruk/Makefile b/packages/thruk/Makefile index 7c635a3..cc72cca 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.52 +VERSION = 1.54 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/Thruk-1.52.tar.gz b/packages/thruk/Thruk-1.52.tar.gz deleted file mode 100644 index 33f395b..0000000 Binary files a/packages/thruk/Thruk-1.52.tar.gz and /dev/null differ diff --git a/packages/thruk/Thruk-1.54.tar.gz b/packages/thruk/Thruk-1.54.tar.gz new file mode 100644 index 0000000..edaf2c8 Binary files /dev/null and b/packages/thruk/Thruk-1.54.tar.gz differ From git at mathias-kettner.de Wed Oct 24 09:34:02 2012 From: git at mathias-kettner.de (git version control) Date: Wed, 24 Oct 2012 09:34:02 +0200 Subject: [omd-commits] OMD Git: omd: xinetd: fix bug when more than one xinetd file is present Message-ID: <20121024073402.44BE78409A1@mail.mathias-kettner.de> Module: omd Branch: master Commit: 903ad1e640376751f37d9cf2778beb9b196aa10d URL: http://omdistro.org/projects/omd/repository/revisions/903ad1e640376751f37d9cf2778beb9b196aa10d Author: Mathias Kettner Date: Wed Oct 24 09:33:56 2012 +0200 Commiter: Mathias Kettner Date: Wed Oct 24 09:33:56 2012 +0200 xinetd: fix bug when more than one xinetd file is present --- packages/omd/skel/etc/init.d/xinetd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/omd/skel/etc/init.d/xinetd b/packages/omd/skel/etc/init.d/xinetd index f4c6784..370055a 100644 --- a/packages/omd/skel/etc/init.d/xinetd +++ b/packages/omd/skel/etc/init.d/xinetd @@ -3,7 +3,7 @@ # Start only if at least on xinetd based service # is activated -test -e ###ROOT###/etc/xinetd.d/* || exit 5 +test "$(ls -A ###ROOT###/etc/xinetd.d/)" || exit 5 PIDFILE=###ROOT###/tmp/run/xinetd.pid DAEMON=/usr/sbin/xinetd From git at mathias-kettner.de Fri Oct 26 10:44:18 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 26 Oct 2012 10:44:18 +0200 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.7.5.1 Message-ID: <20121026084418.DA3718409A1@mail.mathias-kettner.de> Module: omd Branch: master Commit: 4d9e5658ec9edfe615201392e723203b12424d19 URL: http://omdistro.org/projects/omd/repository/revisions/4d9e5658ec9edfe615201392e723203b12424d19 Author: Gerhard Lausser Date: Fri Oct 26 10:43:23 2012 +0200 Commiter: Gerhard Lausser Date: Fri Oct 26 10:43:23 2012 +0200 check_oracle_health: update to 1.7.5.1 --- packages/check_oracle_health/Makefile | 2 +- .../check_oracle_health-1.7.5.1.tar.gz | Bin 0 -> 142712 bytes .../check_oracle_health-1.7.5.tar.gz | Bin 142642 -> 0 bytes 3 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index 7515eb6..8f219e0 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 +VERSION = 1.7.5.1 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.7.5.1.tar.gz b/packages/check_oracle_health/check_oracle_health-1.7.5.1.tar.gz new file mode 100644 index 0000000..b5af98d Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.7.5.1.tar.gz differ diff --git a/packages/check_oracle_health/check_oracle_health-1.7.5.tar.gz b/packages/check_oracle_health/check_oracle_health-1.7.5.tar.gz deleted file mode 100644 index 05cf1c0..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.7.5.tar.gz and /dev/null differ From git at mathias-kettner.de Fri Oct 26 15:37:56 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 26 Oct 2012 15:37:56 +0200 Subject: [omd-commits] OMD Git: omd: thruk: reduce cookies Message-ID: <20121026133756.7CA1E8409A1@mail.mathias-kettner.de> Module: omd Branch: master Commit: 91ca9c60767fcc3d285d61663298402b933e74db URL: http://omdistro.org/projects/omd/repository/revisions/91ca9c60767fcc3d285d61663298402b933e74db Author: Sven Nierlein Date: Fri Oct 26 15:37:14 2012 +0200 Commiter: Sven Nierlein Date: Fri Oct 26 15:37:14 2012 +0200 thruk: reduce cookies --- packages/thruk/THRUK_COOKIE_AUTH.hook | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/thruk/THRUK_COOKIE_AUTH.hook b/packages/thruk/THRUK_COOKIE_AUTH.hook index fa211ba..387ecea 100755 --- a/packages/thruk/THRUK_COOKIE_AUTH.hook +++ b/packages/thruk/THRUK_COOKIE_AUTH.hook @@ -23,9 +23,10 @@ case "$1" in RewriteLock "\${OMD_ROOT}/var/thruk/apache_rewrite.lock" RewriteMap users prg:\${OMD_ROOT}/share/thruk/script/thruk_auth -# make all cookies accessible by the url +# make cookie accessible by the url RewriteCond %{REQUEST_URI} !^/\${OMD_SITE}/thruk/cgi-bin/restricted.cgi -RewriteRule ^/(.*)$ /%{HTTP_COOKIE}/%{REMOTE_ADDR}/____/\$1 [C,NS] +RewriteCond %{HTTP_COOKIE} (thruk_auth=[^;]+|$) [NC] +RewriteRule ^/(.*)$ /%1/%{REMOTE_ADDR}/____/\$1 [C,NS] RewriteRule ^(.*)$ \${users:\$1|/loginbad/} [C,NS] RewriteRule ^/pass/(.*)$ /\$1 [NS,PT,L,E=!REMOTE_USER] RewriteRule ^/redirect/(.*)$ /\$1 [NS,L,R=302] From git at mathias-kettner.de Sun Oct 28 14:11:59 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 28 Oct 2012 14:11:59 +0100 Subject: [omd-commits] OMD Git: omd: Icinga: Update to 1.8.1 Message-ID: <20121028131159.8E7EF8409AE@mail.mathias-kettner.de> Module: omd Branch: master Commit: 310190dd740994c9fafb4f575f414b8d16019e5c URL: http://omdistro.org/projects/omd/repository/revisions/310190dd740994c9fafb4f575f414b8d16019e5c Author: Joerg Linge Date: Sun Oct 28 14:11:13 2012 +0100 Commiter: Joerg Linge Date: Sun Oct 28 14:11:13 2012 +0100 Icinga: Update to 1.8.1 --- Changelog | 1 + packages/icinga/.gitignore | 2 +- packages/icinga/Makefile | 10 +++++----- packages/icinga/icinga-1.7.2.tar.gz | Bin 12946623 -> 0 bytes packages/icinga/icinga-1.8.1.tar.gz | Bin 0 -> 7543668 bytes packages/icinga/skel/etc/icinga/icinga.d/misc.cfg | 14 ++++++++++++-- .../icinga/skel/etc/icinga/icinga.d/timing.cfg | 14 +++++++++++++- 7 files changed, 32 insertions(+), 9 deletions(-) diff --git a/Changelog b/Changelog index a4e9be1..67c2144 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ This file documents the revision history for the Open Monitoring Distribution 0.58: + - Icinga: Update to 1.8.1 - Thruk: Update to 1.54 - added cookie based login - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode diff --git a/packages/icinga/.gitignore b/packages/icinga/.gitignore index 1878925..96f8091 100644 --- a/packages/icinga/.gitignore +++ b/packages/icinga/.gitignore @@ -1 +1 @@ -icinga-1.7.? +icinga-1.?.? diff --git a/packages/icinga/Makefile b/packages/icinga/Makefile index f7316c0..4a20e39 100644 --- a/packages/icinga/Makefile +++ b/packages/icinga/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = icinga -VERSION = 1.7.2 +VERSION = 1.8.1 DIR = $(NAME)-$(VERSION) # Configure options for Icinga. Since we want to compile @@ -23,10 +23,10 @@ CONFIGUREOPTS = \ build: tar xzf $(DIR).tar.gz - set -e ; for p in patches/*.dif ; do \ - echo "applying $$p..." ; \ - ( cd $(DIR) ; patch -p1 -b ) < $$p ; \ - done +# set -e ; for p in patches/*.dif ; do \ +# echo "applying $$p..." ; \ +# ( cd $(DIR) ; patch -p1 -b ) < $$p ; \ +# done cd $(DIR) ; ./configure $(CONFIGUREOPTS) $(MAKE) -C $(DIR) all diff --git a/packages/icinga/icinga-1.7.2.tar.gz b/packages/icinga/icinga-1.7.2.tar.gz deleted file mode 100644 index 7fa0cdb..0000000 Binary files a/packages/icinga/icinga-1.7.2.tar.gz and /dev/null differ diff --git a/packages/icinga/icinga-1.8.1.tar.gz b/packages/icinga/icinga-1.8.1.tar.gz new file mode 100644 index 0000000..fe5ade1 Binary files /dev/null and b/packages/icinga/icinga-1.8.1.tar.gz differ diff --git a/packages/icinga/skel/etc/icinga/icinga.d/misc.cfg b/packages/icinga/skel/etc/icinga/icinga.d/misc.cfg index 9cfdf08..2537d23 100644 --- a/packages/icinga/skel/etc/icinga/icinga.d/misc.cfg +++ b/packages/icinga/skel/etc/icinga/icinga.d/misc.cfg @@ -162,5 +162,15 @@ illegal_object_name_chars=`~!$%^&*|'"<>?,()= illegal_macro_output_chars=`~$&|'"<> - - +# KEEP UNKNOWN MACROS +# This option can be used to keep unknown macros within the output. +# e.g. check_proc -C $foo$ will remain. +# This was the default in versions older than Icinga 1.8, but now +# the default is to remove those macros from the output, causing +# the shell to interpret $foo and leaving a single $ there. See +# #2291 for further information. +# Make sure to escape single dollar signs with another '$', as the +# docs describe. Other than that, enable this setting to revert to +# the old behaviour. + +keep_unknown_macros=0 diff --git a/packages/icinga/skel/etc/icinga/icinga.d/timing.cfg b/packages/icinga/skel/etc/icinga/icinga.d/timing.cfg index a0b8f7d..848eed7 100644 --- a/packages/icinga/skel/etc/icinga/icinga.d/timing.cfg +++ b/packages/icinga/skel/etc/icinga/icinga.d/timing.cfg @@ -164,4 +164,16 @@ auto_rescheduling_interval=30 auto_rescheduling_window=180 - +# MAX CHECK RESULT LIST ITEMS !!EXPERIMENTAL!! +# This experimental option allows you to set the max number of items +# the checkresult reaper will put onto the checkresult list for further +# processing by the core. If there are too many, the reaping will be +# terminated early, allowing the core to process the results sooner. +# On larger setups, that list might grow too much, and decrease +# performance on processing. You might experiment with that value, the +# inner core default is set to 0, disabling that feature. +# Values: +# 0 = Disable max check result list items +# number = set max check result list items + +#max_check_result_list_items=1024