[omd-commits] OMD Git: omd: thruk: new upstream release

git version control git at mathias-kettner.de
Thu Dec 20 14:11:45 CET 2012


Module:   omd
Branch:   master
Commit:   c5cf5b27c8bd2680f9ebb2e2aeb45ba055ab497b
URL:      http://omdistro.org/projects/omd/repository/revisions/c5cf5b27c8bd2680f9ebb2e2aeb45ba055ab497b

Author:   Sven Nierlein <sven at consol.de>
Date:     Thu Dec 20 12:21:00 2012 +0100
Commiter: Build Automator <sven at consol.de>
Date:     Thu Dec 20 12:21:00 2012 +0100

thruk: new upstream release

---

 Changelog                                          |    2 +-
 packages/perl-modules/Makefile                     |    1 +
 packages/thruk/Makefile                            |    6 +++-
 packages/thruk/Thruk-1.54.tar.gz                   |  Bin 5668954 -> 0 bytes
 packages/thruk/Thruk-1.60-2.tar.gz                 |  Bin 0 -> 6770278 bytes
 .../thruk/patches/0001-skel_adjustments.skel_patch |   28 +++++++++++--------
 packages/thruk/patches/0003-path_thruk.patch       |   13 ---------
 t/20-package_thruk.t                               |    5 ++-
 t/TestUtils.pm                                     |    1 +
 9 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/Changelog b/Changelog
index 554e1c2..2d0c9fc 100644
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,7 @@
 This file documents the revision history for the Open Monitoring Distribution
 0.58:
          - Icinga: Update to 1.8.2
-         - Thruk: Update to 1.54
+         - Thruk: Update to 1.60
            - added cookie based login
          - Apache: Enabling mod_status (if available) for 127.0.0.1 in own mode
          - Check_MK/MK Livestatus: new version 1.2.0p3
diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile
index 3e1b31b..4991506 100644
--- a/packages/perl-modules/Makefile
+++ b/packages/perl-modules/Makefile
@@ -333,6 +333,7 @@ MODULES = \
 
 
 
+
 build:
 	mkdir -p $(P5TMPDIST)/dest mkdir -p $(P5TMPDIST)/src
 	rsync -av src/. $(P5TMPDIST)/src/.
diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile
index cc72cca..34ef4f8 100644
--- a/packages/thruk/Makefile
+++ b/packages/thruk/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = Thruk
-VERSION  = 1.54
+VERSION  = 1.60
 DIR      = $(NAME)-$(VERSION)
 PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}')
 
@@ -9,7 +9,7 @@ PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}')
 
 build:
 	rm -rf $(DIR)
