release 2.34-2

sni · May 20, 2020 · f623a74 · f623a74
1 parent 40020bb
commit f623a74
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 23 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,6 @@
 This file documents the revision history for the Monitoring Webinterface Thruk.
 
-next:
+2.34-2   Wed May 20 17:01:57 CEST 2020
           - quick commands can create recurring downtimes
           - Reporting:
             - add more mail sending options

diff --git a/MANIFEST b/MANIFEST
@@ -171,8 +171,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.34-1.css
-plugins/plugins-available/business_process/root/bp-2.34-1.js
+plugins/plugins-available/business_process/root/bp-2.34-2.css
+plugins/plugins-available/business_process/root/bp-2.34-2.js
 plugins/plugins-available/business_process/root/bp-ie-fixes.js
 plugins/plugins-available/business_process/root/images/lock.png
 plugins/plugins-available/business_process/root/images/testmode_critical.png
@@ -363,8 +363,8 @@ plugins/plugins-available/mobile/root/img/ndisabled.gif
 plugins/plugins-available/mobile/root/img/passiveonly.gif
 plugins/plugins-available/mobile/root/img/startup.png
 plugins/plugins-available/mobile/root/img/thruk.png
-plugins/plugins-available/mobile/root/mobile-2.34-1.css
-plugins/plugins-available/mobile/root/mobile-2.34-1.js
+plugins/plugins-available/mobile/root/mobile-2.34-2.css
+plugins/plugins-available/mobile/root/mobile-2.34-2.js
 plugins/plugins-available/mobile/root/vendor/jqm-1.4.5/images/ajax-loader.gif
 plugins/plugins-available/mobile/root/vendor/jqm-1.4.5/jquery.mobile-1.4.5.min.css
 plugins/plugins-available/mobile/root/vendor/jqm-1.4.5/jquery.mobile-1.4.5.min.js
@@ -547,7 +547,7 @@ plugins/plugins-available/panorama/root/js/panorama_js_tabbar.js
 plugins/plugins-available/panorama/root/js/panorama_js_tabbar_search.js
 plugins/plugins-available/panorama/root/js/panorama_js_track_timers.js
 plugins/plugins-available/panorama/root/js/panorama_js_utils_base64.js
-plugins/plugins-available/panorama/root/panorama-2.34-1.css
+plugins/plugins-available/panorama/root/panorama-2.34-2.css
 plugins/plugins-available/panorama/routes
 plugins/plugins-available/panorama/scripts/disable_debug.sh
 plugins/plugins-available/panorama/scripts/enable_debug.sh
@@ -652,12 +652,12 @@ README.md
 root/favicon.ico
 root/index.html
 root/robots.txt
-root/thruk/cache/Thruk-2.34-1.css
-root/thruk/cache/thruk-2.34-1.js
-root/thruk/cache/Thruk-noframes-2.34-1.css
-root/thruk/cache/thruk-panorama-2.34-1.js
-root/thruk/cache/Thruk2-2.34-1.css
-root/thruk/cache/Thruk2-noframes-2.34-1.css
+root/thruk/cache/Thruk-2.34-2.css
+root/thruk/cache/thruk-2.34-2.js
+root/thruk/cache/Thruk-noframes-2.34-2.css
+root/thruk/cache/thruk-panorama-2.34-2.js
+root/thruk/cache/Thruk2-2.34-2.css
+root/thruk/cache/Thruk2-noframes-2.34-2.css
 root/thruk/images/expand.png
 root/thruk/images/folder_blue.png
 root/thruk/images/folder_blue_mixed.png
@@ -677,7 +677,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/thruk-2.34-1.js
+root/thruk/javascript/thruk-2.34-2.js
 root/thruk/media/critical.wav
 root/thruk/media/ok.wav
 root/thruk/media/unknown.wav

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+thruk (2.34-2) UNRELEASED; urgency=low
+
+  * new upstream release
+
+ -- Thruk Development Team <devel@thruk.org>  Wed, 20 May 2020 17:01:57 +0200
+
 thruk (2.34) UNRELEASED; urgency=low
 
   * new upstream release

