From git at mathias-kettner.de Mon Jun 2 16:25:41 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 02 Jun 2014 16:25:41 +0200 Subject: [omd-commits] OMD Git: omd: add a wrapper for logrotate to fool the system logrotate' s checkproc Message-ID: <20140602142541.7D9C580705@mail.mathias-kettner.de> Module: omd Branch: master Commit: 8213bc41c69c2b64d29e2b3ad172b322d6fb27d2 URL: http://omdistro.org/projects/omd/repository/revisions/8213bc41c69c2b64d29e2b3ad172b322d6fb27d2 Author: Gerhard Lausser Date: Mon Jun 2 16:25:27 2014 +0200 Commiter: Gerhard Lausser Date: Mon Jun 2 16:25:27 2014 +0200 add a wrapper for logrotate to fool the system logrotate's checkproc --- packages/maintenance/Makefile | 2 +- packages/maintenance/logrotate | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/packages/maintenance/Makefile b/packages/maintenance/Makefile index e269b45..14c3c90 100644 --- a/packages/maintenance/Makefile +++ b/packages/maintenance/Makefile @@ -10,7 +10,7 @@ install: mkdir -p $(DESTDIR)$(OMD_ROOT)/bin install -m 755 merge-crontabs $(DESTDIR)$(OMD_ROOT)/bin install -m 755 diskspace $(DESTDIR)$(OMD_ROOT)/bin - ln -sf /usr/sbin/logrotate $(DESTDIR)$(OMD_ROOT)/bin/logrotate + install -m 755 logrotate $(DESTDIR)$(OMD_ROOT)/bin # Create directory for the diskspace plugin mkdir -p $(DESTDIR)$(OMD_ROOT)/share/diskspace diff --git a/packages/maintenance/logrotate b/packages/maintenance/logrotate new file mode 100755 index 0000000..41a860a --- /dev/null +++ b/packages/maintenance/logrotate @@ -0,0 +1,23 @@ +#! /bin/sh + +# +# Whenever /etc/cron.daily/logrotate starts to run under a SLES system, +# it first calls checkproc to make sure that there is no other logrotate +# process already running. +# Under rare circumstances (system-logrotate running at midnight) +# the omd-logrotate can be such a rival process. If it is the first to run +# (even a few microseconds before /etc/cron.daily/logrotate is launched) +# there will be no more rotation of the logs in /var/log/apache. +# In a heavily used OMD-system the /var-partition will be filled up very +# quickly. +# checkproc is symlink-aware, so we need to run our own copy of logrotate. +# + +SBIN_LOGROTATE=/usr/sbin/logrotate +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 + cp -f $SBIN_LOGROTATE $LOCAL_LOGROTATE +fi +$LOCAL_LOGROTATE $@ From git at mathias-kettner.de Thu Jun 5 16:15:54 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 05 Jun 2014 16:15:54 +0200 Subject: [omd-commits] OMD Git: omd: PNP4Nagios: Update to 0.6.22 Message-ID: <20140605141554.D1A59805EF@mail.mathias-kettner.de> Module: omd Branch: master Commit: 57e40f4a256b7ed7281e9d8bf905f412712e39be URL: http://omdistro.org/projects/omd/repository/revisions/57e40f4a256b7ed7281e9d8bf905f412712e39be Author: Joerg Linge Date: Thu Jun 5 15:59:11 2014 +0200 Commiter: Joerg Linge Date: Thu Jun 5 15:59:11 2014 +0200 PNP4Nagios: Update to 0.6.22 --- Changelog | 1 + packages/pnp4nagios/Makefile | 2 +- packages/pnp4nagios/pnp4nagios-0.6.21.tar.gz | Bin 2917588 -> 0 bytes packages/pnp4nagios/pnp4nagios-0.6.22.tar.gz | Bin 0 -> 2919668 bytes 4 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index f913c13..59d55a0 100644 --- a/Changelog +++ b/Changelog @@ -19,6 +19,7 @@ This file documents the revision history for the Open Monitoring Distribution exit codes of 3 when diskspace cleanup has not been configured - Check_MK/MK Livestatus: new version 1.2.4 - Thruk: Update to 1.84-3 + - PNP4Nagios: Update to 0.6.22 - Dokuwiki: Fixed integration with multisite cookie authentication - Added build support for Ubuntu 14.04 diff --git a/packages/pnp4nagios/Makefile b/packages/pnp4nagios/Makefile index 64c0c5c..8564857 100644 --- a/packages/pnp4nagios/Makefile +++ b/packages/pnp4nagios/Makefile @@ -3,7 +3,7 @@ include ../../Makefile.omd .PHONY: skel NAME = pnp4nagios -VERSION = 0.6.21 +VERSION = 0.6.22 DIR = $(NAME)-$(VERSION) # Unset CONFIG_SITE CONFIG_SITE = '' diff --git a/packages/pnp4nagios/pnp4nagios-0.6.21.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.21.tar.gz deleted file mode 100644 index d7808d0..0000000 Binary files a/packages/pnp4nagios/pnp4nagios-0.6.21.tar.gz and /dev/null differ diff --git a/packages/pnp4nagios/pnp4nagios-0.6.22.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.22.tar.gz new file mode 100644 index 0000000..9733f7f Binary files /dev/null and b/packages/pnp4nagios/pnp4nagios-0.6.22.tar.gz differ From git at mathias-kettner.de Thu Jun 5 17:32:22 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 05 Jun 2014 17:32:22 +0200 Subject: [omd-commits] OMD Git: omd: Icinga: Update to 1.11.4 Message-ID: <20140605153222.3EED2805FD@mail.mathias-kettner.de> Module: omd Branch: master Commit: 1dfc5b2b8450acb11d29eabb8e085cf3a5269bdf URL: http://omdistro.org/projects/omd/repository/revisions/1dfc5b2b8450acb11d29eabb8e085cf3a5269bdf Author: Joerg Linge Date: Thu Jun 5 17:31:45 2014 +0200 Commiter: Joerg Linge Date: Thu Jun 5 17:31:45 2014 +0200 Icinga: Update to 1.11.4 --- Changelog | 1 + packages/icinga/Makefile | 14 +-- .../{icinga-1.9.1.tar.gz => icinga-1.11.4.tar.gz} | Bin 17075758 -> 18657247 bytes .../patches/0001-do-not-copy-brokermodules.dif | 126 ++++++++++++++++++++ .../icinga/patches/0001-epn-fix-issue-3027.dif | 11 -- packages/icinga/skel/etc/icinga/cgi.cfg | 60 ++++++++++ 6 files changed, 194 insertions(+), 18 deletions(-) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=1dfc5b2b8450acb11d29eabb8e085cf3a5269bdf From git at mathias-kettner.de Thu Jun 5 18:27:41 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 05 Jun 2014 18:27:41 +0200 Subject: [omd-commits] OMD Git: omd: Icinga: disable csrf protection Message-ID: <20140605162741.BBE75805E0@mail.mathias-kettner.de> Module: omd Branch: master Commit: d8a559ab8e430881a4122d311acfe392f7eb4bbf URL: http://omdistro.org/projects/omd/repository/revisions/d8a559ab8e430881a4122d311acfe392f7eb4bbf Author: Joerg Linge Date: Thu Jun 5 18:27:14 2014 +0200 Commiter: Joerg Linge Date: Thu Jun 5 18:27:14 2014 +0200 Icinga: disable csrf protection --- packages/icinga/.gitignore | 2 +- packages/icinga/skel/etc/icinga/cgi.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/icinga/.gitignore b/packages/icinga/.gitignore index 96f8091..3fffb80 100644 --- a/packages/icinga/.gitignore +++ b/packages/icinga/.gitignore @@ -1 +1 @@ -icinga-1.?.? +icinga-1.??.? diff --git a/packages/icinga/skel/etc/icinga/cgi.cfg b/packages/icinga/skel/etc/icinga/cgi.cfg index ec9e2f3..f4f4156 100644 --- a/packages/icinga/skel/etc/icinga/cgi.cfg +++ b/packages/icinga/skel/etc/icinga/cgi.cfg @@ -692,7 +692,7 @@ show_partial_servicegroups=0 # command (via external program) will be rejected. # The default is 0 (protection is on). -disable_cmd_cgi_csrf_protection=0 +disable_cmd_cgi_csrf_protection=1 From git at mathias-kettner.de Fri Jun 6 15:18:32 2014 From: git at mathias-kettner.de (git version control) Date: Fri, 06 Jun 2014 15:18:32 +0200 Subject: [omd-commits] OMD Git: omd: check_logfiles: 3.6.2.1 Message-ID: <20140606131833.091A180660@mail.mathias-kettner.de> Module: omd Branch: master Commit: adca22f2ac09464e789c5a507029f7d8e2b476d9 URL: http://omdistro.org/projects/omd/repository/revisions/adca22f2ac09464e789c5a507029f7d8e2b476d9 Author: Gerhard Lausser Date: Fri Jun 6 15:13:33 2014 +0200 Commiter: Gerhard Lausser Date: Fri Jun 6 15:13:33 2014 +0200 check_logfiles: 3.6.2.1 --- packages/check_logfiles/Makefile | 2 +- packages/check_logfiles/check_logfiles-3.6.1.tar.gz | Bin 226826 -> 0 bytes packages/check_logfiles/check_logfiles-3.6.2.1.tar.gz | Bin 0 -> 224958 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_logfiles/Makefile b/packages/check_logfiles/Makefile index b4e2b60..efd1e41 100644 --- a/packages/check_logfiles/Makefile +++ b/packages/check_logfiles/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_logfiles -VERSION = 3.6.1 +VERSION = 3.6.2.1 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_logfiles/check_logfiles-3.6.1.tar.gz b/packages/check_logfiles/check_logfiles-3.6.1.tar.gz deleted file mode 100644 index 4451b0b..0000000 Binary files a/packages/check_logfiles/check_logfiles-3.6.1.tar.gz and /dev/null differ diff --git a/packages/check_logfiles/check_logfiles-3.6.2.1.tar.gz b/packages/check_logfiles/check_logfiles-3.6.2.1.tar.gz new file mode 100644 index 0000000..1e86719 Binary files /dev/null and b/packages/check_logfiles/check_logfiles-3.6.2.1.tar.gz differ From git at mathias-kettner.de Fri Jun 6 15:18:32 2014 From: git at mathias-kettner.de (git version control) Date: Fri, 06 Jun 2014 15:18:32 +0200 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.9.4 Message-ID: <20140606131833.25405805D9@mail.mathias-kettner.de> Module: omd Branch: master Commit: aa2680e63bbcba484622bb941eae2f7fad59cd60 URL: http://omdistro.org/projects/omd/repository/revisions/aa2680e63bbcba484622bb941eae2f7fad59cd60 Author: Gerhard Lausser Date: Fri Jun 6 15:11:50 2014 +0200 Commiter: Gerhard Lausser Date: Fri Jun 6 15:11:50 2014 +0200 check_oracle_health: update to 1.9.4 --- packages/check_oracle_health/Makefile | 2 +- packages/check_oracle_health/check_oracle_health-1.9.3.7.tar.gz | Bin 161702 -> 0 bytes packages/check_oracle_health/check_oracle_health-1.9.4.tar.gz | Bin 0 -> 162232 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index a910a8a..3d2699c 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.9.3.7 +VERSION = 1.9.4 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.7.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.7.tar.gz deleted file mode 100644 index cf70ec1..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.3.7.tar.gz and /dev/null differ diff --git a/packages/check_oracle_health/check_oracle_health-1.9.4.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.4.tar.gz new file mode 100644 index 0000000..630f22f Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.9.4.tar.gz differ From git at mathias-kettner.de Fri Jun 6 15:18:32 2014 From: git at mathias-kettner.de (git version control) Date: Fri, 06 Jun 2014 15:18:32 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140606131833.3DC01805D1@mail.mathias-kettner.de> Module: omd Branch: master Commit: 1ad8c233f3d6d3498564534f90fc9058ec2c566c URL: http://omdistro.org/projects/omd/repository/revisions/1ad8c233f3d6d3498564534f90fc9058ec2c566c Author: Gerhard Lausser Date: Fri Jun 6 15:14:54 2014 +0200 Commiter: Gerhard Lausser Date: Fri Jun 6 15:14:54 2014 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Sun Jun 8 00:16:12 2014 From: git at mathias-kettner.de (git version control) Date: Sun, 08 Jun 2014 00:16:12 +0200 Subject: [omd-commits] OMD Git: omd: check_mysql_health: make configure; make more robust against missing aclocal-1.14 Message-ID: <20140607221612.76AAE806F5@mail.mathias-kettner.de> Module: omd Branch: master Commit: b530802b3e68adf72f4d4372fda63325cd349114 URL: http://omdistro.org/projects/omd/repository/revisions/b530802b3e68adf72f4d4372fda63325cd349114 Author: Gerhard Lausser Date: Sun Jun 8 00:15:50 2014 +0200 Commiter: Gerhard Lausser Date: Sun Jun 8 00:15:50 2014 +0200 check_mysql_health: make configure;make more robust against missing aclocal-1.14 --- packages/check_mysql_health/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/check_mysql_health/Makefile b/packages/check_mysql_health/Makefile index 160d95a..b6eba49 100644 --- a/packages/check_mysql_health/Makefile +++ b/packages/check_mysql_health/Makefile @@ -13,6 +13,9 @@ CONFIGUREOPTS = "" build: tar xzf $(DIR).tar.gz + for i in configure.ac aclocal.m4 configure Makefile.am Makefile.in ; do \ + test -f $(DIR)/$$i && touch $(DIR)/$$i ; \ + done cd $(DIR) ; ./configure $(CONFIGUREOPTS) $(MAKE) -C $(DIR) From git at mathias-kettner.de Sun Jun 8 00:16:12 2014 From: git at mathias-kettner.de (git version control) Date: Sun, 08 Jun 2014 00:16:12 +0200 Subject: [omd-commits] OMD Git: omd: check_oracle_health: make configure; make more robust against missing aclocal-1.14 Message-ID: <20140607221612.A5EC4806F3@mail.mathias-kettner.de> Module: omd Branch: master Commit: 045fef3cc609b5fe99db593328b5b608630b2027 URL: http://omdistro.org/projects/omd/repository/revisions/045fef3cc609b5fe99db593328b5b608630b2027 Author: Gerhard Lausser Date: Sun Jun 8 00:15:50 2014 +0200 Commiter: Gerhard Lausser Date: Sun Jun 8 00:15:50 2014 +0200 check_oracle_health: make configure;make more robust against missing aclocal-1.14 --- packages/check_oracle_health/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index 3d2699c..8a01029 100644 --- a/packages/check_oracle_health/Makefile +++ b/packages/check_oracle_health/Makefile @@ -13,6 +13,9 @@ CONFIGUREOPTS = "" build: tar xzf $(DIR).tar.gz + for i in configure.ac aclocal.m4 configure Makefile.am Makefile.in ; do \ + test -f $(DIR)/$$i && touch $(DIR)/$$i ; \ + done cd $(DIR) ; ./configure $(CONFIGUREOPTS) $(MAKE) -C $(DIR) From git at mathias-kettner.de Sun Jun 8 00:16:12 2014 From: git at mathias-kettner.de (git version control) Date: Sun, 08 Jun 2014 00:16:12 +0200 Subject: [omd-commits] OMD Git: omd: check_logfiles: make configure; make more robust against missing aclocal-1.14 Message-ID: <20140607221612.8B499806F4@mail.mathias-kettner.de> Module: omd Branch: master Commit: 40c01fd437e8c505cdd0403563ad42fba106eaea URL: http://omdistro.org/projects/omd/repository/revisions/40c01fd437e8c505cdd0403563ad42fba106eaea Author: Gerhard Lausser Date: Sun Jun 8 00:15:50 2014 +0200 Commiter: Gerhard Lausser Date: Sun Jun 8 00:15:50 2014 +0200 check_logfiles: make configure;make more robust against missing aclocal-1.14 --- packages/check_logfiles/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/check_logfiles/Makefile b/packages/check_logfiles/Makefile index efd1e41..5e9ba54 100644 --- a/packages/check_logfiles/Makefile +++ b/packages/check_logfiles/Makefile @@ -13,6 +13,9 @@ CONFIGUREOPTS = "" build: tar xzf $(DIR).tar.gz + for i in configure.ac aclocal.m4 configure Makefile.am Makefile.in ; do \ + test -f $(DIR)/$$i && touch $(DIR)/$$i ; \ + done cd $(DIR) ; ./configure $(CONFIGUREOPTS) $(MAKE) -C $(DIR) From git at mathias-kettner.de Wed Jun 11 15:07:45 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 11 Jun 2014 15:07:45 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140611130745.1F07F80727@mail.mathias-kettner.de> Module: omd Branch: master Commit: 75eea1c55a22090299126f3213660f0c19183987 URL: http://omdistro.org/projects/omd/repository/revisions/75eea1c55a22090299126f3213660f0c19183987 Author: Lars Michelsen Date: Wed Jun 11 15:07:39 2014 +0200 Commiter: Lars Michelsen Date: Wed Jun 11 15:07:39 2014 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Wed Jun 11 15:07:45 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 11 Jun 2014 15:07:45 +0200 Subject: [omd-commits] OMD Git: omd: nagvis: Updated build Message-ID: <20140611130745.37ABE80726@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7910524e59c8e129a0c7cd495455e620b2e41759 URL: http://omdistro.org/projects/omd/repository/revisions/7910524e59c8e129a0c7cd495455e620b2e41759 Author: Lars Michelsen Date: Wed Jun 11 15:07:27 2014 +0200 Commiter: Lars Michelsen Date: Wed Jun 11 15:07:27 2014 +0200 nagvis: Updated build --- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1444359 -> 1483187 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz index 73419aa..60caf82 100644 Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ From git at mathias-kettner.de Thu Jun 12 11:38:15 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 12 Jun 2014 11:38:15 +0200 Subject: [omd-commits] OMD Git: omd: check_mysql_health: update to 2.1.9 Message-ID: <20140612093815.5EFDE829C5@mail.mathias-kettner.de> Module: omd Branch: master Commit: aa6feb23a6f60edf1efa1946a89c534cb41bd9c8 URL: http://omdistro.org/projects/omd/repository/revisions/aa6feb23a6f60edf1efa1946a89c534cb41bd9c8 Author: Gerhard Lausser Date: Thu Jun 12 11:37:44 2014 +0200 Commiter: Gerhard Lausser Date: Thu Jun 12 11:37:44 2014 +0200 check_mysql_health: update to 2.1.9 --- packages/check_mysql_health/Makefile | 2 +- packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz | Bin 130079 -> 0 bytes packages/check_mysql_health/check_mysql_health-2.1.9.tar.gz | Bin 0 -> 130156 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_mysql_health/Makefile b/packages/check_mysql_health/Makefile index 160d95a..d5dd050 100644 --- a/packages/check_mysql_health/Makefile +++ b/packages/check_mysql_health/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_mysql_health -VERSION = 2.1.8.4 +VERSION = 2.1.9 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz b/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz deleted file mode 100644 index 5ccbbea..0000000 Binary files a/packages/check_mysql_health/check_mysql_health-2.1.8.4.tar.gz and /dev/null differ diff --git a/packages/check_mysql_health/check_mysql_health-2.1.9.tar.gz b/packages/check_mysql_health/check_mysql_health-2.1.9.tar.gz new file mode 100644 index 0000000..f12ca7b Binary files /dev/null and b/packages/check_mysql_health/check_mysql_health-2.1.9.tar.gz differ From git at mathias-kettner.de Thu Jun 12 11:38:15 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 12 Jun 2014 11:38:15 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140612093815.73F75829C3@mail.mathias-kettner.de> Module: omd Branch: master Commit: 5651fdc6afc80283596379650b7eb697f8cc6d65 URL: http://omdistro.org/projects/omd/repository/revisions/5651fdc6afc80283596379650b7eb697f8cc6d65 Author: Gerhard Lausser Date: Thu Jun 12 11:38:10 2014 +0200 Commiter: Gerhard Lausser Date: Thu Jun 12 11:38:10 2014 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Thu Jun 12 14:55:34 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 12 Jun 2014 14:55:34 +0200 Subject: [omd-commits] OMD Git: omd: check_mysql_health: update to 2.1.9.1 Message-ID: <20140612125534.7B3FA80617@mail.mathias-kettner.de> Module: omd Branch: master Commit: 4666b2d39a7c116545b33cfe598de19d4506cbb1 URL: http://omdistro.org/projects/omd/repository/revisions/4666b2d39a7c116545b33cfe598de19d4506cbb1 Author: Gerhard Lausser Date: Thu Jun 12 14:55:30 2014 +0200 Commiter: Gerhard Lausser Date: Thu Jun 12 14:55:30 2014 +0200 check_mysql_health: update to 2.1.9.1 --- packages/check_mysql_health/Makefile | 2 +- packages/check_mysql_health/check_mysql_health-2.1.9.1.tar.gz | Bin 0 -> 130327 bytes packages/check_mysql_health/check_mysql_health-2.1.9.tar.gz | Bin 130156 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_mysql_health/Makefile b/packages/check_mysql_health/Makefile index 885c784..ad819f0 100644 --- a/packages/check_mysql_health/Makefile +++ b/packages/check_mysql_health/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_mysql_health -VERSION = 2.1.9 +VERSION = 2.1.9.1 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_mysql_health/check_mysql_health-2.1.9.1.tar.gz b/packages/check_mysql_health/check_mysql_health-2.1.9.1.tar.gz new file mode 100644 index 0000000..a7d76a3 Binary files /dev/null and b/packages/check_mysql_health/check_mysql_health-2.1.9.1.tar.gz differ diff --git a/packages/check_mysql_health/check_mysql_health-2.1.9.tar.gz b/packages/check_mysql_health/check_mysql_health-2.1.9.tar.gz deleted file mode 100644 index f12ca7b..0000000 Binary files a/packages/check_mysql_health/check_mysql_health-2.1.9.tar.gz and /dev/null differ From git at mathias-kettner.de Sun Jun 15 12:22:15 2014 From: git at mathias-kettner.de (git version control) Date: Sun, 15 Jun 2014 12:22:15 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140615102215.E50A280619@mail.mathias-kettner.de> Module: omd Branch: master Commit: 6bd917dc20765cba96ea7eb7f12b572ee8835deb URL: http://omdistro.org/projects/omd/repository/revisions/6bd917dc20765cba96ea7eb7f12b572ee8835deb Author: Lars Michelsen Date: Sun Jun 15 12:21:53 2014 +0200 Commiter: Lars Michelsen Date: Sun Jun 15 12:21:53 2014 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Sun Jun 15 12:22:15 2014 From: git at mathias-kettner.de (git version control) Date: Sun, 15 Jun 2014 12:22:15 +0200 Subject: [omd-commits] OMD Git: omd: nagvis: updated to current build Message-ID: <20140615102216.07B6A80617@mail.mathias-kettner.de> Module: omd Branch: master Commit: 028c60f3ce641d4f87271710035946a8a73a1612 URL: http://omdistro.org/projects/omd/repository/revisions/028c60f3ce641d4f87271710035946a8a73a1612 Author: Lars Michelsen Date: Sun Jun 15 12:21:41 2014 +0200 Commiter: Lars Michelsen Date: Sun Jun 15 12:21:41 2014 +0200 nagvis: updated to current build --- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1483187 -> 1483619 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz index 60caf82..5a8d81a 100644 Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ From git at mathias-kettner.de Sat Jun 21 14:50:54 2014 From: git at mathias-kettner.de (git version control) Date: Sat, 21 Jun 2014 14:50:54 +0200 Subject: [omd-commits] OMD Git: omd: New command lc for sending a core command via Livestatus Message-ID: <20140621125054.E7C65805D7@mail.mathias-kettner.de> Module: omd Branch: master Commit: 0d59e82aa04cedf55e72d1274d35e1dca55a7e14 URL: http://omdistro.org/projects/omd/repository/revisions/0d59e82aa04cedf55e72d1274d35e1dca55a7e14 Author: Mathias Kettner Date: Sat Jun 21 14:50:50 2014 +0200 Commiter: Mathias Kettner Date: Sat Jun 21 14:50:50 2014 +0200 New command lc for sending a core command via Livestatus --- Changelog | 2 ++ packages/mk-livestatus/lc | 5 +++++ packages/mk-livestatus/lq | 3 +++ 3 files changed, 10 insertions(+) diff --git a/Changelog b/Changelog index a6665ab..3f52803 100644 --- a/Changelog +++ b/Changelog @@ -23,6 +23,8 @@ This file documents the revision history for the Open Monitoring Distribution - Icinga: Update to 1.11.4 - Dokuwiki: Fixed integration with multisite cookie authentication - Added build support for Ubuntu 14.04 + - New command lc for sending a core command via Livestatus, e.g. + lc ENABLE_NOTIFICATIONS 1.10 Dec 15 2013 - omd: More friendly error messages when init scripts do not exist diff --git a/packages/mk-livestatus/lc b/packages/mk-livestatus/lc new file mode 100755 index 0000000..27d300b --- /dev/null +++ b/packages/mk-livestatus/lc @@ -0,0 +1,5 @@ +#!/bin/bash +# Execute a monitoring core command via Livestatus, e.g. +# lc ENABLE_NOTIFICATIONS + +echo "COMMAND [$(date +%s)] $*" | unixcat ~/tmp/run/live diff --git a/packages/mk-livestatus/lq b/packages/mk-livestatus/lq old mode 100644 new mode 100755 index 861519b..6e94040 --- a/packages/mk-livestatus/lq +++ b/packages/mk-livestatus/lq @@ -1,4 +1,7 @@ #!/bin/bash +# Send a Livestatusquery and output the result on stdout. Either +# specify the query on the command line or send it via standard input. + if [ $# -ge 1 ] then echo -e "$@" From git at mathias-kettner.de Mon Jun 23 18:02:08 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 23 Jun 2014 18:02:08 +0200 Subject: [omd-commits] OMD Git: omd: Check_MK: Added new stable release 1.2.4p4 Message-ID: <20140623160208.2642B80605@mail.mathias-kettner.de> Module: omd Branch: master Commit: 8a86b2f0cd38dd9c1557f8051f3b575787efece2 URL: http://omdistro.org/projects/omd/repository/revisions/8a86b2f0cd38dd9c1557f8051f3b575787efece2 Author: Lars Michelsen Date: Mon Jun 23 16:24:36 2014 +0200 Commiter: Lars Michelsen Date: Mon Jun 23 16:24:36 2014 +0200 Check_MK: Added new stable release 1.2.4p4 --- Changelog | 2 +- packages/check_mk/Makefile | 2 +- packages/check_mk/check_mk-1.2.4.tar.gz | Bin 6590988 -> 0 bytes packages/check_mk/check_mk-1.2.4p4.tar.gz | Bin 0 -> 6625277 bytes packages/check_mk/mkeventd-1.2.4.tar.gz | Bin 99670 -> 0 bytes packages/check_mk/mkeventd-1.2.4p4.tar.gz | Bin 0 -> 100071 bytes packages/check_mk/skel/etc/check_mk/defaults | 2 +- packages/check_mk/skel/etc/check_mk/multisite.mk | 6 +----- packages/mk-livestatus/Makefile | 2 +- packages/mk-livestatus/mk-livestatus-1.2.4.tar.gz | Bin 434179 -> 0 bytes packages/mk-livestatus/mk-livestatus-1.2.4p4.tar.gz | Bin 0 -> 432711 bytes 11 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Changelog b/Changelog index 3f52803..495dac1 100644 --- a/Changelog +++ b/Changelog @@ -17,7 +17,7 @@ This file documents the revision history for the Open Monitoring Distribution - FIX: Providing correct exit codes when running "omd status" - 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.4 + - Check_MK/MK Livestatus: new version 1.2.4p4 - Thruk: Update to 1.84-3 - PNP4Nagios: Update to 0.6.22 - Icinga: Update to 1.11.4 diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile index 438a90c..ec307af 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.4 +VERSION = 1.2.4p4 DIR = $(NAME)-$(VERSION) EDIR = mkeventd-$(VERSION) diff --git a/packages/check_mk/check_mk-1.2.4.tar.gz b/packages/check_mk/check_mk-1.2.4.tar.gz deleted file mode 100644 index b11236c..0000000 Binary files a/packages/check_mk/check_mk-1.2.4.tar.gz and /dev/null differ diff --git a/packages/check_mk/check_mk-1.2.4p4.tar.gz b/packages/check_mk/check_mk-1.2.4p4.tar.gz new file mode 100644 index 0000000..008d1f4 Binary files /dev/null and b/packages/check_mk/check_mk-1.2.4p4.tar.gz differ diff --git a/packages/check_mk/mkeventd-1.2.4.tar.gz b/packages/check_mk/mkeventd-1.2.4.tar.gz deleted file mode 100644 index 825fae8..0000000 Binary files a/packages/check_mk/mkeventd-1.2.4.tar.gz and /dev/null differ diff --git a/packages/check_mk/mkeventd-1.2.4p4.tar.gz b/packages/check_mk/mkeventd-1.2.4p4.tar.gz new file mode 100644 index 0000000..3ef951c Binary files /dev/null and b/packages/check_mk/mkeventd-1.2.4p4.tar.gz differ diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults index e968fde..1035781 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.4' +check_mk_version = '1.2.4p4' default_config_dir = '###ROOT###/etc/check_mk' check_mk_configdir = '###ROOT###/etc/check_mk/conf.d' share_dir = '###ROOT###/share/check_mk' diff --git a/packages/check_mk/skel/etc/check_mk/multisite.mk b/packages/check_mk/skel/etc/check_mk/multisite.mk index 0c0d4c2..bb7ecbe 100644 --- a/packages/check_mk/skel/etc/check_mk/multisite.mk +++ b/packages/check_mk/skel/etc/check_mk/multisite.mk @@ -41,11 +41,7 @@ custom_links['guest'] = [ ( "Classical Nagios GUI", "../nagios/", "link_home.gif" ), ( "Addons", True, [ ( "PNP4Nagios", "../pnp4nagios/", "link_reporting.gif" ), - ( "NagVis", False, [ - ( "Automap", "../nagvis/index.php?map=__automap", "link_map.gif"), - ( "Demo map", "../nagvis/index.php?map=demo-map", "link_map.gif"), - ( "Demo Map 2", "../nagvis/index.php?map=demo2", "link_map.gif"), - ]), + ( "NagVis", "../nagvis/", "link_map.gif" ), ]), ] diff --git a/packages/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile index 5d4d90f..850b9de 100644 --- a/packages/mk-livestatus/Makefile +++ b/packages/mk-livestatus/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mk-livestatus -VERSION = 1.2.4 +VERSION = 1.2.4p4 DIR = $(NAME)-$(VERSION) CONFIGUREOPTS = \ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.4.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.4.tar.gz deleted file mode 100644 index 72b169c..0000000 Binary files a/packages/mk-livestatus/mk-livestatus-1.2.4.tar.gz and /dev/null differ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.4p4.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.4p4.tar.gz new file mode 100644 index 0000000..30194ae Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.4p4.tar.gz differ From git at mathias-kettner.de Mon Jun 23 18:08:23 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 23 Jun 2014 18:08:23 +0200 Subject: [omd-commits] OMD Git: omd: fixed omd conflict not aborting Message-ID: <20140623160824.0DBBA80618@mail.mathias-kettner.de> Module: omd Branch: master Commit: b7158b5b1b21990206385842b1655f30586074ff URL: http://omdistro.org/projects/omd/repository/revisions/b7158b5b1b21990206385842b1655f30586074ff Author: Sven Nierlein Date: Mon Jun 23 16:13:57 2014 +0200 Commiter: Sven Nierlein Date: Mon Jun 23 18:07:47 2014 +0200 fixed omd conflict not aborting two choices starting with an 'a' resulted in solution being accepted when the user pressed 'a' for abort. Instead it got accepted. Signed-off-by: Sven Nierlein --- packages/omd/omd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/omd/omd b/packages/omd/omd index 75dfe9f..d5748ad 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -2704,9 +2704,9 @@ def walk_skel(root, handler, args, exclude_if_in = None, relbase = '.'): # In case of non interactive mode just throw the exception if opt_conflict == 'ask': options = [ - ("retry", "Retry the operation"), - ("accept", "Continue with next files"), - ("abort", "Stop here and abort update!") + ("retry", "Retry the operation"), + ("continue", "Continue with next files"), + ("abort", "Stop here and abort update!") ] choice = ask_user_choices( 'Problem occured', From git at mathias-kettner.de Mon Jun 23 22:16:23 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 23 Jun 2014 22:16:23 +0200 Subject: [omd-commits] OMD Git: omd: thruk: update 1.84-4 Message-ID: <20140623201623.41B7D80494@mail.mathias-kettner.de> Module: omd Branch: master Commit: cc44d8815a28f1f26e682a06f0e24b937abc066f URL: http://omdistro.org/projects/omd/repository/revisions/cc44d8815a28f1f26e682a06f0e24b937abc066f Author: Sven Nierlein Date: Mon Jun 23 21:34:56 2014 +0200 Commiter: Sven Nierlein Date: Mon Jun 23 21:36:19 2014 +0200 thruk: update 1.84-4 --- Changelog | 2 +- packages/thruk/Makefile | 2 +- packages/thruk/{Thruk-1.84-3.tar.gz => Thruk-1.84-4.tar.gz} | Bin 8779582 -> 8783892 bytes t/TestUtils.pm | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 495dac1..672cd9a 100644 --- a/Changelog +++ b/Changelog @@ -18,7 +18,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.4p4 - - Thruk: Update to 1.84-3 + - Thruk: Update to 1.84-4 - PNP4Nagios: Update to 0.6.22 - Icinga: Update to 1.11.4 - Dokuwiki: Fixed integration with multisite cookie authentication diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile index 97c4ef5..c885caa 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.84-3 +VERSION = 1.84-4 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/Thruk-1.84-3.tar.gz b/packages/thruk/Thruk-1.84-4.tar.gz similarity index 53% rename from packages/thruk/Thruk-1.84-3.tar.gz rename to packages/thruk/Thruk-1.84-4.tar.gz index 4b360ef..66cb5a7 100644 Binary files a/packages/thruk/Thruk-1.84-3.tar.gz and b/packages/thruk/Thruk-1.84-4.tar.gz differ diff --git a/t/TestUtils.pm b/t/TestUtils.pm index 6e2003a..ab926c3 100644 --- a/t/TestUtils.pm +++ b/t/TestUtils.pm @@ -607,6 +607,8 @@ sub _diag_lint_errors_and_remove_some_exceptions { "Unknown attribute \"end\" for tag
", "for tag ", "Unknown\ attribute\ \"placeholder\"\ for\ tag\ ", + "Unknown\ attribute\ \"autocomplete\"\ for\ tag\
", + "Unknown\ attribute\ \"autocomplete\"\ for\ tag\ ", ) { next LINT_ERROR if($err_str =~ m/$exclude_pattern/i); }