Changeset 1500

Show
Ignore:
Timestamp:
02/29/08 17:58:26 (4 years ago)
Author:
jo
Message:

Removed "contacts" from the html view.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • people/jo/multilevel-groups-2/server/munin-html.in

    r1498 r1500  
    144144if ($config->{domain_order}) { 
    145145    @domainorder = split /\s+/, $config->{domain_order}; 
    146 } 
    147 foreach my $d (sort (keys %{$config->{domain}})) { 
    148     unless (grep (/^$d$/, @domainorder)) { 
    149         push @domainorder, $d; 
    150     } 
    151146} 
    152147 
    …… 
    301296 
    302297sub get_peer_nodes { 
    303     my $hash     = shift || return undef; 
    304     my $category = shift; 
    305     my $ret      = []; 
    306     my $link     = "index.html"; 
    307     my $parent   = munin_get_parent ($hash) || return undef; 
    308     my $me       = munin_get_node_name ($hash); 
    309  
    310     foreach my $peer (sort keys %$parent) { 
    311         next unless defined $peer and defined $parent->{$peer} and ref ($parent->{$peer}) eq "HASH"; 
    312         next if $peer =~ /^#%#/; 
    313         next if defined $category and lc (munin_get ($parent->{$peer}, "graph_category", "other")) ne $category; 
    314         if ($peer eq $me) { 
    315             unshift @$ret, { "name" => munin_get_node_name ($parent->{$peer}), "link" => undef }; 
     298    my $hash      = shift || return undef; 
     299    my $category  = shift; 
     300    my $ret       = []; 
     301    my $link      = "index.html"; 
     302    my $parent    = munin_get_parent ($hash) || return undef; 
     303    my $me        = munin_get_node_name ($hash); 
     304    my $pchildren = munin_get_children ($parent); 
     305 
     306    foreach my $peer (sort {munin_get_node_name($a) <=> munin_get_node_name($b)} @$pchildren) { 
     307        next unless defined $peer and ref ($peer) eq "HASH"; 
     308        next if defined $category and lc (munin_get ($peer, "graph_category", "other")) ne $category; 
     309        logger ("FNORD! ". munin_get_node_name ($peer)." -- ".munin_get_node_name ($parent)); 
     310        my $peername = munin_get_node_name ($peer); 
     311        next if $peername eq "contact" and munin_get_node_name ($parent) eq "root"; 
     312        if ($peername eq $me) { 
     313            unshift @$ret, { "name" => $peername, "link" => undef }; 
    316314        } else { 
    317             if (defined $hash->{'graph_title'}) { 
    318                 unshift @$ret, { "name" => munin_get_node_name ($parent->{$peer}), "link" => "$peer.html" }; 
     315            if (defined $peer->{'graph_title'}) { 
     316                unshift @$ret, { "name" => $peername, "link" => "$peername.html" }; 
    319317            } else { 
    320                 unshift @$ret, { "name" => munin_get_node_name ($parent->{$peer}), "link" => "../$peer/index.html" }; 
     318                unshift @$ret, { "name" => $peername, "link" => "../$peername/index.html" }; 
    321319            } 
    322320        } 
    …… 
    339337    foreach my $child (@{munin_get_children ($hash)}) { 
    340338        next unless defined $child and ref ($child) eq "HASH" and keys %$child; 
     339        next if munin_get_node_name ($child) eq "contact"; 
    341340        if (defined $child->{"graph_title"}) { 
    342341            my $childname = munin_get_node_name ($child);