-	tar xzf $(DIR).tar.gz
+	tar xzf $(DIR)*.tar.gz
 	for p in patches/*.patch ; do \
 	    echo "applying $$p..." ; \
 	    ( cd $(DIR) ; patch -p1 ) < $$p || exit 1; \
@@ -22,6 +22,7 @@ install:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/bin
 	rm -rf $(DESTDIR)$(OMD_ROOT)/share/thruk
 	cp -rp $(DIR)/script/thruk $(DESTDIR)$(OMD_ROOT)/bin/thruk
+	cp -rp $(DIR)/script/naglint $(DESTDIR)$(OMD_ROOT)/bin/naglint
 	cp -rp $(DIR) $(DESTDIR)$(OMD_ROOT)/share/thruk
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/etc/thruk
 	rm -rf $(DESTDIR)$(OMD_ROOT)/share/thruk/plugins-enabled
@@ -29,6 +30,7 @@ install:
 	rm -rf $(DESTDIR)$(OMD_ROOT)/share/thruk/t
 	mv $(DESTDIR)$(OMD_ROOT)/share/thruk/script/thruk $(DESTDIR)$(OMD_ROOT)/bin/thruk
 	chmod 755 $(DESTDIR)$(OMD_ROOT)/bin/thruk
+	chmod 755 $(DESTDIR)$(OMD_ROOT)/bin/naglint
 
 skel:
 	# logfile has to be group writeable for shared apache
diff --git a/packages/thruk/Thruk-1.54.tar.gz b/packages/thruk/Thruk-1.54.tar.gz
deleted file mode 100644
index edaf2c8..0000000
Binary files a/packages/thruk/Thruk-1.54.tar.gz and /dev/null differ
diff --git a/packages/thruk/Thruk-1.60-2.tar.gz b/packages/thruk/Thruk-1.60-2.tar.gz
new file mode 100644
index 0000000..ec3c91e
Binary files /dev/null and b/packages/thruk/Thruk-1.60-2.tar.gz differ
diff --git a/packages/thruk/patches/0001-skel_adjustments.skel_patch b/packages/thruk/patches/0001-skel_adjustments.skel_patch
index eafe46f..15e23ba 100644
--- a/packages/thruk/patches/0001-skel_adjustments.skel_patch
+++ b/packages/thruk/patches/0001-skel_adjustments.skel_patch
@@ -1,5 +1,5 @@
---- a/etc/thruk/thruk.conf	2012-07-19 13:13:20.000000000 +0200
-+++ b/etc/thruk/thruk.conf	2012-07-19 16:03:03.639789375 +0200
+--- a/etc/thruk/thruk.conf	2012-12-09 11:26:18.000000000 +0100
++++ b/etc/thruk/thruk.conf	2012-12-09 11:27:09.000000000 +0100
 @@ -13,7 +13,7 @@
  
  ######################################
@@ -39,7 +39,7 @@
  
  ######################################
  # normally passive checks would be marked as disabled.
-@@ -134,35 +134,35 @@
+@@ -134,11 +134,11 @@
  
  ######################################
  # temporary directory, used for template cache...
@@ -52,6 +52,10 @@
 +var_path = ###ROOT###/var/thruk
  
  ######################################
+ # mode used when creating or saving files
+@@ -147,27 +147,27 @@
+ 
+ ######################################
  # server side includes
 -#ssi_path = ssi/
 +ssi_path = ###ROOT###/etc/thruk/ssi
@@ -82,16 +86,16 @@
  
  ######################################
  # use paged data instead of all data in one huge page
-@@ -222,7 +222,7 @@
+@@ -227,7 +227,7 @@
  # Instead of using a general resource_file, you could define one file
  # per peer in your peer config.
  #
 -#resource_file = path_to_your/resource.cfg
 +resource_file = ###ROOT###/etc/nagios/resource.cfg
  
- # show inline pnp graph if available
- # if a service or host has a pnp4nagios action url set
-@@ -294,6 +294,7 @@
+ # enable a performance bar inside the status/host list which
+ # create a graph from the performance data of the plugin output. Available
+@@ -305,6 +305,7 @@
  # check should be rescheduled instead of the passive check.
  # Have a look at the documentation for a detailed description.
  #command_reschedule_alias = servicename_or_commandname_pattern;agent_service_name
@@ -99,7 +103,7 @@
  
  ######################################
  # Time Format Settings
-@@ -343,23 +344,23 @@
+@@ -354,23 +355,23 @@
  # Specifiy a file which is then completly under the control of Thruk.
  # It will be used to store cronjobs, ex. for reports. The file has to
  # be writable by Thruk.
@@ -128,7 +132,7 @@
  
  # execute regular scheduled reports with this nice level
  #report_nice_level = 5
-@@ -390,8 +391,8 @@
+@@ -421,8 +422,8 @@
  ######################################
  # COOKIE AUTH
  ######################################
@@ -136,10 +140,10 @@
 -cookie_auth_restricted_url        = http://localhost/thruk/cgi-bin/restricted.cgi
 +cookie_auth_login_url             = ###SITE###/thruk/cgi-bin/login.cgi
 +cookie_auth_restricted_url        = http://localhost/###SITE###/thruk/cgi-bin/restricted.cgi
- cookie_auth_session_timeout       = 86400
+ cookie_auth_session_timeout       = 604800
  cookie_auth_session_cache_timeout = 5
  
-@@ -412,42 +413,19 @@
+@@ -449,42 +450,19 @@
  ######################################
  # Backend Configuration, enter your backends here
  <Component Thruk::Backend>
@@ -195,7 +199,7 @@
  </Component>
  
  
-@@ -461,9 +439,9 @@
+@@ -498,9 +476,9 @@
  <Component Thruk::Plugin::ConfigTool>
      show_plugin_syntax_helper = 1
  
diff --git a/packages/thruk/patches/0003-path_thruk.patch b/packages/thruk/patches/0003-path_thruk.patch
deleted file mode 100644
index e20e71f..0000000
--- a/packages/thruk/patches/0003-path_thruk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/script/thruk	2012-03-27 22:26:34.000000000 +0200
-+++ b/script/thruk	2012-03-29 14:08:09.985176993 +0200
-@@ -1,5 +1,10 @@
- #!/usr/bin/perl
- 
-+BEGIN {
-+    use lib $ENV{'OMD_ROOT'}.'/share/thruk/lib';
-+    $ENV{'CATALYST_CONFIG'} = $ENV{'OMD_ROOT'}.'/etc/thruk';
-+};
-+
- use strict;
- use warnings;
- use Getopt::Long;
diff --git a/t/20-package_thruk.t b/t/20-package_thruk.t
index 09f1d6c..c8851be 100644
--- a/t/20-package_thruk.t
+++ b/t/20-package_thruk.t
@@ -13,7 +13,7 @@ BEGIN {
     use lib "$FindBin::Bin/lib/lib/perl5";
 }
 
-plan( tests => 2526 );
+plan( tests => 2550 );
 
 ##################################################
 # create our test site
@@ -61,6 +61,7 @@ my $tests = [
   { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_http -t 20 -H localhost -a omdadmin:omd -u \"/$site/thruk/cgi-bin/tac.cgi\" -e 200 -r \"Logged in as <i>omdadmin<\/i>\"'", like => '/HTTP OK:/' },
   { cmd => "/bin/su - $site -c './bin/thruk -l'", like => "/$site/" },
   { cmd => "/bin/su - $site -c './bin/thruk -l --local'", like => "/$site/" },
+  { cmd => "/bin/su - $site -c './bin/naglint ./etc/nagios/conf.d/commands.cfg'", like => "/check_local_load/" },
 ];
 
 my $own_tests = [
@@ -152,7 +153,7 @@ my $urls = [
   { url => '/thruk/cgi-bin/conf.cgi?sub=users&action=change&data.username=omdadmin', like => [ '/Config Tool/', '/remove password/', '/authorized_for_all_services/' ] },
   { url => '/thruk/cgi-bin/conf.cgi?sub=objects', like => [ '/Config Tool/', '/select host to change/' ] },
   { url => '/thruk/cgi-bin/conf.cgi?sub=objects&apply=yes', like => [ '/Config Tool/', '/There are no pending changes to commit/' ] },
-  { url => '/thruk/cgi-bin/conf.cgi?sub=objects&type=host&data.name=generic-host', like => [ '/Config Tool/', '/Template:\s+generic\-host/', '/templates.cfg/' ], skip_html_links => 1 },
+  { url => '/thruk/cgi-bin/conf.cgi?sub=objects&type=host&data.name=generic-host', like => [ '/Config Tool/', '/Template: generic\-host/', '/templates.cfg/' ], skip_html_links => 1 },
   { url => '/thruk/cgi-bin/conf.cgi?sub=objects&action=browser', like => [ '/Config Tool/', '/commands.cfg/' ] },
 
 # reporting
diff --git a/t/TestUtils.pm b/t/TestUtils.pm
index 2bb1d63..83a83bd 100644
--- a/t/TestUtils.pm
+++ b/t/TestUtils.pm
@@ -582,6 +582,7 @@ sub _diag_lint_errors_and_remove_some_exceptions {
             "Unknown attribute \"start\" for tag <div>",
             "Unknown attribute \"end\" for tag <div>",
             "for tag <meta>",
+            "Unknown\ attribute\ \"placeholder\"\ for\ tag\ <input>",
         ) {
             next LINT_ERROR if($err_str =~ m/$exclude_pattern/i);
         }



More information about the omd-commits mailing list