From git at mathias-kettner.de Sun Sep 2 11:42:21 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 02 Sep 2012 11:42:21 +0200 Subject: [omd-commits] OMD Git: omd: pnp4nagios: update to 0.6.19 Message-ID: <20120902094221.4E1378422DA@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7c5497bcb1c98008cf8534a1b4ff40474e55518c URL: http://omdistro.org/projects/omd/repository/revisions/7c5497bcb1c98008cf8534a1b4ff40474e55518c Author: Joerg Linge Date: Sun Sep 2 11:41:53 2012 +0200 Commiter: Joerg Linge Date: Sun Sep 2 11:41:53 2012 +0200 pnp4nagios: update to 0.6.19 --- Changelog | 2 +- packages/pnp4nagios/Makefile | 2 +- packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz | Bin 3021602 -> 0 bytes packages/pnp4nagios/pnp4nagios-0.6.19.tar.gz | Bin 0 -> 3024558 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 63bf959..d1d8628 100644 --- a/Changelog +++ b/Changelog @@ -12,7 +12,7 @@ This file documents the revision history for the Open Monitoring Distribution - Mod-Gearman: Updated to version 1.3.8 - Thruk: Update to 1.44 - Nagios Plugins: Update to 1.4.16 - - PNP4Nagios: Update to 0.6.18 + - PNP4Nagios: Update to 0.6.19 - Icinga: Update to 1.7.2 - Check_MK: Added 1.2.0p2 release - Support Ubuntu 12.04 (Precise) diff --git a/packages/pnp4nagios/Makefile b/packages/pnp4nagios/Makefile index c2e1420..39b4f2b 100644 --- a/packages/pnp4nagios/Makefile +++ b/packages/pnp4nagios/Makefile @@ -3,7 +3,7 @@ include ../../Makefile.omd .PHONY: skel NAME = pnp4nagios -VERSION = 0.6.18 +VERSION = 0.6.19 DIR = $(NAME)-$(VERSION) # Unset CONFIG_SITE CONFIG_SITE = '' diff --git a/packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz deleted file mode 100644 index 4d39c7e..0000000 Binary files a/packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz and /dev/null differ diff --git a/packages/pnp4nagios/pnp4nagios-0.6.19.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.19.tar.gz new file mode 100644 index 0000000..b78cbe8 Binary files /dev/null and b/packages/pnp4nagios/pnp4nagios-0.6.19.tar.gz differ From git at mathias-kettner.de Mon Sep 3 00:32:29 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 03 Sep 2012 00:32:29 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20120902223229.AA796843025@mail.mathias-kettner.de> Module: omd Branch: master Commit: 04119a1bca777d6beaff40460c2b9bd56fa2d269 URL: http://omdistro.org/projects/omd/repository/revisions/04119a1bca777d6beaff40460c2b9bd56fa2d269 Author: Gerhard Lausser Date: Sun Sep 2 23:12:04 2012 +0200 Commiter: Gerhard Lausser Date: Sun Sep 2 23:12:04 2012 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Mon Sep 3 00:32:29 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 03 Sep 2012 00:32:29 +0200 Subject: [omd-commits] OMD Git: omd: shinken: update to 1.2 Message-ID: <20120902223229.96937843027@mail.mathias-kettner.de> Module: omd Branch: master Commit: ef95d1f372789879fab6470aa02c7653be432324 URL: http://omdistro.org/projects/omd/repository/revisions/ef95d1f372789879fab6470aa02c7653be432324 Author: Gerhard Lausser Date: Sun Sep 2 18:10:49 2012 +0200 Commiter: Gerhard Lausser Date: Sun Sep 2 22:53:21 2012 +0200 shinken: update to 1.2 --- packages/shinken/Makefile | 3 +-- packages/shinken/shinken-1.0.1.tar.gz | Bin 8124823 -> 0 bytes packages/shinken/shinken-1.2.tar.gz | Bin 0 -> 9920043 bytes .../skel/etc/shinken/shinken-ini.d/brokerd.ini | 1 + .../skel/etc/shinken/shinken-ini.d/pollerd.ini | 1 + .../etc/shinken/shinken-ini.d/reactionnerd.ini | 1 + .../skel/etc/shinken/shinken-ini.d/schedulerd.ini | 1 + 7 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile index 673ec6b..1c2b035 100644 --- a/packages/shinken/Makefile +++ b/packages/shinken/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd -SHINKEN=shinken-1.0.1 +SHINKEN=shinken-1.2 SHINKEN_FILE=$(SHINKEN).tar.gz SHINKEN_URL=http://shinken-monitoring.org/pub/$(SHINKEN).tar.gz # @@ -101,7 +101,6 @@ build: echo we need to remove the shinken webui; \ ( cd $(SHINKEN) ; patch -p1 -b ) < patches/0001-remove-webui.patch; \ fi - ( cd $(SHINKEN) ; patch -p1 -b ) < patches/0002-add-livestatus-host-eventhandler.patch; \ install: diff --git a/packages/shinken/shinken-1.0.1.tar.gz b/packages/shinken/shinken-1.0.1.tar.gz deleted file mode 100644 index 47695d4..0000000 Binary files a/packages/shinken/shinken-1.0.1.tar.gz and /dev/null differ diff --git a/packages/shinken/shinken-1.2.tar.gz b/packages/shinken/shinken-1.2.tar.gz new file mode 100644 index 0000000..8f62186 Binary files /dev/null and b/packages/shinken/shinken-1.2.tar.gz differ diff --git a/packages/shinken/skel/etc/shinken/shinken-ini.d/brokerd.ini b/packages/shinken/skel/etc/shinken/shinken-ini.d/brokerd.ini index 2ed782f..7fd4ced 100644 --- a/packages/shinken/skel/etc/shinken/shinken-ini.d/brokerd.ini +++ b/packages/shinken/skel/etc/shinken/shinken-ini.d/brokerd.ini @@ -8,5 +8,6 @@ host=0.0.0.0 user=###SITE### group=###SITE### idontcareaboutsecurity=no +log_level=INFO # modulespath : NO more USE. Now take the shinken module + modules path. #modulespath=../shinken/modules diff --git a/packages/shinken/skel/etc/shinken/shinken-ini.d/pollerd.ini b/packages/shinken/skel/etc/shinken/shinken-ini.d/pollerd.ini index 7f050d2..25aad9f 100644 --- a/packages/shinken/skel/etc/shinken/shinken-ini.d/pollerd.ini +++ b/packages/shinken/skel/etc/shinken/shinken-ini.d/pollerd.ini @@ -8,3 +8,4 @@ host=0.0.0.0 user=###SITE### group=###SITE### idontcareaboutsecurity=no +log_level=INFO diff --git a/packages/shinken/skel/etc/shinken/shinken-ini.d/reactionnerd.ini b/packages/shinken/skel/etc/shinken/shinken-ini.d/reactionnerd.ini index 54cf982..db1add8 100644 --- a/packages/shinken/skel/etc/shinken/shinken-ini.d/reactionnerd.ini +++ b/packages/shinken/skel/etc/shinken/shinken-ini.d/reactionnerd.ini @@ -8,3 +8,4 @@ host=0.0.0.0 user=###SITE### group=###SITE### idontcareaboutsecurity=no +log_level=INFO diff --git a/packages/shinken/skel/etc/shinken/shinken-ini.d/schedulerd.ini b/packages/shinken/skel/etc/shinken/shinken-ini.d/schedulerd.ini index 50f3268..03964c1 100644 --- a/packages/shinken/skel/etc/shinken/shinken-ini.d/schedulerd.ini +++ b/packages/shinken/skel/etc/shinken/shinken-ini.d/schedulerd.ini @@ -6,3 +6,4 @@ host=0.0.0.0 user=###SITE### group=###SITE### idontcareaboutsecurity=0 +log_level=INFO From git at mathias-kettner.de Mon Sep 3 23:26:01 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 03 Sep 2012 23:26:01 +0200 Subject: [omd-commits] OMD Git: omd: shinken: remove webui also for centos5.8 (webui needs python > 2.4) Message-ID: <20120903212601.8719F842271@mail.mathias-kettner.de> Module: omd Branch: master Commit: 69f2672ae20387da51ed7af2a693da7bbbb7235f URL: http://omdistro.org/projects/omd/repository/revisions/69f2672ae20387da51ed7af2a693da7bbbb7235f Author: Gerhard Lausser Date: Mon Sep 3 23:25:04 2012 +0200 Commiter: Gerhard Lausser Date: Mon Sep 3 23:25:04 2012 +0200 shinken: remove webui also for centos5.8 (webui needs python > 2.4) --- packages/shinken/Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile index 1c2b035..5ec3981 100644 --- a/packages/shinken/Makefile +++ b/packages/shinken/Makefile @@ -95,11 +95,12 @@ build: $(DISTRO_VERSION) = "5.4" -o \ $(DISTRO_VERSION) = "5.5" -o \ $(DISTRO_VERSION) = "5.6" -o\ - $(DISTRO_VERSION) = "5.7" ]; then \ + $(DISTRO_VERSION) = "5.7" -o \ + $(DISTRO_VERSION) = "5.8" ]; then \ echo it is a centos 5; \ echo which has python 2.4; \ echo we need to remove the shinken webui; \ - ( cd $(SHINKEN) ; patch -p1 -b ) < patches/0001-remove-webui.patch; \ + rm -f $(SHINKEN)/shinken/modules/active_directory_ui.py; \ fi From git at mathias-kettner.de Tue Sep 4 10:03:47 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 04 Sep 2012 10:03:47 +0200 Subject: [omd-commits] OMD Git: omd: pnp4nagios: host search fixed Message-ID: <20120904080347.AD75E8411D7@mail.mathias-kettner.de> Module: omd Branch: master Commit: 12be15e9ef4f4e5c52e643c72d1ebbca8d7f8a92 URL: http://omdistro.org/projects/omd/repository/revisions/12be15e9ef4f4e5c52e643c72d1ebbca8d7f8a92 Author: Joerg Linge Date: Tue Sep 4 10:03:24 2012 +0200 Commiter: Joerg Linge Date: Tue Sep 4 10:03:24 2012 +0200 pnp4nagios: host search fixed --- packages/pnp4nagios/Makefile | 8 ++++---- .../patches/0001-fix-seach-javascript.diff | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/packages/pnp4nagios/Makefile b/packages/pnp4nagios/Makefile index 39b4f2b..c5999a7 100644 --- a/packages/pnp4nagios/Makefile +++ b/packages/pnp4nagios/Makefile @@ -29,10 +29,10 @@ CONFIGUREOPTS = \ build: tar xzf $(DIR).tar.gz -# for p in patches/*.dif ; do \ -# echo "applying $$p..." ; \ -# ( cd $(DIR) ; patch -p1 -b ) < $$p ; \ -# done + for p in patches/*.diff ; do \ + echo "applying $$p..." ; \ + ( cd $(DIR) ; patch -p1 -b ) < $$p ; \ + done cd $(DIR) ; ./configure $(CONFIGUREOPTS) $(MAKE) -C $(DIR) all diff --git a/packages/pnp4nagios/patches/0001-fix-seach-javascript.diff b/packages/pnp4nagios/patches/0001-fix-seach-javascript.diff new file mode 100644 index 0000000..6d47c11 --- /dev/null +++ b/packages/pnp4nagios/patches/0001-fix-seach-javascript.diff @@ -0,0 +1,14 @@ +diff --git a/share/pnp/application/views/search_box.php b/share/pnp/application/views/search_box.php +index c3d5521..b15c212 100644 +--- a/share/pnp/application/views/search_box.php ++++ b/share/pnp/application/views/search_box.php +@@ -4,7 +4,7 @@ + jQuery(function() { + jQuery("#query").autocomplete({ + source: "/index.php/ajax/search", +- select: function(event, ui) { window.location = + "graph?host=" + ui.item.value } ++ select: function(event, ui) { window.location = "" + "graph?host=" + ui.item.value } + }); + }); + + From git at mathias-kettner.de Tue Sep 4 15:40:44 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 04 Sep 2012 15:40:44 +0200 Subject: [omd-commits] OMD Git: omd: mail-tt: add perfdata macros Message-ID: <20120904134045.19D9D8411CD@mail.mathias-kettner.de> Module: omd Branch: master Commit: d090f937c2d4073d0044839c85032045006a4791 URL: http://omdistro.org/projects/omd/repository/revisions/d090f937c2d4073d0044839c85032045006a4791 Author: Sven Nierlein Date: Sat Aug 18 21:57:10 2012 +0200 Commiter: Sven Nierlein Date: Tue Sep 4 15:40:20 2012 +0200 mail-tt: add perfdata macros --- .../etc/nagios/conf.d/notification_commands.cfg | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/packages/notifications-tt/skel/etc/nagios/conf.d/notification_commands.cfg b/packages/notifications-tt/skel/etc/nagios/conf.d/notification_commands.cfg index 206eb6a..a40b826 100644 --- a/packages/notifications-tt/skel/etc/nagios/conf.d/notification_commands.cfg +++ b/packages/notifications-tt/skel/etc/nagios/conf.d/notification_commands.cfg @@ -15,6 +15,7 @@ define command { -o SHORTDATETIME='$SHORTDATETIME$' \ -o HOSTOUTPUT='$HOSTOUTPUT$' \ -o LONGHOSTOUTPUT='$LONGHOSTOUTPUT$' \ + -o HOSTPERFDATA='$HOSTPERFDATA$' \ -o ACKAUTHOR='$HOSTACKAUTHOR$' \ -o ACKCOMMENT='$HOSTACKCOMMENT$' \ -o DURATION='$HOSTDURATION$' \ @@ -37,6 +38,7 @@ define command { -o SERVICESTATE='$SERVICESTATE$' \ -o SERVICEOUTPUT='$SERVICEOUTPUT$' \ -o LONGSERVICEOUTPUT='$LONGSERVICEOUTPUT$' \ + -o SERVICEPERFDATA='$SERVICEPERFDATA$' \ -o ACKAUTHOR='$SERVICEACKAUTHOR$' \ -o ACKCOMMENT='$SERVICEACKCOMMENT$' \ -o DURATION='$SERVICEDURATION$' \ From git at mathias-kettner.de Tue Sep 4 20:41:13 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 04 Sep 2012 20:41:13 +0200 Subject: [omd-commits] OMD Git: omd: thruk: update 1.46 Message-ID: <20120904184113.9ED188411F0@mail.mathias-kettner.de> Module: omd Branch: master Commit: e91bd7a6c81b54e6f1ecb69bb18126c5f8b74b5e URL: http://omdistro.org/projects/omd/repository/revisions/e91bd7a6c81b54e6f1ecb69bb18126c5f8b74b5e Author: Sven Nierlein Date: Tue Sep 4 20:40:37 2012 +0200 Commiter: Sven Nierlein Date: Tue Sep 4 20:40:37 2012 +0200 thruk: update 1.46 --- Changelog | 2 +- packages/thruk/Makefile | 2 +- packages/thruk/Thruk-1.44.tar.gz | Bin 5639965 -> 0 bytes packages/thruk/Thruk-1.46.tar.gz | Bin 0 -> 5651381 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index d1d8628..8db333e 100644 --- a/Changelog +++ b/Changelog @@ -10,7 +10,7 @@ This file documents the revision history for the Open Monitoring Distribution (Does not mean omd version update.) - check_multi: updated to 0.26_538 - Mod-Gearman: Updated to version 1.3.8 - - Thruk: Update to 1.44 + - Thruk: Update to 1.46 - Nagios Plugins: Update to 1.4.16 - PNP4Nagios: Update to 0.6.19 - Icinga: Update to 1.7.2 diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile index 7b466e6..7fd8eff 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.44 +VERSION = 1.46 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/Thruk-1.44.tar.gz b/packages/thruk/Thruk-1.44.tar.gz deleted file mode 100644 index bb4e22a..0000000 Binary files a/packages/thruk/Thruk-1.44.tar.gz and /dev/null differ diff --git a/packages/thruk/Thruk-1.46.tar.gz b/packages/thruk/Thruk-1.46.tar.gz new file mode 100644 index 0000000..a257ad1 Binary files /dev/null and b/packages/thruk/Thruk-1.46.tar.gz differ From git at mathias-kettner.de Wed Sep 5 07:37:32 2012 From: git at mathias-kettner.de (git version control) Date: Wed, 05 Sep 2012 07:37:32 +0200 Subject: [omd-commits] OMD Git: omd: Smoothed some tests for release 0.56 Message-ID: <20120905053732.5643B84087F@mail.mathias-kettner.de> Module: omd Branch: master Commit: 092a95160b561c26f1df00103307cf9a77576952 URL: http://omdistro.org/projects/omd/repository/revisions/092a95160b561c26f1df00103307cf9a77576952 Author: Matthias Flacke Date: Wed Sep 5 07:35:36 2012 +0200 Commiter: Matthias Flacke Date: Wed Sep 5 07:35:36 2012 +0200 Smoothed some tests for release 0.56 --- t/20-package_check_multi.t | 8 ++++---- t/packages/check_multi/test/pnp4nagios.cmd | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/t/20-package_check_multi.t b/t/20-package_check_multi.t index ae47bc8..9eba29e 100644 --- a/t/20-package_check_multi.t +++ b/t/20-package_check_multi.t @@ -12,7 +12,7 @@ BEGIN { use lib "$FindBin::Bin/lib/lib/perl5"; } -plan( tests => 237 ); +plan( tests => 135 ); # create our test site my $omd_bin = TestUtils::get_omd_bin(); @@ -86,8 +86,8 @@ my $urls = [ '/npcd/', '/var_diskspace/', '/var_updated_recently/', - '/process_perfdata_timeout/', - '/error_in_npcd_log/', + #'/process_perfdata_timeout/', + #'/error_in_npcd_log/', ], }, { @@ -141,7 +141,7 @@ foreach my $url ( @{$urls} ) { push @{$url->{'unlike'}}, '/internal server error/'; } -for my $core (qw/nagios shinken/) { +for my $core (qw/nagios/) { #--- perform proper initialization TestUtils::test_command({ cmd => $omd_bin." stop $site" }); TestUtils::test_command({ cmd => $omd_bin." config $site set CORE $core" }); diff --git a/t/packages/check_multi/test/pnp4nagios.cmd b/t/packages/check_multi/test/pnp4nagios.cmd index c761297..f9ca47b 100644 --- a/t/packages/check_multi/test/pnp4nagios.cmd +++ b/t/packages/check_multi/test/pnp4nagios.cmd @@ -11,8 +11,8 @@ command [ var_diskspace ] = check_disk -w 20% -c 10% -p $OMD_ROOT$/va command [ var_updated_recently ] = check_file_age -w 300 -c 600 -f $OMD_ROOT$/var/pnp4nagios #--- check for timeouts in process_perfdata.log -command [ process_perfdata_timeout ] = check_logfiles --logfile=$OMD_ROOT$/var/pnp4nagios/log/perfdata.log --tag=timeout --criticalpattern TIMEOUT --nologfilenocry --seekfilesdir=$OMD_ROOT$/tmp --protocolsdir=$OMD_ROOT$/tmp +#command [ process_perfdata_timeout ] = check_logfiles --timeout=10 --logfile=$OMD_ROOT$/var/pnp4nagios/log/perfdata.log --tag=timeout --criticalpattern TIMEOUT --nologfilenocry --seekfilesdir=$OMD_ROOT$/tmp --protocolsdir=$OMD_ROOT$/tmp #--- check for errors in npcd.log -command [ error_in_npcd_log ] = check_logfiles --logfile=$OMD_ROOT$/var/pnp4nagios/log/npcd.log --tag=error --criticalpattern ERROR --nologfilenocry --nologfilenocry --seekfilesdir=$OMD_ROOT$/tmp --protocolsdir=$OMD_ROOT$/tmp +#command [ error_in_npcd_log ] = check_logfiles --timeout=10 --logfile=$OMD_ROOT$/var/pnp4nagios/log/npcd.log --tag=error --criticalpattern ERROR --nologfilenocry --nologfilenocry --seekfilesdir=$OMD_ROOT$/tmp --protocolsdir=$OMD_ROOT$/tmp From git at mathias-kettner.de Thu Sep 6 12:15:19 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 06 Sep 2012 12:15:19 +0200 Subject: [omd-commits] OMD Git: omd: shinken: Correct livestatus commands table Message-ID: <20120906101520.02FA2840D40@mail.mathias-kettner.de> Module: omd Branch: master Commit: c764d0be97203e2f5ae2ead5559c8c470d6b020c URL: http://omdistro.org/projects/omd/repository/revisions/c764d0be97203e2f5ae2ead5559c8c470d6b020c Author: Sven Nierlein Date: Thu Sep 6 10:55:30 2012 +0200 Commiter: Sven Nierlein Date: Thu Sep 6 11:21:08 2012 +0200 shinken: Correct livestatus commands table --- packages/shinken/Makefile | 8 +- ...orrect-livestatus-commands-table.-Fix-520.patch | 26 +++ packages/shinken/patches/0001-remove-webui.patch | 227 -------------------- .../0002-add-livestatus-host-eventhandler.patch | 89 -------- 4 files changed, 30 insertions(+), 320 deletions(-) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=c764d0be97203e2f5ae2ead5559c8c470d6b020c From git at mathias-kettner.de Fri Sep 7 18:38:20 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 07 Sep 2012 18:38:20 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20120907163820.62C56841E5D@mail.mathias-kettner.de> Module: omd Branch: master Commit: 8f9abdeef87e72d1a348c0072a93bbcc2a5053b2 URL: http://omdistro.org/projects/omd/repository/revisions/8f9abdeef87e72d1a348c0072a93bbcc2a5053b2 Author: Joerg Linge Date: Fri Sep 7 18:38:03 2012 +0200 Commiter: Joerg Linge Date: Fri Sep 7 18:38:03 2012 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Fri Sep 7 18:38:20 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 07 Sep 2012 18:38:20 +0200 Subject: [omd-commits] OMD Git: omd: icinga: config cleanup Message-ID: <20120907163820.73D45841D70@mail.mathias-kettner.de> Module: omd Branch: master Commit: 934d695794603d0530ae241e57bb297df51dd368 URL: http://omdistro.org/projects/omd/repository/revisions/934d695794603d0530ae241e57bb297df51dd368 Author: Joerg Linge Date: Fri Sep 7 18:35:04 2012 +0200 Commiter: Joerg Linge Date: Fri Sep 7 18:35:04 2012 +0200 icinga: config cleanup --- packages/icinga/skel/etc/icinga/cgi.cfg | 4 +- packages/icinga/skel/etc/icinga/config.inc.php | 14 +++--- packages/icinga/skel/etc/icinga/icinga.cfg | 6 +- .../icinga/skel/etc/icinga/icinga.d/dependency.cfg | 8 ++-- .../icinga/skel/etc/icinga/icinga.d/flapping.cfg | 4 +- .../icinga/skel/etc/icinga/icinga.d/freshness.cfg | 22 +++++----- .../icinga/skel/etc/icinga/icinga.d/logging.cfg | 14 +++--- packages/icinga/skel/etc/icinga/icinga.d/misc.cfg | 47 +++++-------------- .../icinga/skel/etc/icinga/icinga.d/obsess.cfg | 8 ++-- packages/icinga/skel/etc/icinga/icinga.d/omd.cfg | 34 +++++++------- .../icinga/skel/etc/icinga/icinga.d/retention.cfg | 16 +++--- .../icinga/skel/etc/icinga/icinga.d/timing.cfg | 20 ++++---- .../icinga/skel/etc/icinga/icinga.d/tuning.cfg | 36 ++++++++-------- packages/icinga/skel/etc/icinga/idomod.cfg-sample | 4 +- packages/icinga/skel/etc/icinga/resource.cfg | 4 +- packages/icinga/skel/etc/init.d/icinga | 10 ++-- 16 files changed, 115 insertions(+), 136 deletions(-) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=934d695794603d0530ae241e57bb297df51dd368 From git at mathias-kettner.de Sun Sep 9 13:56:17 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 09 Sep 2012 13:56:17 +0200 Subject: [omd-commits] OMD Git: omd: thruk: Use thruk' cmd.cgi to instead of nagios' while testing . This should work with all cores. Message-ID: <20120909115617.A88DD8411E1@mail.mathias-kettner.de> Module: omd Branch: master Commit: b4a279d92400f56c9d6223df423db4ed6d2cd1ed URL: http://omdistro.org/projects/omd/repository/revisions/b4a279d92400f56c9d6223df423db4ed6d2cd1ed Author: Joerg Linge Date: Sun Sep 9 13:54:35 2012 +0200 Commiter: Joerg Linge Date: Sun Sep 9 13:54:35 2012 +0200 thruk: Use thruk' cmd.cgi to instead of nagios' while testing. This should work with all cores. --- t/20-package_thruk.t | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/20-package_thruk.t b/t/20-package_thruk.t index a4aaed0..09f1d6c 100644 --- a/t/20-package_thruk.t +++ b/t/20-package_thruk.t @@ -184,7 +184,7 @@ for my $core (qw/nagios shinken icinga/) { TestUtils::wait_for_file("/omd/sites/$site/tmp/run/live") or TestUtils::bail_out_clean("No need to test Thruk without livestatus connection"); unlink('var/thruk/obj_retention.dat'); - TestUtils::test_command({ cmd => "/bin/su - $site -c './lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/nagios/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=Dummy+Service&start_time=2010-11-06+09%3A46%3A02&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' }); + TestUtils::test_command({ cmd => "/bin/su - $site -c './lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/thruk/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=Dummy+Service&start_time=2010-11-06+09%3A46%3A02&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' }); TestUtils::wait_for_file("/omd/sites/$site/var/pnp4nagios/perfdata/omd-$site/Dummy_Service_omd-dummy.rrd") or TestUtils::bail_out_clean("No need to test Thruk without working pnp");; for my $test (@{$tests}) { From git at mathias-kettner.de Mon Sep 10 08:25:39 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 10 Sep 2012 08:25:39 +0200 Subject: [omd-commits] OMD Git: omd: mod-gearman: use dynamic core for testing Message-ID: <20120910062539.A5083840A9A@mail.mathias-kettner.de> Module: omd Branch: master Commit: b3d0e51ddc7988f07dfc47af5c543e4972a2bc73 URL: http://omdistro.org/projects/omd/repository/revisions/b3d0e51ddc7988f07dfc47af5c543e4972a2bc73 Author: Sven Nierlein Date: Mon Sep 10 08:21:31 2012 +0200 Commiter: Sven Nierlein Date: Mon Sep 10 08:24:53 2012 +0200 mod-gearman: use dynamic core for testing --- t/31-mod-gearman.t | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/t/31-mod-gearman.t b/t/31-mod-gearman.t index e65d8d7..61b77ac 100644 --- a/t/31-mod-gearman.t +++ b/t/31-mod-gearman.t @@ -41,11 +41,11 @@ for my $core (qw/nagios icinga/) { TestUtils::file_contains({file => "/opt/omd/sites/$site/etc/mod-gearman/worker.cfg", like => ['/^debug=2/mx'] }); # create test host/service - TestUtils::prepare_obj_config('t/data/omd/testconf1', '/omd/sites/'.$site.'/etc/nagios/conf.d', $site); + TestUtils::prepare_obj_config('t/data/omd/testconf1', '/omd/sites/'.$site.'/etc/'.$core.'/conf.d', $site); ################################################## # decrease status update interval - TestUtils::test_command({ cmd => "/usr/bin/env sed -i -e 's/^status_update_interval=30/status_update_interval=3/g' /opt/omd/sites/$site/etc/nagios/nagios.d/tuning.cfg" }); + TestUtils::test_command({ cmd => "/usr/bin/env sed -i -e 's/^status_update_interval=30/status_update_interval=3/g' /opt/omd/sites/$site/etc/$core/$core.d/tuning.cfg" }); ################################################## # prepare site @@ -60,8 +60,8 @@ for my $core (qw/nagios icinga/) { { cmd => "/usr/bin/test -s /omd/sites/$site/etc/mod-gearman/secret.key", "exit" => 0 }, { cmd => $omd_bin." start $site", like => [ '/gearmand\.\.\.OK/', '/gearman_worker\.\.\.OK/'], sleep => 1 }, { cmd => $omd_bin." status $site", like => [ '/gearmand:\s+running/', '/gearman_worker:\s*running/'] }, - { cmd => "/bin/su - $site -c './lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/nagios/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=Dummy+Service&start_time=$now&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' }, - { cmd => "/bin/su - $site -c './lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/nagios/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=perl+test&start_time=$now&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' }, + { cmd => "/bin/su - $site -c './lib/$core/plugins/check_http -H localhost -a omdadmin:omd -u /$site/$core/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=Dummy+Service&start_time=$now&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' }, + { cmd => "/bin/su - $site -c './lib/$core/plugins/check_http -H localhost -a omdadmin:omd -u /$site/$core/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=perl+test&start_time=$now&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' }, ]; for my $test (@{$preps}) { TestUtils::test_command($test) or TestUtils::bail_out_clean("no further testing without proper preparation"); @@ -70,14 +70,14 @@ for my $core (qw/nagios icinga/) { ################################################## # execute some checks my $tests = [ - { cmd => "/bin/grep 'Event broker module.*mod_gearman.o.*initialized successfully' /omd/sites/$site/var/log/nagios.log", like => '/successfully/' }, - { cmd => "/bin/grep 'mod_gearman: initialized version ".$modgearman_version." $libgearman ".$libgearman_version."$' /omd/sites/$site/var/log/nagios.log", like => '/initialized/' }, + { cmd => "/bin/grep 'Event broker module.*mod_gearman.o.*initialized successfully' /omd/sites/$site/var/log/$core.log", like => '/successfully/' }, + { cmd => "/bin/grep 'mod_gearman: initialized version ".$modgearman_version." $libgearman ".$libgearman_version."$' /omd/sites/$site/var/log/$core.log", like => '/initialized/' }, { cmd => "/bin/su - $site -c 'bin/send_gearman --server=localhost:4730 --keyfile=etc/mod-gearman/secret.key --host=$host --message=test'" }, { cmd => "/bin/su - $site -c 'bin/send_gearman --server=localhost:4730 --keyfile=etc/mod-gearman/secret.key --host=$host --service=$service --message=test'" }, - { cmd => "/bin/grep -i 'mod_gearman: ERROR' /omd/sites/$site/var/log/nagios.log", 'exit' => 1, like => '/^\s*$/' }, - { cmd => "/bin/grep -i 'mod_gearman: WARN' /omd/sites/$site/var/log/nagios.log", 'exit' => 1, like => '/^\s*$/' }, - { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_gearman -H localhost:4730'", like => '/check_gearman OK/' }, - { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_gearman -H localhost:4730 -q host'", like => '/check_gearman OK/' }, + { cmd => "/bin/grep -i 'mod_gearman: ERROR' /omd/sites/$site/var/log/$core.log", 'exit' => 1, like => '/^\s*$/' }, + { cmd => "/bin/grep -i 'mod_gearman: WARN' /omd/sites/$site/var/log/$core.log", 'exit' => 1, like => '/^\s*$/' }, + { cmd => "/bin/su - $site -c 'lib/$core/plugins/check_gearman -H localhost:4730'", like => '/check_gearman OK/' }, + { cmd => "/bin/su - $site -c 'lib/$core/plugins/check_gearman -H localhost:4730 -q host'", like => '/check_gearman OK/' }, ]; for my $test (@{$tests}) { TestUtils::test_command($test); @@ -85,14 +85,14 @@ for my $core (qw/nagios icinga/) { #--- wait for all services being checked TestUtils::wait_for_content({ - url => "http://localhost/$site/nagios/cgi-bin/status.cgi?host=$host&servicestatustypes=1&hoststatustypes=15", + url => "http://localhost/$site/$core/cgi-bin/status.cgi?host=$host&servicestatustypes=1&hoststatustypes=15", auth => "OMD Monitoring Site $site:omdadmin:omd", like => [ "0 Matching Service Entries Displayed" ], } ); # verify the jobs done - my $test = { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_gearman -H localhost:4730 -q worker_".hostname." -t 10 -s check'", like => [ '/check_gearman OK/' ] }; + my $test = { cmd => "/bin/su - $site -c 'lib/$core/plugins/check_gearman -H localhost:4730 -q worker_".hostname." -t 10 -s check'", like => [ '/check_gearman OK/' ] }; TestUtils::test_command($test); chomp($test->{'stdout'}); unlike($test->{'stdout'}, qr/jobs=0c/, "worker has jobs done: ".$test->{'stdout'}); From git at mathias-kettner.de Tue Sep 11 08:22:49 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 11 Sep 2012 08:22:49 +0200 Subject: [omd-commits] OMD Git: omd: mod-gearman: there is no lib/icinga/plugins Message-ID: <20120911062249.EBAE3840A64@mail.mathias-kettner.de> Module: omd Branch: master Commit: 1854de8f114f0a0478a66ed53af0d566fe15de26 URL: http://omdistro.org/projects/omd/repository/revisions/1854de8f114f0a0478a66ed53af0d566fe15de26 Author: Sven Nierlein Date: Tue Sep 11 08:22:20 2012 +0200 Commiter: Sven Nierlein Date: Tue Sep 11 08:22:20 2012 +0200 mod-gearman: there is no lib/icinga/plugins --- t/31-mod-gearman.t | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/31-mod-gearman.t b/t/31-mod-gearman.t index 61b77ac..68cfec3 100644 --- a/t/31-mod-gearman.t +++ b/t/31-mod-gearman.t @@ -60,8 +60,8 @@ for my $core (qw/nagios icinga/) { { cmd => "/usr/bin/test -s /omd/sites/$site/etc/mod-gearman/secret.key", "exit" => 0 }, { cmd => $omd_bin." start $site", like => [ '/gearmand\.\.\.OK/', '/gearman_worker\.\.\.OK/'], sleep => 1 }, { cmd => $omd_bin." status $site", like => [ '/gearmand:\s+running/', '/gearman_worker:\s*running/'] }, - { cmd => "/bin/su - $site -c './lib/$core/plugins/check_http -H localhost -a omdadmin:omd -u /$site/$core/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=Dummy+Service&start_time=$now&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' }, - { cmd => "/bin/su - $site -c './lib/$core/plugins/check_http -H localhost -a omdadmin:omd -u /$site/$core/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=perl+test&start_time=$now&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' }, + { cmd => "/bin/su - $site -c './lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/$core/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=Dummy+Service&start_time=$now&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' }, + { cmd => "/bin/su - $site -c './lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/$core/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=perl+test&start_time=$now&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' }, ]; for my $test (@{$preps}) { TestUtils::test_command($test) or TestUtils::bail_out_clean("no further testing without proper preparation"); From git at mathias-kettner.de Tue Sep 11 19:29:46 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 11 Sep 2012 19:29:46 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20120911172947.00652840A64@mail.mathias-kettner.de> Module: omd Branch: master Commit: 6a93c6b95e8fcff944529d325b239ccd84faa7fa URL: http://omdistro.org/projects/omd/repository/revisions/6a93c6b95e8fcff944529d325b239ccd84faa7fa Author: Joerg Linge Date: Tue Sep 11 19:29:37 2012 +0200 Commiter: Joerg Linge Date: Tue Sep 11 19:29:37 2012 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Tue Sep 11 19:29:46 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 11 Sep 2012 19:29:46 +0200 Subject: [omd-commits] OMD Git: omd: omd: change some options in etc/check_mk/ defaults while changing CORE between Nagios and Icinga Message-ID: <20120911172947.191408409E1@mail.mathias-kettner.de> Module: omd Branch: master Commit: 6368a49c940054973190bb3f505eb4aafe0f8934 URL: http://omdistro.org/projects/omd/repository/revisions/6368a49c940054973190bb3f505eb4aafe0f8934 Author: Joerg Linge Date: Tue Sep 11 19:28:17 2012 +0200 Commiter: Joerg Linge Date: Tue Sep 11 19:28:17 2012 +0200 omd: change some options in etc/check_mk/defaults while changing CORE between Nagios and Icinga --- packages/omd/CORE.hook | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/packages/omd/CORE.hook b/packages/omd/CORE.hook index 00fd983..ed6bf96 100755 --- a/packages/omd/CORE.hook +++ b/packages/omd/CORE.hook @@ -53,11 +53,19 @@ case "$1" in make_link ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf make_link nagios $OMD_ROOT/etc/init.d/core + sed -i -e "s|^nagios_binary[[:space:]]*=.*$|nagios_binary = '$OMD_ROOT/bin/$2'|" $OMD_ROOT/etc/check_mk/defaults + sed -i -e "s|^nagios_config_file[[:space:]]*=.*$|nagios_config_file = '$OMD_ROOT/tmp/$2/$2.cfg'|" $OMD_ROOT/etc/check_mk/defaults + sed -i -e "s|^nagios_url[[:space:]]*=.*$|nagios_url = '/$OMD_SITE/$2'|" $OMD_ROOT/etc/check_mk/defaults + sed -i -e "s|^nagios_cgi_url[[:space:]]*=.*$|nagios_cgi_url = '/$OMD_SITE/$2/cgi-bin'|" $OMD_ROOT/etc/check_mk/defaults elif [ "$2" == "icinga" ] then make_link ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf make_link icinga $OMD_ROOT/etc/init.d/core + sed -i -e "s|^nagios_binary[[:space:]]*=.*$|nagios_binary = '$OMD_ROOT/bin/$2'|" $OMD_ROOT/etc/check_mk/defaults + sed -i -e "s|^nagios_config_file[[:space:]]*=.*$|nagios_config_file = '$OMD_ROOT/tmp/$2/$2.cfg'|" $OMD_ROOT/etc/check_mk/defaults + sed -i -e "s|^nagios_url[[:space:]]*=.*$|nagios_url = '/$OMD_SITE/$2'|" $OMD_ROOT/etc/check_mk/defaults + sed -i -e "s|^nagios_cgi_url[[:space:]]*=.*$|nagios_cgi_url = '/$OMD_SITE/$2/cgi-bin'|" $OMD_ROOT/etc/check_mk/defaults elif [ "$2" == "shinken" ] then # Thruk is the default interface, but classic is possible From git at mathias-kettner.de Thu Sep 13 10:22:49 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 13 Sep 2012 10:22:49 +0200 Subject: [omd-commits] OMD Git: omd: Fix build for RH 6.3 (labelled package as 6.2) Message-ID: <20120913082249.39C73841273@mail.mathias-kettner.de> Module: omd Branch: master Commit: e0eacf294d231dc8583086c725f47c13b4ea127b URL: http://omdistro.org/projects/omd/repository/revisions/e0eacf294d231dc8583086c725f47c13b4ea127b Author: Mathias Kettner Date: Thu Sep 13 10:22:32 2012 +0200 Commiter: Mathias Kettner Date: Thu Sep 13 10:22:32 2012 +0200 Fix build for RH 6.3 (labelled package as 6.2) --- distros/Makefile.CENTOS_6.3 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/distros/Makefile.CENTOS_6.3 b/distros/Makefile.CENTOS_6.3 index 3a8c21e..0d47636 100644 --- a/distros/Makefile.CENTOS_6.3 +++ b/distros/Makefile.CENTOS_6.3 @@ -1,4 +1,4 @@ -DISTRO_CODE = rh62 +DISTRO_CODE = rh63 BUILD_PACKAGES = BUILD_PACKAGES += boost-devel BUILD_PACKAGES += cairo-devel From git at mathias-kettner.de Thu Sep 13 10:22:49 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 13 Sep 2012 10:22:49 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of ssh://mathias-kettner.de/omd Message-ID: <20120913082249.77A5E840449@mail.mathias-kettner.de> Module: omd Branch: master Commit: ea5fb7e585acef7a06db7da200cb902aef0bdcf4 URL: http://omdistro.org/projects/omd/repository/revisions/ea5fb7e585acef7a06db7da200cb902aef0bdcf4 Author: Mathias Kettner Date: Thu Sep 13 10:22:46 2012 +0200 Commiter: Mathias Kettner Date: Thu Sep 13 10:22:46 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/omd --- From git at mathias-kettner.de Thu Sep 13 13:49:18 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 13 Sep 2012 13:49:18 +0200 Subject: [omd-commits] OMD Git: omd: nagios-plugins: link lib/icinga/plugins to lib/nagios/plugins Message-ID: <20120913114918.6270C841273@mail.mathias-kettner.de> Module: omd Branch: master Commit: 40f6ae92097e4153619e6e4d9ea4d337608f434d URL: http://omdistro.org/projects/omd/repository/revisions/40f6ae92097e4153619e6e4d9ea4d337608f434d Author: Joerg Linge Date: Thu Sep 13 13:48:00 2012 +0200 Commiter: Joerg Linge Date: Thu Sep 13 13:48:00 2012 +0200 nagios-plugins: link lib/icinga/plugins to lib/nagios/plugins --- packages/nagios-plugins/Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/packages/nagios-plugins/Makefile b/packages/nagios-plugins/Makefile index d1a9533..dbdd2d6 100644 --- a/packages/nagios-plugins/Makefile +++ b/packages/nagios-plugins/Makefile @@ -26,6 +26,9 @@ install: install -m 644 $(DIR)/$$file $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME); \ done + # link lib/nagios/plugins to lib/icinga/plugins + ln -s $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins $(DESTDIR)$(OMD_ROOT)/lib/icinga/plugins + skel: clean: From git at mathias-kettner.de Thu Sep 13 13:49:18 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 13 Sep 2012 13:49:18 +0200 Subject: [omd-commits] OMD Git: omd: mod_gearman: fixed tests for icinga Message-ID: <20120913114918.A936E8405D7@mail.mathias-kettner.de> Module: omd Branch: master Commit: 9ee4adc9b4dc09babae2646cd5fb184ca1a4207b URL: http://omdistro.org/projects/omd/repository/revisions/9ee4adc9b4dc09babae2646cd5fb184ca1a4207b Author: Joerg Linge Date: Thu Sep 13 13:48:51 2012 +0200 Commiter: Joerg Linge Date: Thu Sep 13 13:48:51 2012 +0200 mod_gearman: fixed tests for icinga --- t/31-mod-gearman.t | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/t/31-mod-gearman.t b/t/31-mod-gearman.t index 68cfec3..5973163 100644 --- a/t/31-mod-gearman.t +++ b/t/31-mod-gearman.t @@ -60,8 +60,8 @@ for my $core (qw/nagios icinga/) { { cmd => "/usr/bin/test -s /omd/sites/$site/etc/mod-gearman/secret.key", "exit" => 0 }, { cmd => $omd_bin." start $site", like => [ '/gearmand\.\.\.OK/', '/gearman_worker\.\.\.OK/'], sleep => 1 }, { cmd => $omd_bin." status $site", like => [ '/gearmand:\s+running/', '/gearman_worker:\s*running/'] }, - { cmd => "/bin/su - $site -c './lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/$core/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=Dummy+Service&start_time=$now&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' }, - { cmd => "/bin/su - $site -c './lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/$core/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=perl+test&start_time=$now&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' }, + { cmd => "/bin/su - $site -c './lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/$core/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=Dummy+Service&start_time=$now&force_check=on&btnSubmit=Commit\" -r \"successfully submitted\"'", like => '/HTTP OK:/' }, + { cmd => "/bin/su - $site -c './lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/$core/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=perl+test&start_time=$now&force_check=on&btnSubmit=Commit\" -r \"successfully submitted\"'", like => '/HTTP OK:/' }, ]; for my $test (@{$preps}) { TestUtils::test_command($test) or TestUtils::bail_out_clean("no further testing without proper preparation"); @@ -70,12 +70,12 @@ for my $core (qw/nagios icinga/) { ################################################## # execute some checks my $tests = [ - { cmd => "/bin/grep 'Event broker module.*mod_gearman.o.*initialized successfully' /omd/sites/$site/var/log/$core.log", like => '/successfully/' }, - { cmd => "/bin/grep 'mod_gearman: initialized version ".$modgearman_version." $libgearman ".$libgearman_version."$' /omd/sites/$site/var/log/$core.log", like => '/initialized/' }, + { cmd => "/bin/grep 'Event broker module.*mod_gearman.o.*initialized successfully' /omd/sites/$site/var/$core/$core.log", like => '/successfully/' }, + { cmd => "/bin/grep 'mod_gearman: initialized version ".$modgearman_version." $libgearman ".$libgearman_version."$' /omd/sites/$site/var/$core/$core.log", like => '/initialized/' }, { cmd => "/bin/su - $site -c 'bin/send_gearman --server=localhost:4730 --keyfile=etc/mod-gearman/secret.key --host=$host --message=test'" }, { cmd => "/bin/su - $site -c 'bin/send_gearman --server=localhost:4730 --keyfile=etc/mod-gearman/secret.key --host=$host --service=$service --message=test'" }, - { cmd => "/bin/grep -i 'mod_gearman: ERROR' /omd/sites/$site/var/log/$core.log", 'exit' => 1, like => '/^\s*$/' }, - { cmd => "/bin/grep -i 'mod_gearman: WARN' /omd/sites/$site/var/log/$core.log", 'exit' => 1, like => '/^\s*$/' }, + { cmd => "/bin/grep -i 'mod_gearman: ERROR' /omd/sites/$site/var/$core/$core.log", 'exit' => 1, like => '/^\s*$/' }, + { cmd => "/bin/grep -i 'mod_gearman: WARN' /omd/sites/$site/var/$core/$core.log", 'exit' => 1, like => '/^\s*$/' }, { cmd => "/bin/su - $site -c 'lib/$core/plugins/check_gearman -H localhost:4730'", like => '/check_gearman OK/' }, { cmd => "/bin/su - $site -c 'lib/$core/plugins/check_gearman -H localhost:4730 -q host'", like => '/check_gearman OK/' }, ]; From git at mathias-kettner.de Fri Sep 14 10:55:31 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 14 Sep 2012 10:55:31 +0200 Subject: [omd-commits] OMD Git: omd: icinga: make symlink relative Message-ID: <20120914085531.690FB840A7D@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3b47193d387a8e1b35808293f3a18ba25275930c URL: http://omdistro.org/projects/omd/repository/revisions/3b47193d387a8e1b35808293f3a18ba25275930c Author: Sven Nierlein Date: Fri Sep 14 10:55:07 2012 +0200 Commiter: Sven Nierlein Date: Fri Sep 14 10:55:07 2012 +0200 icinga: make symlink relative --- packages/nagios-plugins/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/nagios-plugins/Makefile b/packages/nagios-plugins/Makefile index dbdd2d6..d39d9c5 100644 --- a/packages/nagios-plugins/Makefile +++ b/packages/nagios-plugins/Makefile @@ -27,7 +27,7 @@ install: done # link lib/nagios/plugins to lib/icinga/plugins - ln -s $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins $(DESTDIR)$(OMD_ROOT)/lib/icinga/plugins + cd $(DESTDIR)$(OMD_ROOT)/lib/icinga && ln -s ../nagios/plugins plugins skel: From git at mathias-kettner.de Fri Sep 14 15:40:27 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 14 Sep 2012 15:40:27 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20120914134028.9966A840449@mail.mathias-kettner.de> Module: omd Branch: master Commit: 4648fc91831acf6c1961e4a7557855a31cff12f5 URL: http://omdistro.org/projects/omd/repository/revisions/4648fc91831acf6c1961e4a7557855a31cff12f5 Author: Gerhard Lausser Date: Fri Sep 14 15:38:10 2012 +0200 Commiter: Gerhard Lausser Date: Fri Sep 14 15:38:10 2012 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Fri Sep 14 15:40:27 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 14 Sep 2012 15:40:27 +0200 Subject: [omd-commits] OMD Git: omd: shinken: use own cgi.cfg+shinken.cfg for the old cgi gui Message-ID: <20120914134028.B40CA840A7D@mail.mathias-kettner.de> Module: omd Branch: master Commit: 19a75ee7295d74e2b3a8d103ce01c0b73ec07e1b URL: http://omdistro.org/projects/omd/repository/revisions/19a75ee7295d74e2b3a8d103ce01c0b73ec07e1b Author: Gerhard Lausser Date: Fri Sep 14 03:58:21 2012 +0200 Commiter: Gerhard Lausser Date: Fri Sep 14 03:58:21 2012 +0200 shinken: use own cgi.cfg+shinken.cfg for the old cgi gui --- packages/omd/CORE.hook | 2 +- packages/shinken/skel/etc/shinken/apache-cgi.conf | 29 +++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/packages/omd/CORE.hook b/packages/omd/CORE.hook index ed6bf96..d991798 100755 --- a/packages/omd/CORE.hook +++ b/packages/omd/CORE.hook @@ -69,7 +69,7 @@ case "$1" in elif [ "$2" == "shinken" ] then # Thruk is the default interface, but classic is possible - make_link ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf + make_link ../../shinken/apache-cgi.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf make_link ../../shinken/apache.conf $OMD_ROOT/etc/apache/conf.d/shinken.conf make_link shinken $OMD_ROOT/etc/init.d/core diff --git a/packages/shinken/skel/etc/shinken/apache-cgi.conf b/packages/shinken/skel/etc/shinken/apache-cgi.conf new file mode 100644 index 0000000..54c900d --- /dev/null +++ b/packages/shinken/skel/etc/shinken/apache-cgi.conf @@ -0,0 +1,29 @@ +# Apache configuration for access to Nagios web GUI + +# Handle locally installed files via the internal URI /noc/check_mk/local +# These are files stored below local/share/check_mk/web/htdocs +Alias /###SITE###/nagios/local ###ROOT###/local/share/nagios/htdocs + + Order deny,allow + allow from all + + +ScriptAlias /###SITE###/nagios/cgi-bin ###ROOT###/lib/nagios/cgi-bin + + Order allow,deny + Allow from all + SetEnv NAGIOS_CGI_CONFIG "###ROOT###/etc/shinken/cgi.cfg" + + +Alias /###SITE###/nagios ###ROOT###/share/nagios/htdocs + + Order allow,deny + Allow from all + # Rewrite rules for handling the local-hierarchy. All URI to static + # files are redirected, if those exist in local/. Thus the user + # even can override shipped static files. + RewriteEngine on + RewriteCond "###ROOT###/local/share/nagios/htdocs/$1" "-f" + RewriteRule "(.*)" "/###SITE###/nagios/local/$1" + + From git at mathias-kettner.de Fri Sep 14 23:52:35 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 14 Sep 2012 23:52:35 +0200 Subject: [omd-commits] OMD Git: omd: check_multi: reenable tests which failed because of shinken/ nagios-cgi Message-ID: <20120914215235.80903840A64@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3b1922b93c86b76b28c1f6821c693c5ee5ef18ab URL: http://omdistro.org/projects/omd/repository/revisions/3b1922b93c86b76b28c1f6821c693c5ee5ef18ab Author: Gerhard Lausser Date: Fri Sep 14 23:51:45 2012 +0200 Commiter: Gerhard Lausser Date: Fri Sep 14 23:51:45 2012 +0200 check_multi: reenable tests which failed because of shinken/nagios-cgi --- t/20-package_check_multi.t | 6 +++--- t/packages/check_multi/test/pnp4nagios.cmd | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/t/20-package_check_multi.t b/t/20-package_check_multi.t index 9eba29e..6c9631b 100644 --- a/t/20-package_check_multi.t +++ b/t/20-package_check_multi.t @@ -12,7 +12,7 @@ BEGIN { use lib "$FindBin::Bin/lib/lib/perl5"; } -plan( tests => 135 ); +plan( tests => 137 ); # create our test site my $omd_bin = TestUtils::get_omd_bin(); @@ -86,8 +86,8 @@ my $urls = [ '/npcd/', '/var_diskspace/', '/var_updated_recently/', - #'/process_perfdata_timeout/', - #'/error_in_npcd_log/', + '/process_perfdata_timeout/', + '/error_in_npcd_log/', ], }, { diff --git a/t/packages/check_multi/test/pnp4nagios.cmd b/t/packages/check_multi/test/pnp4nagios.cmd index f9ca47b..8db4713 100644 --- a/t/packages/check_multi/test/pnp4nagios.cmd +++ b/t/packages/check_multi/test/pnp4nagios.cmd @@ -11,8 +11,8 @@ command [ var_diskspace ] = check_disk -w 20% -c 10% -p $OMD_ROOT$/va command [ var_updated_recently ] = check_file_age -w 300 -c 600 -f $OMD_ROOT$/var/pnp4nagios #--- check for timeouts in process_perfdata.log -#command [ process_perfdata_timeout ] = check_logfiles --timeout=10 --logfile=$OMD_ROOT$/var/pnp4nagios/log/perfdata.log --tag=timeout --criticalpattern TIMEOUT --nologfilenocry --seekfilesdir=$OMD_ROOT$/tmp --protocolsdir=$OMD_ROOT$/tmp +command [ process_perfdata_timeout ] = check_logfiles --timeout=10 --logfile=$OMD_ROOT$/var/pnp4nagios/log/perfdata.log --tag=timeout --criticalpattern TIMEOUT --nologfilenocry --seekfilesdir=$OMD_ROOT$/tmp --protocolsdir=$OMD_ROOT$/tmp #--- check for errors in npcd.log -#command [ error_in_npcd_log ] = check_logfiles --timeout=10 --logfile=$OMD_ROOT$/var/pnp4nagios/log/npcd.log --tag=error --criticalpattern ERROR --nologfilenocry --nologfilenocry --seekfilesdir=$OMD_ROOT$/tmp --protocolsdir=$OMD_ROOT$/tmp +command [ error_in_npcd_log ] = check_logfiles --timeout=10 --logfile=$OMD_ROOT$/var/pnp4nagios/log/npcd.log --tag=error --criticalpattern ERROR --nologfilenocry --nologfilenocry --seekfilesdir=$OMD_ROOT$/tmp --protocolsdir=$OMD_ROOT$/tmp From git at mathias-kettner.de Fri Sep 21 13:24:35 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 21 Sep 2012 13:24:35 +0200 Subject: [omd-commits] OMD Git: omd: Updated nagvis to 1.7.1 Message-ID: <20120921112435.C9AAA842FFF@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7020e0f9c393699b5678e400ddf332d0b39d29e7 URL: http://omdistro.org/projects/omd/repository/revisions/7020e0f9c393699b5678e400ddf332d0b39d29e7 Author: Lars Michelsen Date: Fri Sep 21 13:00:57 2012 +0200 Commiter: Lars Michelsen Date: Fri Sep 21 13:00:57 2012 +0200 Updated nagvis to 1.7.1 --- Changelog | 1 + packages/nagvis/Makefile | 6 +++--- .../{nagvis-1.6.5.tar.gz => nagvis-1.7.1.tar.gz} | Bin 3402074 -> 3488146 bytes packages/nagvis/skel.permissions | 18 +++++++++++------- packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Changelog b/Changelog index 8db333e..a479c22 100644 --- a/Changelog +++ b/Changelog @@ -13,6 +13,7 @@ This file documents the revision history for the Open Monitoring Distribution - Thruk: Update to 1.46 - Nagios Plugins: Update to 1.4.16 - PNP4Nagios: Update to 0.6.19 + - NagVis: Update to 1.7.1 - Icinga: Update to 1.7.2 - Check_MK: Added 1.2.0p2 release - Support Ubuntu 12.04 (Precise) diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile index 1fdd2db..3f18bed 100644 --- a/packages/nagvis/Makefile +++ b/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.6.5 +VERSION = 1.7.1 DIR = $(NAME)-$(VERSION) .PHONY: skel @@ -39,11 +39,11 @@ install: # Move demo config files mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/conf.d - mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/automaps mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/maps + mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/geomap mv $(DESTDIR)$(OMD_ROOT)/share/nagvis/etc/conf.d/*.ini.php $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/conf.d - mv $(DESTDIR)$(OMD_ROOT)/share/nagvis/etc/automaps/*.cfg $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/automaps mv $(DESTDIR)$(OMD_ROOT)/share/nagvis/etc/maps/*.cfg $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/maps + mv $(DESTDIR)$(OMD_ROOT)/share/nagvis/etc/geomap/demo-*.csv $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/geomap # Delete files/directories we do not want to pack rm -rf $(DESTDIR)$(OMD_ROOT)/share/nagvis/var diff --git a/packages/nagvis/nagvis-1.6.5.tar.gz b/packages/nagvis/nagvis-1.7.1.tar.gz similarity index 55% rename from packages/nagvis/nagvis-1.6.5.tar.gz rename to packages/nagvis/nagvis-1.7.1.tar.gz index 6faae94..5e1ff7e 100644 Binary files a/packages/nagvis/nagvis-1.6.5.tar.gz and b/packages/nagvis/nagvis-1.7.1.tar.gz differ diff --git a/packages/nagvis/skel.permissions b/packages/nagvis/skel.permissions index b338e3d..828a9ad 100644 --- a/packages/nagvis/skel.permissions +++ b/packages/nagvis/skel.permissions @@ -1,14 +1,19 @@ etc/nagvis 775 etc/nagvis/maps 775 -etc/nagvis/maps/demo2.cfg 664 -etc/nagvis/maps/demo.cfg 664 -etc/nagvis/maps/demo-map.cfg 664 -etc/nagvis/maps/demo-server.cfg 664 -etc/nagvis/automaps 775 -etc/nagvis/automaps/__automap.cfg 664 +etc/nagvis/maps/demo-overview.cfg 664 +etc/nagvis/maps/demo-muc-srv1.cfg 664 +etc/nagvis/maps/demo-load.cfg 664 +etc/nagvis/maps/demo-ham-racks.cfg 664 +etc/nagvis/maps/demo-germany.cfg 664 +etc/nagvis/maps/demo-geomap.cfg 664 +etc/nagvis/maps/demo-automap.cfg 664 +etc/nagvis/maps/demo-automap2.cfg 664 +etc/nagvis/geomap 775 +etc/nagvis/geomap/demo-locations.csv 664 etc/nagvis/nagvis.ini.php 664 etc/nagvis/conf.d 775 etc/nagvis/conf.d/omd.ini.php 664 +etc/nagvis/conf.d/demo.ini.php 664 local/share/nagvis/htdocs/userfiles/images/maps 775 local/share/nagvis/htdocs/userfiles/images/shapes 775 tmp/nagvis 775 @@ -16,4 +21,3 @@ tmp/nagvis/share 775 tmp/nagvis/tmpl/compile 775 tmp/nagvis/tmpl/cache 775 var/nagvis/profiles 775 - diff --git a/packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php b/packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php index 858b306..80558bb 100644 --- a/packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php +++ b/packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php @@ -15,7 +15,7 @@ base="###ROOT###/share/nagvis/" local_base="###ROOT###/local/share/nagvis/" cfg="###ROOT###/etc/nagvis/" mapcfg="###ROOT###/etc/nagvis/maps/" -automapcfg="###ROOT###/etc/nagvis/automaps/" +geomap="###ROOT###/etc/nagvis/geomap/" var="###ROOT###/tmp/nagvis/" sharedvar="###ROOT###/tmp/nagvis/share/" profiles="###ROOT###/var/nagvis/profiles/" From git at mathias-kettner.de Fri Sep 21 13:45:51 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 21 Sep 2012 13:45:51 +0200 Subject: [omd-commits] OMD Git: omd: thruk: update 1.48 Message-ID: <20120921114551.3C1CC842FFF@mail.mathias-kettner.de> Module: omd Branch: master Commit: dd491b3141c9c2dabf2c8d8a362d004e14728e72 URL: http://omdistro.org/projects/omd/repository/revisions/dd491b3141c9c2dabf2c8d8a362d004e14728e72 Author: Sven Nierlein Date: Fri Sep 21 13:44:58 2012 +0200 Commiter: Sven Nierlein Date: Fri Sep 21 13:45:47 2012 +0200 thruk: update 1.48 --- Changelog | 2 +- packages/thruk/Makefile | 2 +- packages/thruk/Thruk-1.46.tar.gz | Bin 5651381 -> 0 bytes packages/thruk/Thruk-1.48.tar.gz | Bin 0 -> 5653347 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index a479c22..d3b1b41 100644 --- a/Changelog +++ b/Changelog @@ -10,7 +10,7 @@ This file documents the revision history for the Open Monitoring Distribution (Does not mean omd version update.) - check_multi: updated to 0.26_538 - Mod-Gearman: Updated to version 1.3.8 - - Thruk: Update to 1.46 + - Thruk: Update to 1.48 - Nagios Plugins: Update to 1.4.16 - PNP4Nagios: Update to 0.6.19 - NagVis: Update to 1.7.1 diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile index 7fd8eff..a49cda4 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.46 +VERSION = 1.48 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/Thruk-1.46.tar.gz b/packages/thruk/Thruk-1.46.tar.gz deleted file mode 100644 index a257ad1..0000000 Binary files a/packages/thruk/Thruk-1.46.tar.gz and /dev/null differ diff --git a/packages/thruk/Thruk-1.48.tar.gz b/packages/thruk/Thruk-1.48.tar.gz new file mode 100644 index 0000000..604dc2f Binary files /dev/null and b/packages/thruk/Thruk-1.48.tar.gz differ From git at mathias-kettner.de Sat Sep 22 21:43:39 2012 From: git at mathias-kettner.de (git version control) Date: Sat, 22 Sep 2012 21:43:39 +0200 Subject: [omd-commits] OMD Git: omd: Added Support for omd local directory structure for Dokuwiki Message-ID: <20120922194339.1850184226E@mail.mathias-kettner.de> Module: omd Branch: master Commit: 38ca0b7f3c7ccc41cf309daa9dc8f18b73f73a8f URL: http://omdistro.org/projects/omd/repository/revisions/38ca0b7f3c7ccc41cf309daa9dc8f18b73f73a8f Author: Bastian Kuhn Date: Fri Sep 21 18:03:52 2012 +0200 Commiter: Bastian Kuhn Date: Fri Sep 21 18:03:52 2012 +0200 Added Support for omd local directory structure for Dokuwiki --- packages/dokuwiki/skel/etc/dokuwiki/apache.conf | 9 +++++++++ packages/dokuwiki/skel/etc/dokuwiki/local.php | 2 ++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/packages/dokuwiki/skel/etc/dokuwiki/apache.conf b/packages/dokuwiki/skel/etc/dokuwiki/apache.conf index 8b6b7a8..940949b 100644 --- a/packages/dokuwiki/skel/etc/dokuwiki/apache.conf +++ b/packages/dokuwiki/skel/etc/dokuwiki/apache.conf @@ -1,5 +1,12 @@ # SAMPLE CONFIG SNIPPETS FOR APACHE WEB SERVER +Alias /###SITE###/wiki/local "/omd/sites/###SITE###/local/share/dokuwiki/htdocs" + + + Order deny,allow + allow from all + + Alias /###SITE###/wiki "/omd/sites/###SITE###/share/dokuwiki/htdocs" @@ -7,6 +14,8 @@ Alias /###SITE###/wiki "/omd/sites/###SITE###/share/dokuwiki/htdocs" Allow from all RewriteEngine on + RewriteCond "/omd/sites/###SITE###/local/share/dokuwiki/htdocs/$1" "-f" + RewriteRule "(.*)" "/###SITE###/wiki/local/$1" RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L] diff --git a/packages/dokuwiki/skel/etc/dokuwiki/local.php b/packages/dokuwiki/skel/etc/dokuwiki/local.php index 0317994..d611b38 100644 --- a/packages/dokuwiki/skel/etc/dokuwiki/local.php +++ b/packages/dokuwiki/skel/etc/dokuwiki/local.php @@ -7,4 +7,6 @@ $conf['template']='arctic'; $conf['tpl']['arctic']['left_sidebar_content'] = 'index'; $conf['multisite']['authfile'] = '/omd/sites/###SITE###/var/check_mk/wato/auth/auth.php'; $conf['multisite']['auth_secret'] = '/omd/sites/###SITE###/etc/auth.secret'; +$conf['tpl']['vector']['vector_navigation_location'] = 'sidebar'; + ?> diff --git a/packages/dokuwiki/skel/share/dokuwiki/htdocs/.gitignore b/packages/dokuwiki/skel/share/dokuwiki/htdocs/.gitignore new file mode 100644 index 0000000..e69de29 From git at mathias-kettner.de Sat Sep 22 21:43:39 2012 From: git at mathias-kettner.de (git version control) Date: Sat, 22 Sep 2012 21:43:39 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20120922194339.7BED08404D9@mail.mathias-kettner.de> Module: omd Branch: master Commit: 6bae4e6849565bca6b006aeb4286e5264ef5210b URL: http://omdistro.org/projects/omd/repository/revisions/6bae4e6849565bca6b006aeb4286e5264ef5210b Author: Bastian Kuhn Date: Sat Sep 22 21:43:35 2012 +0200 Commiter: Bastian Kuhn Date: Sat Sep 22 21:43:35 2012 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Sat Sep 22 21:43:39 2012 From: git at mathias-kettner.de (git version control) Date: Sat, 22 Sep 2012 21:43:39 +0200 Subject: [omd-commits] OMD Git: omd: Corrected dokuwiki local bin Message-ID: <20120922194339.8E095841E2B@mail.mathias-kettner.de> Module: omd Branch: master Commit: 73aab58d991e3e907b4b96d8b8f6864518af6f9b URL: http://omdistro.org/projects/omd/repository/revisions/73aab58d991e3e907b4b96d8b8f6864518af6f9b Author: Bastian Kuhn Date: Sat Sep 22 21:42:56 2012 +0200 Commiter: Bastian Kuhn Date: Sat Sep 22 21:42:56 2012 +0200 Corrected dokuwiki local bin --- .../{ => local}/share/dokuwiki/htdocs/.gitignore | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/dokuwiki/skel/share/dokuwiki/htdocs/.gitignore b/packages/dokuwiki/skel/local/share/dokuwiki/htdocs/.gitignore similarity index 100% rename from packages/dokuwiki/skel/share/dokuwiki/htdocs/.gitignore rename to packages/dokuwiki/skel/local/share/dokuwiki/htdocs/.gitignore From git at mathias-kettner.de Mon Sep 24 13:12:18 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Sep 2012 13:12:18 +0200 Subject: [omd-commits] OMD Git: omd: Updated gitignore Message-ID: <20120924111218.EEB96843624@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7ed26d07a054a4873b37b0425192b2b7497b800d URL: http://omdistro.org/projects/omd/repository/revisions/7ed26d07a054a4873b37b0425192b2b7497b800d Author: Lars Michelsen Date: Mon Sep 24 12:38:10 2012 +0200 Commiter: Lars Michelsen Date: Mon Sep 24 12:38:10 2012 +0200 Updated gitignore --- packages/check_logfiles/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/packages/check_logfiles/.gitignore b/packages/check_logfiles/.gitignore index 70014cf..ccefbbc 100644 --- a/packages/check_logfiles/.gitignore +++ b/packages/check_logfiles/.gitignore @@ -1,2 +1,3 @@ check_logfiles-[0-9].[0-9].[0-9].[0-9] check_logfiles-[0-9].[0-9].[0-9] +check_logfiles-[0-9].[0-9] From git at mathias-kettner.de Mon Sep 24 13:12:18 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Sep 2012 13:12:18 +0200 Subject: [omd-commits] OMD Git: omd: make setup now also registers deb/ ubuntu alternatives switch for the development version Message-ID: <20120924111219.04245843621@mail.mathias-kettner.de> Module: omd Branch: master Commit: 974bd4876f60367bc57bc65e1f5d510fc823b583 URL: http://omdistro.org/projects/omd/repository/revisions/974bd4876f60367bc57bc65e1f5d510fc823b583 Author: Lars Michelsen Date: Mon Sep 24 12:29:36 2012 +0200 Commiter: Lars Michelsen Date: Mon Sep 24 12:29:36 2012 +0200 make setup now also registers deb/ubuntu alternatives switch for the development version --- Makefile | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 458fe2d..7d73346 100644 --- a/Makefile +++ b/Makefile @@ -276,7 +276,7 @@ deb-snap: deb-environment git checkout -- Makefile.omd packages/omd/omd # Only to be used for developement testing setup -setup: pack xzf +setup: pack xzf alt # Only for development: install tarball below / xzf: @@ -284,6 +284,16 @@ xzf: chmod 4755 $(OMD_ROOT)/lib/nagios/plugins/check_{icmp,dhcp} $(APACHE_CTL) -k graceful +# On debian based systems register the alternative switches +alt: + @if which update-alternatives >/dev/null 2>&1; then \ + update-alternatives --install /omd/versions/default \ + omd /omd/versions/$(OMD_VERSION) $(OMD_SERIAL) \ + --slave /usr/bin/omd omd.bin /omd/versions/$(OMD_VERSION)/bin/omd \ + --slave /usr/share/man/man8/omd.8.gz omd.man8 \ + /omd/versions/$(OMD_VERSION)/share/man/man8/omd.8.gz ; \ + fi ; + version: @if [ -z "$(VERSION)" ] ; then \ newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(OMD_VERSION)") ; \ From git at mathias-kettner.de Mon Sep 24 13:12:18 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Sep 2012 13:12:18 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20120924111219.1ABF384051C@mail.mathias-kettner.de> Module: omd Branch: master Commit: ff01932e0ab08a5b34cf4403ca362ba5b2153c99 URL: http://omdistro.org/projects/omd/repository/revisions/ff01932e0ab08a5b34cf4403ca362ba5b2153c99 Author: Lars Michelsen Date: Mon Sep 24 13:12:15 2012 +0200 Commiter: Lars Michelsen Date: Mon Sep 24 13:12:15 2012 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Mon Sep 24 13:12:18 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Sep 2012 13:12:18 +0200 Subject: [omd-commits] OMD Git: omd: Migrated nagvis tests to be compatible with 1.7x code Message-ID: <20120924111219.51E87843621@mail.mathias-kettner.de> Module: omd Branch: master Commit: 332d27f601fd6d4db6d33a39248c1093f36f8243 URL: http://omdistro.org/projects/omd/repository/revisions/332d27f601fd6d4db6d33a39248c1093f36f8243 Author: Lars Michelsen Date: Mon Sep 24 13:06:29 2012 +0200 Commiter: Lars Michelsen Date: Mon Sep 24 13:06:29 2012 +0200 Migrated nagvis tests to be compatible with 1.7x code --- packages/nagvis/Makefile | 2 +- packages/nagvis/nagvis-1.7-nightly.tar.gz | Bin 0 -> 3488328 bytes packages/nagvis/update-nagvis | 4 +- t/20-package_nagvis.t | 85 ++++------------------------- 4 files changed, 14 insertions(+), 77 deletions(-) diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile index 3f18bed..a5adb10 100644 --- a/packages/nagvis/Makefile +++ b/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.7.1 +VERSION = 1.7-nightly 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 new file mode 100644 index 0000000..76845b8 Binary files /dev/null and b/packages/nagvis/nagvis-1.7-nightly.tar.gz differ diff --git a/packages/nagvis/update-nagvis b/packages/nagvis/update-nagvis index 1be07d8..31025c3 100755 --- a/packages/nagvis/update-nagvis +++ b/packages/nagvis/update-nagvis @@ -1,8 +1,8 @@ #!/bin/bash if [ "$1" = "nightly" ]; then - VERSION=1.6-nightly + VERSION=1.7-nightly echo "Adding current nightly build..." - wget -O nagvis-$VERSION.tar.gz http://nagvis.org/share/nagvis-$VERSION.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) [ -z "$VERSION" ] && echo "ERROR: Got no version." && exit 1 diff --git a/t/20-package_nagvis.t b/t/20-package_nagvis.t index 2ea4046..ea0e0e0 100644 --- a/t/20-package_nagvis.t +++ b/t/20-package_nagvis.t @@ -12,7 +12,7 @@ BEGIN { use lib "$FindBin::Bin/lib/lib/perl5"; } -my $num_tests = 449; +my $num_tests = 382; if($ENV{NAGVIS_DEVEL}) { $num_tests += 3; } @@ -41,7 +41,7 @@ my $version = site_nagvis_version($site); ################################################## # Check installation paths site_thing_exists($site, 'etc/nagvis/maps'); -site_thing_exists($site, 'etc/nagvis/automaps'); +site_thing_exists($site, 'etc/nagvis/geomap'); site_thing_exists($site, 'etc/nagvis/conf.d'); site_thing_exists($site, 'etc/nagvis/conf.d/omd.ini.php'); site_thing_exists($site, 'etc/nagvis/conf.d/urls.ini.php'); @@ -140,6 +140,8 @@ my $urls = [ like => '/, \'demo-germany\'/', 'skip_html_lint' => 1 }), url({ url => "/nagvis/config.php?map=demo-germany", like => '/, \'demo-germany\'/', 'skip_html_lint' => 1 }), + url({ url => "/nagvis/index.php?rotation=demo", + like => '/, \'demo-germany\'/', 'skip_html_lint' => 1 }), # Ajax fetched dialogs # FIXME: only valid when not using trusted auth: @@ -290,8 +292,9 @@ TestUtils::test_url( like => [ '/form name="loginform"/', '/name="_username"/', '/name="_password"/' ]}) ); +# perform a random request which sould not be allowed to be requested by non logged in users TestUtils::test_url( - url({ url => '/nagvis/server/core/ajax_handler.php?mod=General&act=getCfgFileAges&f[]=mainCfg', + url({ url => '/nagvis/server/core/ajax_handler.php?mod=General&act=getHoverTemplate&name[]=default', like => [ '/{"message":"You are not authenticated"/' ]}) ); @@ -317,13 +320,13 @@ TestUtils::test_url( ); #diag('Test logging in at ajax API using _GET vars'); +# Use random page to login by GET vars TestUtils::test_url( - url({ url => '/nagvis/server/core/ajax_handler.php?mod=General&act=getCfgFileAges&f[]=mainCfg' + url({ url => '/nagvis/server/core/ajax_handler.php?mod=General&act=getHoverTemplate&name[]=default' .'&_username=omdadmin&_password=omd', - like => [ '/^{"mainCfg":/' ]}) + like => [ '/"name":"default","css_file":/' ]}) ); - # Disable dialog auth to use the environment auth for further testing $auth = $orig_auth; site_remove_file($site, 'etc/apache/conf.d/nagvis-auth.conf'); @@ -333,43 +336,6 @@ TestUtils::test_command({ cmd => $omd_bin." restart $site apache" }); ################################################## # AJAX API tests -# /nagvis/server/core/ajax_handler.php?mod=General&act=getCfgFileAges&f[]=mainCfg -# {"mainCfg":1296327919} => mtime of /etc/nagvis/nagvis.ini.php -# -# 1. Test the file age returned by NagVis and compare it with the mtime fetched by this test -# 2. Touch the file and check if the API returns the new age -# 3. Do the same with a map config file -# 4. Do the same with an automap config file -TestUtils::test_url( - api_url({ url => '/nagvis/server/core/ajax_handler.php?mod=General&act=getCfgFileAges&f[]=mainCfg', - like => '/^{"mainCfg":'.site_nagvis_maincfg_mtime($site).'}$/' }) -); - -TestUtils::test_url( - api_url({ url => '/nagvis/server/core/ajax_handler.php?mod=General&act=getCfgFileAges&f[]=mainCfg', - like => '/^{"mainCfg":'.site_touch($site, 'etc/nagvis/nagvis.ini.php').'}$/' }) -); - -TestUtils::test_url( - api_url({ url => '/nagvis/server/core/ajax_handler.php?mod=General&act=getCfgFileAges&f[]=mainCfg&m[]=demo-germany', - like => '/^{"mainCfg":'.site_nagvis_maincfg_mtime($site).',"demo-germany":'.site_mtime($site, 'etc/nagvis/maps/demo-germany.cfg').'}$/' }) -); - -TestUtils::test_url( - api_url({ url => '/nagvis/server/core/ajax_handler.php?mod=General&act=getCfgFileAges&f[]=mainCfg&m[]=demo-germany', - like => '/^{"mainCfg":'.site_nagvis_maincfg_mtime($site).',"demo-germany":'.site_touch($site, 'etc/nagvis/maps/demo-germany.cfg').'}$/' }) -); - -TestUtils::test_url( - api_url({ url => '/nagvis/server/core/ajax_handler.php?mod=General&act=getCfgFileAges&f[]=mainCfg&am[]=__automap', - like => '/^{"mainCfg":'.site_nagvis_maincfg_mtime($site).',"__automap":'.site_mtime($site, 'etc/nagvis/automaps/__automap.cfg').'}$/' }) -); - -TestUtils::test_url( - api_url({ url => '/nagvis/server/core/ajax_handler.php?mod=General&act=getCfgFileAges&f[]=mainCfg&am[]=__automap', - like => '/^{"mainCfg":'.site_nagvis_maincfg_mtime($site).',"__automap":'.site_touch($site, 'etc/nagvis/automaps/__automap.cfg').'}$/' }) -); - # /nagvis/server/core/ajax_handler.php?mod=General&act=getHoverTemplate&name[]=default # [{"name":"default","code":"<...>"}] TestUtils::test_url( @@ -414,7 +380,7 @@ TestUtils::test_url( # {"cellsperrow":4,"showautomaps":1,"showmaps":1,"showgeomap":0,"showmapthumbs":0,"showrotations":1,"page_title":"NagVis 1.5.7","favicon_image":"\/nagvis\/frontend\/nagvis-js\/images\/internal\/favicon.png","background_color":"#ffffff","lang_mapIndex":"Map Index","lang_automapIndex":"Automap Index","lang_rotationPools":"Rotation Pools","event_log":0,"event_log_level":"info","event_log_height":100,"event_log_hidden":1} TestUtils::test_url( api_url({ url => '/nagvis/server/core/ajax_handler.php?mod=Overview&act=getOverviewProperties', - like => [ '/"showautomaps":1,"showmaps":1,"showgeomap":0,"showmapthumbs":0,"showrotations":1/', ]}) + like => [ '/"showmaps":1,"showgeomap":0,"showmapthumbs":0,"showrotations":1/', ]}) ); # /nagvis/server/core/ajax_handler.php?mod=Overview&act=getOverviewMaps @@ -423,12 +389,6 @@ TestUtils::test_url( like => [ '/"alias":/', ]}) ); -# /nagvis/server/core/ajax_handler.php?mod=Overview&act=getOverviewAutomaps -TestUtils::test_url( - api_url_list({ url => '/nagvis/server/core/ajax_handler.php?mod=Overview&act=getOverviewAutomaps', - like => [ '/"alias":/', ]}) -); - # /nagvis/server/core/ajax_handler.php?mod=Overview&act=getOverviewRotations TestUtils::test_url( api_url_list({ url => '/nagvis/server/core/ajax_handler.php?mod=Overview&act=getOverviewRotations', @@ -444,32 +404,9 @@ TestUtils::test_url( TestUtils::test_url( api_url_list({ url => '/nagvis/server/core/ajax_handler.php?mod=Overview&act=getObjectStates&ty=state&i[]=automap-notexisting', - like => [ '/"state":"ERROR/', '/Map configuration file does not exist/' ]}) -); - -############################################################################### -# AUTOMAP -############################################################################### -# /nagvis/server/core/ajax_handler.php?mod=AutoMap&act=getAutomapProperties&show=__automap&childLayers=2 -TestUtils::test_url( - api_url({ url => '/nagvis/server/core/ajax_handler.php?mod=AutoMap&act=getAutomapProperties&show=__automap&childLayers=2', - like => [ '/"map_name":"__automap","alias":"Default Automap"/', ]}) + like => [ '/"state":"ERROR/', '/Map Error: The path /' ]}) ); -# /nagvis/server/core/ajax_handler.php?mod=AutoMap&act=getAutomapObjects&show=__automap&childLayers=2 -TestUtils::test_url( - api_url_list({ url => '/nagvis/server/core/ajax_handler.php?mod=AutoMap&act=getAutomapObjects&show=__automap&childLayers=2', - like => [ '/"type":"map"/', '/"name":"__automap"/' ]}) -); - -# /nagvis/server/core/ajax_handler.php?mod=AutoMap&act=getObjectStates&show=__automap&ty=state&i[]=0&t[]=host&n1[]=localhost&n2[]=&childLayers=2 -# FIXME: Test the different automap params -TestUtils::test_url( - api_url_list({ url => '/nagvis/server/core/ajax_handler.php?mod=AutoMap&act=getObjectStates&show=__automap&ty=state&i[]=0&t[]=host&n1[]=localhost&n2[]=&childLayers=2', - like => [ '/"state":"/', ]}) -); - - ############################################################################### # Test user config ############################################################################### From git at mathias-kettner.de Sun Sep 30 12:22:55 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 30 Sep 2012 12:22:55 +0200 Subject: [omd-commits] OMD Git: omd: Thruk: Update to 1.50 Message-ID: <20120930102255.AF1708407C3@mail.mathias-kettner.de> Module: omd Branch: master Commit: d90db7ea2900ac7a172ca7cd852f7258302ef6bb URL: http://omdistro.org/projects/omd/repository/revisions/d90db7ea2900ac7a172ca7cd852f7258302ef6bb Author: Sven Nierlein Date: Thu Sep 27 10:21:56 2012 +0200 Commiter: Sven Nierlein Date: Thu Sep 27 23:42:37 2012 +0200 Thruk: Update to 1.50 --- Changelog | 2 +- packages/thruk/Makefile | 2 +- packages/thruk/Thruk-1.48.tar.gz | Bin 5653347 -> 0 bytes packages/thruk/Thruk-1.50.tar.gz | Bin 0 -> 5654326 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index d3b1b41..c8a9337 100644 --- a/Changelog +++ b/Changelog @@ -10,7 +10,7 @@ This file documents the revision history for the Open Monitoring Distribution (Does not mean omd version update.) - check_multi: updated to 0.26_538 - Mod-Gearman: Updated to version 1.3.8 - - Thruk: Update to 1.48 + - Thruk: Update to 1.50 - Nagios Plugins: Update to 1.4.16 - PNP4Nagios: Update to 0.6.19 - NagVis: Update to 1.7.1 diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile index a49cda4..16badcf 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.48 +VERSION = 1.50 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/Thruk-1.48.tar.gz b/packages/thruk/Thruk-1.48.tar.gz deleted file mode 100644 index 604dc2f..0000000 Binary files a/packages/thruk/Thruk-1.48.tar.gz and /dev/null differ diff --git a/packages/thruk/Thruk-1.50.tar.gz b/packages/thruk/Thruk-1.50.tar.gz new file mode 100644 index 0000000..6c4eb22 Binary files /dev/null and b/packages/thruk/Thruk-1.50.tar.gz differ From git at mathias-kettner.de Sun Sep 30 12:22:55 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 30 Sep 2012 12:22:55 +0200 Subject: [omd-commits] OMD Git: omd: released 0.56 Message-ID: <20120930102257.1C4028407C1@mail.mathias-kettner.de> Module: omd Branch: master Commit: b09bf1f367e78809a40879590f22f1ea48060f9f URL: http://omdistro.org/projects/omd/repository/revisions/b09bf1f367e78809a40879590f22f1ea48060f9f Author: Sven Nierlein Date: Tue Sep 25 13:27:37 2012 +0200 Commiter: Sven Nierlein Date: Thu Sep 27 23:42:37 2012 +0200 released 0.56 --- Changelog | 2 +- Makefile.omd | 4 ++-- packages/omd/omd | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index c8a9337..9c87bb0 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,6 @@ This file documents the revision history for the Open Monitoring Distribution -0.56 not yet released +0.56 Sep 25 2012 - omd: - Fixed problem updating omd sites without tmpfs: Not removing whole tmp/ directory but only the contents diff --git a/Makefile.omd b/Makefile.omd index e2e17a2..eed6c63 100644 --- a/Makefile.omd +++ b/Makefile.omd @@ -1,7 +1,7 @@ # General settings included by all packages -OMD_VERSION = 0.54 -OMD_SERIAL = 28 +OMD_VERSION = 0.56 +OMD_SERIAL = 29 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 6dfbecb..0a6ef1a 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 = "0.54" +OMD_VERSION = "0.56" # colored output, if stdout is a tty on_tty = sys.stdout.isatty()