[smokeping-users] Interact zoom doesn't work on Demosite

[Tobias Oetiker]

Hi RuneT,

try this patch:

I have fixed the demo site

Index: Smokeping.pm
===================================================================
--- Smokeping.pm        (revision 936)
+++ Smokeping.pm        (working copy)
@@ -401,7 +401,7 @@
         if (ref $tree->{$prop} eq 'HASH'){
             add_targets $cfg, $probes, $tree->{$prop}, "$name/$prop";
         }
-        if ($prop eq 'host' and $tree->{nomasterpoll} eq 'no' and check_filter($cfg,$name) and $tree->{$prop} !~ m|^/| ) {
+        if ($prop eq 'host' and ( not $tree->{nomasterpoll} or $tree->{nomasterpoll} eq 'no') and check_filter($cfg,$name) and $tree->{$prop} !~ m|^/| ) {
             if($tree->{host} =~ /^DYNAMIC/) {
                 $probeobj->add($tree,$name);
             } else {
@@ -750,7 +750,7 @@
        next unless $phys_tree->{host};
        next if $phys_tree->{hide} and $phys_tree->{hide} eq 'yes';

-        if ($phys_tree->{nomasterpoll} eq 'no'){
+        if (not $phys_tree->{nomasterpoll} or $phys_tree->{nomasterpoll} eq 'no'){
             @slaves  = ("");
         };

@@ -973,7 +973,7 @@
     $tree = $phys_tree;

     my @slaves;
-    if ($tree->{nomasterpoll} eq 'no'){
+    if (not $tree->{nomasterpoll} or $tree->{nomasterpoll} eq 'no'){
         @slaves  = ("");
     };

@@ -1468,9 +1468,9 @@
            $print .= "<div id='hierarchy_popup'>";
            $print .= $q->popup_menu(-name=>'hierarchy',
                                     -onChange=>'hswitch.submit()',
-                                    -values=>['', sort map {ref $cfg->{Presentation}{hierarchies}{$_} eq 'HASH'
+                                    -values=>[0, sort map {ref $cfg->{Presentation}{hierarchies}{$_} eq 'HASH'
                                                  ? $_ : () } keys %{$cfg->{Presentation}{hierarchies}}],
-                                    -labels=>{''=>'Default Hierarchy',
+                                    -labels=>{0=>'Default Hierarchy',
                                               map {ref $cfg->{Presentation}{hierarchies}{$_} eq 'HASH'
                                                     ? ($_ => $cfg->{Presentation}{hierarchies}{$_}{title} )
                                                     : () } keys %{$cfg->{Presentation}{hierarchies}}
@@ -1495,7 +1495,7 @@
     my ($path,$slave) = split(/~/,$q->param('target') || '');
     my $hierarchy = $q->param('hierarchy');
     die "ERROR: unknown hierarchy $hierarchy\n"
-       if not $cfg->{Presentation}{hierarchies} and $cfg->{Presentation}{hierarchies}{$hierarchy};
+       if $hierarchy and not $cfg->{Presentation}{hierarchies}{$hierarchy};
     my $open = [ (split /\./,$path||'') ];
     my $open_orig = [@$open];
     $open_orig->[-1] .= '~'.$slave if $slave;
@@ -1521,7 +1521,7 @@
     };
     if (not $charts){
        for (@$open) {
-         die "ERROR: Section '$_' does not exist (display webpage).\n"
+         die "ERROR: Section '$_' does not exist (display webpage)."  # .(join "", map {"$_=$ENV{$_}"} keys %ENV)."\n"
                  unless exists $tree->{$_};
          last unless  ref $tree->{$_} eq 'HASH';
          $tree = $tree->{$_};
@@ -1852,7 +1852,7 @@
             my %slave_test;
             my $slaveupdates;
             my @updates;
-            if ($tree->{nomasterpoll} eq 'no'){
+            if (not $tree->{nomasterpoll} or $tree->{nomasterpoll} eq 'no'){
                 @updates = ([ "", time, $probeobj->rrdupdate_string($tree) ]);
             }
             if ($tree->{slaves}){




Today gizze at c2i.net wrote:

> Hi
> Is it just for me or have zoom stop working on Demosite. I got a blank frame after I have mark what I would zoom for.
>  
> RuneT
>
>

-- 
Tobi Oetiker, OETIKER+PARTNER AG, Aarweg 15 CH-4600 Olten
http://it.oetiker.ch tobi at oetiker.ch ++41 62 213 9902