[omd-commits] OMD Git: omd: thruk: update 1.36

git version control git at mathias-kettner.de
Thu Jul 19 22:31:07 CEST 2012


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

Author:   Sven Nierlein <sven at consol.de>
Date:     Thu Jul 19 15:33:56 2012 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Thu Jul 19 19:10:36 2012 +0200

thruk: update 1.36

---

 Changelog                                          |    2 +-
 packages/thruk/Makefile                            |    2 +-
 packages/thruk/Thruk-1.34.tar.gz                   |  Bin 3834591 -> 0 bytes
 packages/thruk/Thruk-1.36.tar.gz                   |  Bin 0 -> 5255571 bytes
 .../thruk/patches/0001-skel_adjustments.skel_patch |   29 +++++++++-----------
 t/20-package_thruk.t                               |    6 ++--
 6 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/Changelog b/Changelog
index be60871..81fda89 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.6
-          - Thruk: Update to 1.34
+          - Thruk: Update to 1.36
           - Nagios Plugins: Update to 1.4.16
           - PNP4Nagios: Update to 0.6.18
           - Icinga: Update to 1.7.1
diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile
index 4fb26d6..87ccff2 100644
--- a/packages/thruk/Makefile
+++ b/packages/thruk/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = Thruk
-VERSION  = 1.34
+VERSION  = 1.36
 DIR      = $(NAME)-$(VERSION)
 PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}')
 
diff --git a/packages/thruk/Thruk-1.34.tar.gz b/packages/thruk/Thruk-1.34.tar.gz
deleted file mode 100644
index 490ed8e..0000000
Binary files a/packages/thruk/Thruk-1.34.tar.gz and /dev/null differ
diff --git a/packages/thruk/Thruk-1.36.tar.gz b/packages/thruk/Thruk-1.36.tar.gz
new file mode 100644
index 0000000..e5e4c75
Binary files /dev/null and b/packages/thruk/Thruk-1.36.tar.gz differ
diff --git a/packages/thruk/patches/0001-skel_adjustments.skel_patch b/packages/thruk/patches/0001-skel_adjustments.skel_patch
index f2b75cd..f0230d6 100644
--- a/packages/thruk/patches/0001-skel_adjustments.skel_patch
+++ b/packages/thruk/patches/0001-skel_adjustments.skel_patch
@@ -1,6 +1,6 @@
---- a/etc/thruk/thruk.conf	2012-06-02 18:32:32.000000000 +0200
-+++ b/etc/thruk/thruk.conf	2012-06-03 00:14:10.065082960 +0200
-@@ -12,7 +12,7 @@
+--- 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
+@@ -13,7 +13,7 @@
  
  ######################################
  # set the url prefix for all urls
@@ -9,7 +9,7 @@
  
  ######################################
  # Changes the path to your logo images. Default is
-@@ -22,13 +22,13 @@
+@@ -23,13 +23,13 @@
  # Like usual, paths starting with a / will be absolute from your
  # webserver root directory. Paths starting without a / will be relative
  # to the cgi directory.
@@ -25,7 +25,7 @@
  
  ######################################
  # change path to your host / service action icons. You may use relative paths
-@@ -62,11 +62,11 @@
+@@ -63,11 +63,11 @@
  
  ######################################
  # location of your cgi.cfg
@@ -39,7 +39,7 @@
  
  ######################################
  # normally passive checks would be marked as disabled.
-@@ -133,35 +133,35 @@
+@@ -134,35 +134,35 @@
  
  ######################################
  # temporary directory, used for template cache...
@@ -82,7 +82,7 @@
  
  ######################################
  # use paged data instead of all data in one huge page
-@@ -221,7 +221,7 @@
+@@ -222,7 +222,7 @@
  # Instead of using a general resource_file, you could define one file
  # per peer in your peer config.
  #
@@ -91,7 +91,7 @@
  
  # show inline pnp graph if available
  # if a service or host has a pnp4nagios action url set
-@@ -292,6 +292,7 @@
+@@ -294,6 +294,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 +99,7 @@
  
  ######################################
  # Time Format Settings
-@@ -341,23 +342,23 @@
+@@ -343,23 +344,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 +128,7 @@
  
  # execute regular scheduled reports with this nice level
  #report_nice_level = 5
-@@ -389,42 +390,19 @@
+@@ -401,42 +402,19 @@
  ######################################
  # Backend Configuration, enter your backends here
  <Component Thruk::Backend>
@@ -184,7 +184,7 @@
  </Component>
  
  
-@@ -438,7 +416,12 @@
+@@ -450,9 +428,9 @@
  <Component Thruk::Plugin::ConfigTool>
      show_plugin_syntax_helper = 1
  
@@ -195,8 +195,5 @@
 +    cgi.cfg  = ###ROOT###/etc/nagios/cgi.cfg
 +    htpasswd = ###ROOT###/etc/htpasswd
  </Component>
-+
-+######################################
-+# OMD Settings
-+# username used when cli tool used without -A
-+default_cli_user_name=omdadmin
+ 
+ ######################################
diff --git a/t/20-package_thruk.t b/t/20-package_thruk.t
index b0a7eb7..5789dcd 100644
--- a/t/20-package_thruk.t
+++ b/t/20-package_thruk.t
@@ -78,23 +78,23 @@ for my $report (@{$reports}) {
         }
     }
     push @{$tests}, (
-      { cmd => "/bin/su - $site -c './bin/thruk \"/thruk/cgi-bin/reports.cgi?action=save&report=9999&".join('&', @{$args})."\"'",
+      { cmd => "/bin/su - $site -c './bin/thruk -A omdadmin \"/thruk/cgi-bin/reports.cgi?action=save&report=9999&".join('&', @{$args})."\"'",
                like => "/OK - report updated/" },
       { cmd => "/bin/su - $site -c 'omd reload crontab'", like => [ '/OK/' ] },
       { cmd => "/bin/su - $site -c '/usr/bin/crontab -l | grep -i thruk | grep -v cron.d'", like => [ '/9999/' ] },
       { cmd => "/bin/su - $site -c './bin/thruk -a report=9999 --local'", like => [ '/%PDF\-1\.4/', '/%%EOF/' ] },
-      { cmd => "/bin/su - $site -c './bin/thruk \"/thruk/cgi-bin/reports.cgi?action=remove&report=9999\"'", like => '/OK - report removed/' },
+      { cmd => "/bin/su - $site -c './bin/thruk -A omdadmin \"/thruk/cgi-bin/reports.cgi?action=remove&report=9999\"'", like => '/OK - report removed/' },
     );
 }
 
 
 my $urls = [
 # static html pages
+  { url => "/thruk/side.html",       like => '/<title>Thruk<\/title>/' },
   { url => "",                       like => '/<title>Thruk<\/title>/' },
   { url => "/thruk/index.html",      like => '/<title>Thruk<\/title>/' },
   { url => "/thruk/docs/index.html", like => '/<title>Documentation<\/title>/' },
   { url => "/thruk/main.html",       like => '/<title>Thruk Monitoring Webinterface<\/title>/' },
-  { url => "/thruk/side.html",       like => '/<title>Thruk<\/title>/' },
 
 # availability
   { url => '/thruk/cgi-bin/avail.cgi', 'like' => '/Availability Report/' },



More information about the omd-commits mailing list