prepare for the release of smokeping-2.2.7

6 files changed, 15 insertions, 13 deletions

diff --git a/CHANGES b/CHANGES
index 575c7cd..e3ea444 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+2007/10/29 -- released version 2.2.7
+
+* Make slaves with FQDN work properly -- tobi
+* Report when *** slaves *** section and slaves statements in the
+  target section do not agree. -- tobi
 * Make tsmoke work with multihost targets -- tobi
 * Do not force a page reload more frequently than every 120s -- tobi
 * Make sure slaves in targets match up with entries in the slaves section -- tobi
diff --git a/Makefile b/Makefile
index 69f4d0b..0535270 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 SHELL = /bin/sh
-VERSION := 2.2.6
+VERSION := 2.2.7
 SVNREPO = svn://svn.oetiker.ch/smokeping
 ############ A is for features
 ############ B is for bugfixes
 ############ V.AAABBB
 ############ 2.000001
 ############ 2.000002
-NUMVERSION = 2.002006
+NUMVERSION = 2.002007
 IGNORE = ~|CVS|var/|smokeping-$(VERSION)/smokeping-$(VERSION)|cvsignore|rej|orig|DEAD|pod2htm[di]\.tmp|\.svn|tar\.gz|DEADJOE|svn-commit\.tmp
 GROFF = groff
 PERL = perl-5.8.8
diff --git a/bin/smokeping.dist b/bin/smokeping.dist
index 4108e53..928bc8e 100755
--- a/bin/smokeping.dist
+++ b/bin/smokeping.dist
@@ -4,7 +4,7 @@
 use lib qw(/usr/pack/rrdtool-1.2.23-mo/lib/perl);
 use lib qw(lib);
 
-use Smokeping 2.002006;
+use Smokeping 2.002007;
  
 Smokeping::main("etc/config.dist");
 
diff --git a/bin/tSmoke.dist b/bin/tSmoke.dist
index 674dd9f..61fcaf7 100755
--- a/bin/tSmoke.dist
+++ b/bin/tSmoke.dist
@@ -53,7 +53,7 @@ use strict;
 use lib qw(lib);
 use lib "/usr/local/rrdtool-1.0.39/lib/perl";
 
-use Smokeping 2.002006;
+use Smokeping 2.002007;
 use Net::SMTP;
 use Getopt::Long;
 use Pod::Usage;
diff --git a/htdocs/smokeping.cgi.dist b/htdocs/smokeping.cgi.dist
index 8c5f1c7..2028cf5 100755
--- a/htdocs/smokeping.cgi.dist
+++ b/htdocs/smokeping.cgi.dist
@@ -5,7 +5,7 @@ use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
 use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
 use CGI::Carp qw(fatalsToBrowser);
 
-use Smokeping 2.002006;
+use Smokeping 2.002007;
 
 Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
 
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index 749af41..1c66001 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -37,7 +37,7 @@ use Smokeping::RRDtools;
 
 # globale persistent variables for speedy
 use vars qw($cfg $probes $VERSION $havegetaddrinfo $cgimode);
-$VERSION="2.002006";
+$VERSION="2.002007";
 
 # we want opts everywhere
 my %opt;
@@ -1355,13 +1355,10 @@ sub load_sortercache($){
 sub display_webpage($$){
     my $cfg = shift;
     my $q = shift;
-    my $open_orig = [ split /\./,( $q->param('target') || '')];
-    my $open = [@$open_orig]; # in this version we get rid of the 'slave' part if there is any
-    my ($host,$slave);
-    if (0 < @$open){ 
-        ($host,$slave) =  split(/~/, $open->[-1]);
-        $open->[-1] = $host;
-    }
+    my ($path,$slave) = split(/~/,$q->param('target') || '');
+    my $open = [ (split /\./,$path) ];
+    my $open_orig = [@$open];
+    $open_orig->[-1] .= '~'.$slave if $slave;
 
     my $tree = $cfg->{Targets};
     my $targets = $cfg->{Targets};