diff --git a/.gitignore b/.gitignore index 7ffb30b0e1..888d531765 100644 --- a/.gitignore +++ b/.gitignore @@ -43,12 +43,12 @@ themes/themes-available/*/images/logos/*.png .~ko-*-perllint~ .vstags .vscode -root/thruk/javascript/all_in_one-2.22-1.js -plugins/plugins-available/panorama/root/all_in_one-2.22-1_panorama.js -themes/themes-available/Thruk/stylesheets/all_in_one-2.22-1.css -themes/themes-available/Thruk/stylesheets/all_in_one_noframes-2.22-1.css -themes/themes-available/Thruk2/stylesheets/all_in_one-2.22-1.css -themes/themes-available/Thruk2/stylesheets/all_in_one_noframes-2.22-1.css +root/thruk/javascript/all_in_one-2.24-1.js +plugins/plugins-available/panorama/root/all_in_one-2.24-1_panorama.js +themes/themes-available/Thruk/stylesheets/all_in_one-2.24-1.css +themes/themes-available/Thruk/stylesheets/all_in_one_noframes-2.24-1.css +themes/themes-available/Thruk2/stylesheets/all_in_one-2.24-1.css +themes/themes-available/Thruk2/stylesheets/all_in_one_noframes-2.24-1.css test_hook.sh panorama/*.tab panorama/*.tab-* diff --git a/Changes b/Changes index e5548806ca..13a21e5e30 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,6 @@ This file documents the revision history for the Monitoring Webinterface Thruk. -next: +2.24 Fri Oct 26 18:40:37 CEST 2018 - add rest api - see https://thruk.org/documentation/rest.html for details - support clustered setups diff --git a/MANIFEST b/MANIFEST index 00c70516ac..6c18d3e6d5 100644 --- a/MANIFEST +++ b/MANIFEST @@ -162,8 +162,8 @@ plugins/plugins-available/business_process/lib/Thruk/Controller/bp.pm plugins/plugins-available/business_process/lib/Thruk/Controller/Rest/V1/bp.pm plugins/plugins-available/business_process/lib/Thruk/Utils/CLI/Bp.pm plugins/plugins-available/business_process/preview.png -plugins/plugins-available/business_process/root/bp-2.22-1.css -plugins/plugins-available/business_process/root/bp-2.22-1.js +plugins/plugins-available/business_process/root/bp-2.24-1.css +plugins/plugins-available/business_process/root/bp-2.24-1.js plugins/plugins-available/business_process/root/bp-ie-fixes.js plugins/plugins-available/business_process/root/dagre-0.4.6/dagre.min.js plugins/plugins-available/business_process/root/images/lock.png @@ -381,8 +381,8 @@ plugins/plugins-available/mobile/root/jqm/images/ajax-loader.gif plugins/plugins-available/mobile/root/jqm/jquery.mobile-1.4.5.min.css plugins/plugins-available/mobile/root/jqm/jquery.mobile-1.4.5.min.js plugins/plugins-available/mobile/root/jquery.mobile.router.min.js -plugins/plugins-available/mobile/root/mobile-2.22-1.css -plugins/plugins-available/mobile/root/mobile-2.22-1.js +plugins/plugins-available/mobile/root/mobile-2.24-1.css +plugins/plugins-available/mobile/root/mobile-2.24-1.js plugins/plugins-available/mobile/routes plugins/plugins-available/mobile/t/controller_mobile.t plugins/plugins-available/mobile/t/templates_mobile.t @@ -412,7 +412,7 @@ plugins/plugins-available/panorama/lib/Thruk/Utils/Panorama/Scripted.pm plugins/plugins-available/panorama/lib/Thruk/Utils/PanoramaCpuStats.pm plugins/plugins-available/panorama/preview.png plugins/plugins-available/panorama/README -plugins/plugins-available/panorama/root/all_in_one-2.22-1_panorama.js +plugins/plugins-available/panorama/root/all_in_one-2.24-1_panorama.js plugins/plugins-available/panorama/root/bigscreen.js plugins/plugins-available/panorama/root/cleanextjs.sh plugins/plugins-available/panorama/root/extjs-4.2.2/ext-all-debug.js @@ -1298,7 +1298,7 @@ plugins/plugins-available/panorama/root/openlayer/theme/default/img/zoom-panel.p plugins/plugins-available/panorama/root/openlayer/theme/default/style.css plugins/plugins-available/panorama/root/openlayer/theme/default/style.mobile.css plugins/plugins-available/panorama/root/OpenLayers-2.13.1.js -plugins/plugins-available/panorama/root/panorama-2.22-1.css +plugins/plugins-available/panorama/root/panorama-2.24-1.css plugins/plugins-available/panorama/root/sprintf.js plugins/plugins-available/panorama/root/ux/chart/series/KPIGauge.js plugins/plugins-available/panorama/root/ux/form/ItemSelector.js @@ -1428,7 +1428,7 @@ root/thruk/images/pbar-ani.gif root/thruk/images/spacer.png root/thruk/images/trendshost.png root/thruk/images/trendssvc.png -root/thruk/javascript/all_in_one-2.22-1.js +root/thruk/javascript/all_in_one-2.24-1.js root/thruk/javascript/cal/img/cool-bg-hard-inv.png root/thruk/javascript/cal/img/cool-bg-hard.png root/thruk/javascript/cal/img/cool-bg-inv.png @@ -1473,7 +1473,7 @@ root/thruk/javascript/jstree-3.0.9/themes/default/style.min.css root/thruk/javascript/jstree-3.0.9/themes/default/throbber.gif root/thruk/javascript/overlib.js root/thruk/javascript/strftime-min.js -root/thruk/javascript/thruk-2.22-1.js +root/thruk/javascript/thruk-2.24-1.js root/thruk/media/critical.wav root/thruk/media/ok.wav root/thruk/media/unknown.wav @@ -3159,8 +3159,8 @@ themes/themes-available/Thruk/images/waiting.gif themes/themes-available/Thruk/images/wand.png themes/themes-available/Thruk/images/warning.png themes/themes-available/Thruk/images/yellow.gif -themes/themes-available/Thruk/stylesheets/all_in_one-2.22-1.css -themes/themes-available/Thruk/stylesheets/all_in_one_noframes-2.22-1.css +themes/themes-available/Thruk/stylesheets/all_in_one-2.24-1.css +themes/themes-available/Thruk/stylesheets/all_in_one_noframes-2.24-1.css themes/themes-available/Thruk/stylesheets/Thruk.css themes/themes-available/Thruk/stylesheets/thruk_global.css themes/themes-available/Thruk/stylesheets/thruk_noframes.css @@ -3328,8 +3328,8 @@ themes/themes-available/Thruk2/images/waiting.gif themes/themes-available/Thruk2/images/wand.png themes/themes-available/Thruk2/images/warning.png themes/themes-available/Thruk2/images/yellow.gif -themes/themes-available/Thruk2/stylesheets/all_in_one-2.22-1.css -themes/themes-available/Thruk2/stylesheets/all_in_one_noframes-2.22-1.css +themes/themes-available/Thruk2/stylesheets/all_in_one-2.24-1.css +themes/themes-available/Thruk2/stylesheets/all_in_one_noframes-2.24-1.css themes/themes-available/Thruk2/stylesheets/Thruk2.css themes/themes-available/Thruk2/stylesheets/thruk_global.css themes/themes-available/Thruk2/stylesheets/thruk_noframes.css diff --git a/debian/changelog b/debian/changelog index 161a6f2399..0258256f03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +thruk (2.24) UNRELEASED; urgency=low + + * new upstream release + + -- Thruk Development Team Fri, 26 Oct 2018 18:40:38 +0200 + thruk (2.22) UNRELEASED; urgency=low * new upstream release diff --git a/dist.ini b/dist.ini index 2e4f121acd..9f165612ff 100644 --- a/dist.ini +++ b/dist.ini @@ -1,4 +1,4 @@ name = Thruk -version = 2.22 +version = 2.24 author = Sven Nierlein license = Artistic diff --git a/docs/manpages/nagexp.3 b/docs/manpages/nagexp.3 index c41f4e6d37..c38bfd25b2 100644 --- a/docs/manpages/nagexp.3 +++ b/docs/manpages/nagexp.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "nagexp 3" -.TH nagexp 3 "2017-12-25" "perl v5.20.2" "User Contributed Perl Documentation" +.TH nagexp 3 "2018-10-26" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/docs/manpages/nagimp.3 b/docs/manpages/nagimp.3 index 54a2b5827b..80143ef5ce 100644 --- a/docs/manpages/nagimp.3 +++ b/docs/manpages/nagimp.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "nagimp 3" -.TH nagimp 3 "2017-12-25" "perl v5.20.2" "User Contributed Perl Documentation" +.TH nagimp 3 "2018-10-26" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/docs/manpages/naglint.3 b/docs/manpages/naglint.3 index 9d5bcb9e0c..d8bb78743a 100644 --- a/docs/manpages/naglint.3 +++ b/docs/manpages/naglint.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "naglint 3" -.TH naglint 3 "2017-12-25" "perl v5.20.2" "User Contributed Perl Documentation" +.TH naglint 3 "2018-10-26" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/docs/manpages/thruk.3 b/docs/manpages/thruk.3 index 4368543a2c..fda5e4e0e8 100644 --- a/docs/manpages/thruk.3 +++ b/docs/manpages/thruk.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "thruk 3" -.TH thruk 3 "2018-06-29" "perl v5.20.2" "User Contributed Perl Documentation" +.TH thruk 3 "2018-10-26" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/lib/Thruk.pm b/lib/Thruk.pm index e302453457..ac31f24b56 100644 --- a/lib/Thruk.pm +++ b/lib/Thruk.pm @@ -16,7 +16,7 @@ use Cwd qw/abs_path/; use 5.008000; -our $VERSION = '2.22'; +our $VERSION = '2.24'; ################################################### # create connection pool diff --git a/lib/Thruk/Config.pm b/lib/Thruk/Config.pm index 68d6b71676..825f8a2277 100644 --- a/lib/Thruk/Config.pm +++ b/lib/Thruk/Config.pm @@ -28,7 +28,7 @@ BEGIN { ###################################### -our $VERSION = '2.22'; +our $VERSION = '2.24'; my $project_root = home('Thruk::Config') or confess('could not determine project_root: '.Dumper(\%INC)); my $branch = ''; @@ -46,7 +46,7 @@ $ENV{'THRUK_SRC'} = 'UNKNOWN' unless defined $ENV{'THRUK_SRC'}; our %config = ('name' => 'Thruk', 'version' => $VERSION, 'branch' => $branch, - 'released' => 'June 29, 2018', + 'released' => 'October 26, 2018', 'compression_format' => 'gzip', 'ENCODING' => 'utf-8', 'image_path' => $project_root.'/root/thruk/images', diff --git a/plugins/plugins-available/business_process/root/bp-2.22-1.css b/plugins/plugins-available/business_process/root/bp-2.24-1.css similarity index 100% rename from plugins/plugins-available/business_process/root/bp-2.22-1.css rename to plugins/plugins-available/business_process/root/bp-2.24-1.css diff --git a/plugins/plugins-available/business_process/root/bp-2.22-1.js b/plugins/plugins-available/business_process/root/bp-2.24-1.js similarity index 100% rename from plugins/plugins-available/business_process/root/bp-2.22-1.js rename to plugins/plugins-available/business_process/root/bp-2.24-1.js diff --git a/plugins/plugins-available/mobile/root/mobile-2.22-1.css b/plugins/plugins-available/mobile/root/mobile-2.24-1.css similarity index 100% rename from plugins/plugins-available/mobile/root/mobile-2.22-1.css rename to plugins/plugins-available/mobile/root/mobile-2.24-1.css diff --git a/plugins/plugins-available/mobile/root/mobile-2.22-1.js b/plugins/plugins-available/mobile/root/mobile-2.24-1.js similarity index 100% rename from plugins/plugins-available/mobile/root/mobile-2.22-1.js rename to plugins/plugins-available/mobile/root/mobile-2.24-1.js diff --git a/plugins/plugins-available/panorama/root/panorama-2.22-1.css b/plugins/plugins-available/panorama/root/panorama-2.24-1.css similarity index 100% rename from plugins/plugins-available/panorama/root/panorama-2.22-1.css rename to plugins/plugins-available/panorama/root/panorama-2.24-1.css diff --git a/root/thruk/javascript/thruk-2.22-1.js b/root/thruk/javascript/thruk-2.24-1.js similarity index 100% rename from root/thruk/javascript/thruk-2.22-1.js rename to root/thruk/javascript/thruk-2.24-1.js diff --git a/root/thruk/startup.html b/root/thruk/startup.html index f797a24609..ad0badb6d2 100644 --- a/root/thruk/startup.html +++ b/root/thruk/startup.html @@ -6,7 +6,7 @@ - + diff --git a/script/nagexp b/script/nagexp index 6485063e26..1a960b8475 100755 --- a/script/nagexp +++ b/script/nagexp @@ -5,7 +5,7 @@ use strict; use warnings; -our $VERSION = '2.22'; +our $VERSION = '2.24'; my $branch = ''; my $nagexp = Thruk::nagexp->new(); diff --git a/script/nagimp b/script/nagimp index 7cfd0f981f..9e893482ae 100755 --- a/script/nagimp +++ b/script/nagimp @@ -27,7 +27,7 @@ eval 'exec perl -x $0 ${1+"$@"} ;' use strict; use warnings; -our $VERSION = '2.22'; +our $VERSION = '2.24'; my $branch = ''; my $nagimp = Thruk::nagimp->new(); diff --git a/script/naglint b/script/naglint index 72073b9477..54f8f2261f 100755 --- a/script/naglint +++ b/script/naglint @@ -27,7 +27,7 @@ eval 'exec perl -x $0 ${1+"$@"} ;' use strict; use warnings; -our $VERSION = '2.22'; +our $VERSION = '2.24'; my $branch = ''; $branch = Thruk::Config::get_git_name() unless $branch ne ''; diff --git a/script/thruk b/script/thruk index 856caaea84..939db38f52 100755 --- a/script/thruk +++ b/script/thruk @@ -28,7 +28,7 @@ use strict; use warnings; use Getopt::Long qw//; -our $VERSION = '2.22'; +our $VERSION = '2.24'; my $branch = ''; my $options = { diff --git a/support/thruk.spec b/support/thruk.spec index 73e49f1cff..a04b930ca1 100644 --- a/support/thruk.spec +++ b/support/thruk.spec @@ -9,7 +9,7 @@ %endif Name: thruk -Version: 2.22 +Version: 2.24 Release: 1 License: GPLv2+ Packager: Sven Nierlein