diff --git a/docs/manpages/thruk.3 b/docs/manpages/thruk.3
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "thruk 3"
-.TH thruk 3 "2020-03-28" "perl v5.28.1" "User Contributed Perl Documentation"
+.TH thruk 3 "2020-05-20" "perl v5.28.1" "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/Config.pm b/lib/Thruk/Config.pm
@@ -32,7 +32,7 @@ BEGIN {
 our $VERSION = '2.34';
 
 my $project_root = home('Thruk::Config') or confess('could not determine project_root: '.Dumper(\%INC));
-my $branch       = '';
+my $branch       = '2';
 my $gitbranch    = get_git_name($project_root);
 my $filebranch   = $branch || 1;
 if($branch) {
@@ -47,7 +47,7 @@ $ENV{'THRUK_SRC'} = 'UNKNOWN' unless defined $ENV{'THRUK_SRC'};
 our %config = ('name'                   => 'Thruk',
               'version'                => $VERSION,
               'branch'                 => $branch,
-              'released'               => 'March 28, 2020',
+              'released'               => 'May 20, 2020',
               'compression_format'     => 'gzip',
               'ENCODING'               => 'utf-8',
               'image_path'             => $project_root.'/root/thruk/images',

diff --git a/...lable/business_process/root/bp-2.34-1.css → ...lable/business_process/root/bp-2.34-2.css b/...lable/business_process/root/bp-2.34-1.css → ...lable/business_process/root/bp-2.34-2.css
diff --git a/...ilable/business_process/root/bp-2.34-1.js → ...ilable/business_process/root/bp-2.34-2.js b/...ilable/business_process/root/bp-2.34-1.js → ...ilable/business_process/root/bp-2.34-2.js
diff --git a/...s-available/mobile/root/mobile-2.34-1.css → ...s-available/mobile/root/mobile-2.34-2.css b/...s-available/mobile/root/mobile-2.34-1.css → ...s-available/mobile/root/mobile-2.34-2.css
diff --git a/...ns-available/mobile/root/mobile-2.34-1.js → ...ns-available/mobile/root/mobile-2.34-2.js b/...ns-available/mobile/root/mobile-2.34-1.js → ...ns-available/mobile/root/mobile-2.34-2.js
diff --git a/...ailable/panorama/root/panorama-2.34-1.css → ...ailable/panorama/root/panorama-2.34-2.css b/...ailable/panorama/root/panorama-2.34-1.css → ...ailable/panorama/root/panorama-2.34-2.css
diff --git a/root/thruk/javascript/thruk-2.34-1.js → root/thruk/javascript/thruk-2.34-2.js b/root/thruk/javascript/thruk-2.34-1.js → root/thruk/javascript/thruk-2.34-2.js
diff --git a/root/thruk/startup.html b/root/thruk/startup.html
@@ -6,7 +6,7 @@
 
 
 
-    <link rel='stylesheet' type='text/css' href='cache/Thruk2-2.34-1.css' />
+    <link rel='stylesheet' type='text/css' href='cache/Thruk2-2.34-2.css' />
 
 
 

diff --git a/script/check_thruk_rest b/script/check_thruk_rest
@@ -37,7 +37,7 @@ use warnings;
 use Getopt::Long qw//;
 
 our $VERSION = '2.34';
-my $branch       = '';
+my $branch       = '2';
 
 my $options = {
     'verbose'        => 1,

diff --git a/script/nagexp b/script/nagexp
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 
 our $VERSION = '2.34';
-my $branch       = '';
+my $branch       = '2';
 
 my $nagexp = Thruk::nagexp->new();
 exit $nagexp->run();

diff --git a/script/nagimp b/script/nagimp
@@ -36,7 +36,7 @@ use strict;
 use warnings;
 
 our $VERSION = '2.34';
-my $branch       = '';
+my $branch       = '2';
 
 my $nagimp = Thruk::nagimp->new();
 exit $nagimp->run();

diff --git a/script/naglint b/script/naglint
@@ -36,7 +36,7 @@ use strict;
 use warnings;
 
 our $VERSION = '2.34';
-my $branch       = '';
+my $branch       = '2';
 $branch      = Thruk::Config::get_git_name() unless $branch ne '';
 
 my $naglint = Thruk::naglint->new();

diff --git a/script/thruk b/script/thruk
@@ -37,7 +37,7 @@ use warnings;
 use Getopt::Long qw//;
 
 our $VERSION = '2.34';
-my $branch       = '';
+my $branch       = '2';
 
 my $options = {
     'verbose'        => 1,

diff --git a/support/thruk.spec b/support/thruk.spec
@@ -10,7 +10,7 @@
 
 Name:          thruk
 Version:       2.34
-Release: 1
+Release: 2
 License:       GPL-2.0-or-later
 Packager:      Sven Nierlein <sven.nierlein@consol.de>
 Vendor:        Labs Consol