From git at mathias-kettner.de Thu Mar 6 12:53:51 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 06 Mar 2014 12:53:51 +0100 Subject: [omd-commits] OMD Git: omd: add dietlib-dev to BUILD_PACKAGES Message-ID: <20140306115351.E834D82A32@mail.mathias-kettner.de> Module: omd Branch: master Commit: 74dec0b8096defd4fd52f7b08d9b4258c000f3fb URL: http://omdistro.org/projects/omd/repository/revisions/74dec0b8096defd4fd52f7b08d9b4258c000f3fb Author: Andreas Boesl Date: Thu Mar 6 12:53:01 2014 +0100 Commiter: Andreas Boesl Date: Thu Mar 6 12:53:01 2014 +0100 add dietlib-dev to BUILD_PACKAGES --- distros/Makefile.DEBIAN_5.0 | 1 + distros/Makefile.DEBIAN_6.0 | 1 + distros/Makefile.DEBIAN_7.0 | 1 + distros/Makefile.OPENSUSE_12.1 | 1 + distros/Makefile.UBUNTU_10.04 | 1 + distros/Makefile.UBUNTU_10.10 | 1 + distros/Makefile.UBUNTU_11.04 | 1 + distros/Makefile.UBUNTU_11.10 | 1 + distros/Makefile.UBUNTU_12.04 | 1 + distros/Makefile.UBUNTU_12.10 | 1 + 10 files changed, 10 insertions(+) diff --git a/distros/Makefile.DEBIAN_5.0 b/distros/Makefile.DEBIAN_5.0 index 5933839..3a2052d 100644 --- a/distros/Makefile.DEBIAN_5.0 +++ b/distros/Makefile.DEBIAN_5.0 @@ -29,6 +29,7 @@ BUILD_PACKAGES += apache2-dev # compiling mod_python BUILD_PACKAGES += apache2 # compiling mod_python BUILD_PACKAGES += libcurl4-openssl-dev BUILD_PACKAGES += libradiusclient-ng-dev +BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components OS_PACKAGES = OS_PACKAGES += time # needed for mk-job OS_PACKAGES += traceroute # needed for Check_MK parent scan diff --git a/distros/Makefile.DEBIAN_6.0 b/distros/Makefile.DEBIAN_6.0 index 8cbd77d..dd2f66a 100644 --- a/distros/Makefile.DEBIAN_6.0 +++ b/distros/Makefile.DEBIAN_6.0 @@ -29,6 +29,7 @@ BUILD_PACKAGES += snmp BUILD_PACKAGES += apache2-dev # compiling mod_python BUILD_PACKAGES += apache2 # compiling mod_python BUILD_PACKAGES += libradiusclient-ng-dev +BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components OS_PACKAGES = OS_PACKAGES += time # needed for mk-job OS_PACKAGES += traceroute # needed for Check_MK parent scan diff --git a/distros/Makefile.DEBIAN_7.0 b/distros/Makefile.DEBIAN_7.0 index 6e3f215..d2efc4c 100644 --- a/distros/Makefile.DEBIAN_7.0 +++ b/distros/Makefile.DEBIAN_7.0 @@ -31,6 +31,7 @@ BUILD_PACKAGES += snmp BUILD_PACKAGES += apache2-threaded-dev # compiling mod_python BUILD_PACKAGES += apache2 # compiling mod_python BUILD_PACKAGES += libradiusclient-ng-dev +BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components OS_PACKAGES = OS_PACKAGES += time # needed for mk-job OS_PACKAGES += traceroute # needed for Check_MK parent scan diff --git a/distros/Makefile.OPENSUSE_12.1 b/distros/Makefile.OPENSUSE_12.1 index a081166..c0d4d40 100644 --- a/distros/Makefile.OPENSUSE_12.1 +++ b/distros/Makefile.OPENSUSE_12.1 @@ -32,6 +32,7 @@ BUILD_PACKAGES += readline-devel BUILD_PACKAGES += apache2-devel BUILD_PACKAGES += groff BUILD_PACKAGES += freeradius-client-devel +BUILD_PACKAGES += dietlibc # is not really needed, but useful for cmk components OS_PACKAGES = OS_PACKAGES += net-tools # traceroute is needed for Check_MK parent scan OS_PACKAGES += apache2 diff --git a/distros/Makefile.UBUNTU_10.04 b/distros/Makefile.UBUNTU_10.04 index cb1fde1..d40e5b2 100644 --- a/distros/Makefile.UBUNTU_10.04 +++ b/distros/Makefile.UBUNTU_10.04 @@ -30,6 +30,7 @@ BUILD_PACKAGES += snmp BUILD_PACKAGES += apache2-dev # compiling mod_python BUILD_PACKAGES += apache2 # compiling mod_python BUILD_PACKAGES += libradiusclient-ng-dev +BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components OS_PACKAGES = OS_PACKAGES += time # needed for mk-job OS_PACKAGES += traceroute # needed for Check_MK parent scan diff --git a/distros/Makefile.UBUNTU_10.10 b/distros/Makefile.UBUNTU_10.10 index f9a8d47..10e140c 100644 --- a/distros/Makefile.UBUNTU_10.10 +++ b/distros/Makefile.UBUNTU_10.10 @@ -30,6 +30,7 @@ BUILD_PACKAGES += snmp BUILD_PACKAGES += apache2-dev # compiling mod_python BUILD_PACKAGES += apache2 # compiling mod_python BUILD_PACKAGES += libradiusclient-ng-dev +BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components OS_PACKAGES = OS_PACKAGES += time # needed for mk-job OS_PACKAGES += traceroute # needed for Check_MK parent scan diff --git a/distros/Makefile.UBUNTU_11.04 b/distros/Makefile.UBUNTU_11.04 index 2fc646e..65357fd 100644 --- a/distros/Makefile.UBUNTU_11.04 +++ b/distros/Makefile.UBUNTU_11.04 @@ -30,6 +30,7 @@ BUILD_PACKAGES += snmp BUILD_PACKAGES += apache2-dev # compiling mod_python BUILD_PACKAGES += apache2 # compiling mod_python BUILD_PACKAGES += libradiusclient-ng-dev +BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components OS_PACKAGES = OS_PACKAGES += time # needed for mk-job OS_PACKAGES += traceroute # needed for Check_MK parent scan diff --git a/distros/Makefile.UBUNTU_11.10 b/distros/Makefile.UBUNTU_11.10 index f2c3393..a441986 100644 --- a/distros/Makefile.UBUNTU_11.10 +++ b/distros/Makefile.UBUNTU_11.10 @@ -31,6 +31,7 @@ BUILD_PACKAGES += snmp BUILD_PACKAGES += apache2-dev # compiling mod_python BUILD_PACKAGES += apache2 # compiling mod_python BUILD_PACKAGES += libradiusclient-ng-dev +BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components OS_PACKAGES = OS_PACKAGES += time # needed for mk-job OS_PACKAGES += traceroute # needed for Check_MK parent scan diff --git a/distros/Makefile.UBUNTU_12.04 b/distros/Makefile.UBUNTU_12.04 index d6fa855..79bc0e8 100644 --- a/distros/Makefile.UBUNTU_12.04 +++ b/distros/Makefile.UBUNTU_12.04 @@ -32,6 +32,7 @@ BUILD_PACKAGES += apache2-dev # compiling mod_python BUILD_PACKAGES += apache2 # compiling mod_python BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman BUILD_PACKAGES += libradiusclient-ng-dev +BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components OS_PACKAGES = OS_PACKAGES += time # needed for mk-job OS_PACKAGES += traceroute # needed for Check_MK parent scan diff --git a/distros/Makefile.UBUNTU_12.10 b/distros/Makefile.UBUNTU_12.10 index e9db4bf..2635145 100644 --- a/distros/Makefile.UBUNTU_12.10 +++ b/distros/Makefile.UBUNTU_12.10 @@ -32,6 +32,7 @@ BUILD_PACKAGES += apache2-threaded-dev # compiling mod_python BUILD_PACKAGES += apache2 # compiling mod_python BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman BUILD_PACKAGES += libradiusclient-ng-dev +BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components OS_PACKAGES = OS_PACKAGES += time # needed for mk-job OS_PACKAGES += traceroute # needed for Check_MK parent scan From git at mathias-kettner.de Mon Mar 17 15:21:02 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 17 Mar 2014 15:21:02 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140317142102.4C10D828AF@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7cfa58eab0a2f5fbb893f7456c9cb2fa7aac9255 URL: http://omdistro.org/projects/omd/repository/revisions/7cfa58eab0a2f5fbb893f7456c9cb2fa7aac9255 Author: Gerhard Lausser Date: Mon Mar 17 15:20:36 2014 +0100 Commiter: Gerhard Lausser Date: Mon Mar 17 15:20:36 2014 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Mon Mar 17 15:21:02 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 17 Mar 2014 15:21:02 +0100 Subject: [omd-commits] OMD Git: omd: check_oracle_health: bugfix (db not mounted was not handled) Message-ID: <20140317142102.67F96828AD@mail.mathias-kettner.de> Module: omd Branch: master Commit: 68144ae44ab978b35d0435ad076d18d58c5cf2c3 URL: http://omdistro.org/projects/omd/repository/revisions/68144ae44ab978b35d0435ad076d18d58c5cf2c3 Author: Gerhard Lausser Date: Mon Mar 17 15:18:22 2014 +0100 Commiter: Gerhard Lausser Date: Mon Mar 17 15:18:22 2014 +0100 check_oracle_health: bugfix (db not mounted was not handled) --- packages/check_oracle_health/Makefile | 2 +- packages/check_oracle_health/check_oracle_health-1.9.3.2.tar.gz | Bin 161063 -> 0 bytes packages/check_oracle_health/check_oracle_health-1.9.3.3.tar.gz | Bin 0 -> 161092 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index 043e082..8fd234e 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.2 +VERSION = 1.9.3.3 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.2.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.2.tar.gz deleted file mode 100644 index e4e66ee..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.3.2.tar.gz and /dev/null differ diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.3.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.3.tar.gz new file mode 100644 index 0000000..e4ab1b3 Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.9.3.3.tar.gz differ From git at mathias-kettner.de Mon Mar 17 16:57:17 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 17 Mar 2014 16:57:17 +0100 Subject: [omd-commits] OMD Git: omd: tests: updated testutils Message-ID: <20140317155717.CD33782957@mail.mathias-kettner.de> Module: omd Branch: master Commit: 02007ecb944974b97afb6e256c628175f0922ff4 URL: http://omdistro.org/projects/omd/repository/revisions/02007ecb944974b97afb6e256c628175f0922ff4 Author: Sven Nierlein Date: Fri Mar 14 11:53:45 2014 +0100 Commiter: Sven Nierlein Date: Mon Mar 17 16:56:23 2014 +0100 tests: updated testutils --- t/TestUtils.pm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/t/TestUtils.pm b/t/TestUtils.pm index 74184c2..2a1fbc5 100644 --- a/t/TestUtils.pm +++ b/t/TestUtils.pm @@ -338,7 +338,7 @@ sub test_url { $lint->parse($page->{'content'}); my @errors = $lint->errors; @errors = _diag_lint_errors_and_remove_some_exceptions($lint); - is( scalar @errors, 0, "No errors found in HTML" ); + is( scalar @errors, 0, "No errors found in HTML (".$test->{'url'}.")" ); $lint->clear_errors(); } } @@ -473,6 +473,9 @@ sub wait_for_file { my $file = shift; my $timeout = shift || 120; + my $testfile = glob($file); + $file = $testfile if defined $testfile; + my $x = 0; if(-e $file) { pass("file: $file does already exist"); @@ -782,18 +785,17 @@ sub _diag_request { my $test = shift; my $page = shift; + diag(Dumper($page->{'response'})); + $test->{'url'} =~ m/localhost\/(\w+)\//; my $site = $1; return unless defined $site; # check logfiles on apache errors - if( $page->{'code'} == 500 - or $page->{'content'} =~ m/Internal Server Error/) { - _tail("apache logs:", "/omd/sites/$site/var/log/apache/error_log"); - _tail_apache_logs(); - _tail("thruk logs:", "/omd/sites/$site/var/log/thruk.log") if $test->{'url'} =~ m/\/thruk\//; - } - diag(Dumper($page->{'response'})); + _tail("apache logs:", "/omd/sites/$site/var/log/apache/error_log"); + _tail_apache_logs(); + _tail("thruk logs:", "/omd/sites/$site/var/log/thruk.log") if $test->{'url'} =~ m/\/thruk\//; + return; } From git at mathias-kettner.de Tue Mar 18 13:28:16 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 18 Mar 2014 13:28:16 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: Updated to current nightly Message-ID: <20140318122816.A5AF28290C@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3d3630bff907f9b8d24eef0c7bf85c02b07e5a46 URL: http://omdistro.org/projects/omd/repository/revisions/3d3630bff907f9b8d24eef0c7bf85c02b07e5a46 Author: Lars Michelsen Date: Tue Mar 18 13:28:12 2014 +0100 Commiter: Lars Michelsen Date: Tue Mar 18 13:28:12 2014 +0100 nagvis: Updated to current nightly --- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1443439 -> 1443746 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 e9ac3db..089942d 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 Tue Mar 18 19:15:33 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 18 Mar 2014 19:15:33 +0100 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.9.3.4 ( floating points in thresholds) Message-ID: <20140318181533.D0004814BE@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7ed69341e799678506e369eafcc56f462919b78a URL: http://omdistro.org/projects/omd/repository/revisions/7ed69341e799678506e369eafcc56f462919b78a Author: Gerhard Lausser Date: Tue Mar 18 19:14:47 2014 +0100 Commiter: Gerhard Lausser Date: Tue Mar 18 19:14:47 2014 +0100 check_oracle_health: update to 1.9.3.4 (floating points in thresholds) --- packages/check_oracle_health/Makefile | 2 +- packages/check_oracle_health/check_oracle_health-1.9.3.3.tar.gz | Bin 161092 -> 0 bytes packages/check_oracle_health/check_oracle_health-1.9.3.4.tar.gz | Bin 0 -> 161138 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index 8fd234e..3acf553 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.3 +VERSION = 1.9.3.4 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.3.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.3.tar.gz deleted file mode 100644 index e4ab1b3..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.3.3.tar.gz and /dev/null differ diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.4.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.4.tar.gz new file mode 100644 index 0000000..db83dcf Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.9.3.4.tar.gz differ From git at mathias-kettner.de Tue Mar 18 19:15:33 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 18 Mar 2014 19:15:33 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140318181533.E8B0480B15@mail.mathias-kettner.de> Module: omd Branch: master Commit: adf89b32c0071f4c4b9ccadd57cd2a6f10635cbf URL: http://omdistro.org/projects/omd/repository/revisions/adf89b32c0071f4c4b9ccadd57cd2a6f10635cbf Author: Gerhard Lausser Date: Tue Mar 18 19:15:29 2014 +0100 Commiter: Gerhard Lausser Date: Tue Mar 18 19:15:29 2014 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Thu Mar 27 10:18:02 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 27 Mar 2014 10:18:02 +0100 Subject: [omd-commits] OMD Git: omd: NagVis: Updated build Message-ID: <20140327091802.1E99982993@mail.mathias-kettner.de> Module: omd Branch: master Commit: 2fedda350ae77e28c0700e89490e76c61a5bde33 URL: http://omdistro.org/projects/omd/repository/revisions/2fedda350ae77e28c0700e89490e76c61a5bde33 Author: Lars Michelsen Date: Thu Mar 27 10:15:49 2014 +0100 Commiter: Lars Michelsen Date: Thu Mar 27 10:15:49 2014 +0100 NagVis: Updated build --- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1443746 -> 1443940 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 089942d..180255b 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 Mar 27 10:18:02 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 27 Mar 2014 10:18:02 +0100 Subject: [omd-commits] OMD Git: omd: Updated some gitignore files Message-ID: <20140327091802.2C1A8828DD@mail.mathias-kettner.de> Module: omd Branch: master Commit: 8e2d4fc84bc62b576b13406250ec0502dfc7ca51 URL: http://omdistro.org/projects/omd/repository/revisions/8e2d4fc84bc62b576b13406250ec0502dfc7ca51 Author: Lars Michelsen Date: Thu Mar 27 10:17:52 2014 +0100 Commiter: Lars Michelsen Date: Thu Mar 27 10:17:52 2014 +0100 Updated some gitignore files --- packages/nagios-plugins/.gitignore | 3 ++- packages/thruk/.gitignore | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/nagios-plugins/.gitignore b/packages/nagios-plugins/.gitignore index 21717ca..52005ca 100644 --- a/packages/nagios-plugins/.gitignore +++ b/packages/nagios-plugins/.gitignore @@ -1 +1,2 @@ -nagios-plugins-1.4.16 +nagios-plugins-[0-9].[0-9] +nagios-plugins-[0-9].[0-9].[0-9][0-9] diff --git a/packages/thruk/.gitignore b/packages/thruk/.gitignore index bae9c6d..d58e0ab 100644 --- a/packages/thruk/.gitignore +++ b/packages/thruk/.gitignore @@ -1,3 +1,4 @@ Thruk-[0-9].[0-9][0-9] Thruk-[0-9].[0-9][0-9].[0-9] +Thruk-[0-9].[0-9][0-9]-[0-9] Thruk-[0-9].[0-9].[0-9] From git at mathias-kettner.de Thu Mar 27 10:18:02 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 27 Mar 2014 10:18:02 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140327091802.3666C8290C@mail.mathias-kettner.de> Module: omd Branch: master Commit: b5c029bb3058a59b1644263e131b43bf85cac159 URL: http://omdistro.org/projects/omd/repository/revisions/b5c029bb3058a59b1644263e131b43bf85cac159 Author: Lars Michelsen Date: Thu Mar 27 10:17:58 2014 +0100 Commiter: Lars Michelsen Date: Thu Mar 27 10:17:58 2014 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Mon Mar 31 08:59:24 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 31 Mar 2014 08:59:24 +0200 Subject: [omd-commits] OMD Git: omd: nagvis: new nightly Message-ID: <20140331065924.F3F748298D@mail.mathias-kettner.de> Module: omd Branch: master Commit: 14e227da94d2e1ff7d42aedacbc4916c61c92e51 URL: http://omdistro.org/projects/omd/repository/revisions/14e227da94d2e1ff7d42aedacbc4916c61c92e51 Author: Lars Michelsen Date: Mon Mar 31 08:59:18 2014 +0200 Commiter: Lars Michelsen Date: Mon Mar 31 08:59:18 2014 +0200 nagvis: new nightly --- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1443940 -> 1444029 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 180255b..b1cc32d 100644 Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