Changeset 1345

Timestamp:

10/21/07 20:37:58 (4 years ago)

Author:

jo

Message:

Service pages are now created properly for multilevel group structure.

Files:

• people/jo/multilevel-groups-2/server/Munin.pm.in (modified) (11 diffs)
• people/jo/multilevel-groups-2/server/munin-html.in (modified) (4 diffs)
• people/jo/multilevel-groups-2/server/munin-serviceview.tmpl.in (modified) (3 diffs)

people/jo/multilevel-groups-2/server/Munin.pm.in

@@ -48 +48 @@
-           'munin_category_status',
-           'munin_get_picture_filename',
+           'munin_get_html_filename',
-           'munin_get_filename',
-           'munin_graph_column_headers',
@@ -55 +56 @@
-           'munin_find_field',
-           'munin_get_node_name',
+           'munin_get_parent_name',
-           'munin_get_node_loc',
-           'munin_get_node',
@@ -61 +63 @@
-           'munin_get_separated_node',
-           'munin_mkdir_p',
+           'munin_get_parent',
-           'munin_get_node_partialpath'
-           );
@@ -464 +467 @@
-}
-
+# munin_get_parent_name: Return the name of the parent of the hash node supplied
+# Parameters: 
+# - $hash: A ref to the hash node
+# Returns:
+# - Success: The name of the parent node
+# - Failure: If no parent node exists, "none" is returned.
+sub munin_get_parent_name
+{
+    my $hash = shift;
+
+    if (ref ($hash) eq "HASH" and defined $hash->{'#%#parent'}) {
+        return munin_get_node_name ($hash->{'#%#parent'});
+    } else { 
+        return "none";
+    }
+}
+
-# munin_get_node_name: Return the name of the hash node supplied
-# Parameters: 
@@ -480 +500 @@
-}
-
+
-# munin_get_node_loc: Get location array for hash node
-# Parameters: 
@@ -486 +507 @@
-# - Success: Ref to an array with the full path of the variable
-# - Failure: undef
-
-
+
-    my $hash = shift;
-    my $res = [];
@@ -499 +519 @@
-    }
-    return $res;
+}
+
+# munin_get_parent: Get parent node of a hash
+# Parameters: 
+# - $hash: A ref to the node
+# Returns:
+# - Success: Ref to an parent
+# - Failure: undef
+sub munin_get_parent {
+    my $hash = shift;
+
+    if (ref ($hash) ne "HASH") { # Not a has node
+        return undef;
+    }
+    if (defined $hash->{'#%#parent'}) {
+        return $hash->{'#%#parent'};
+    } else {
+        return undef;
+    }
-}
-
@@ -747 +786 @@
-}
-
+# munin_get_html_filename: Get the full path-name of an html file
+# Parameters:
+# - $hash: A ref to the service hash node
+# Returns:
+# - Success: The file name with full path
+# - Failure: undef
+sub munin_get_html_filename {
+    my $hash    = shift;
+    my $loc     = munin_get_node_loc ($hash);
+    my $ret     = munin_get ($hash, 'htmldir');
+
+    # Sanitise
+    $ret =~ s/[^\w_\/"'\[\]\(\)+=-]\./_/g;
+    $hash =~ s/[^\w_\/"'\[\]\(\)+=-]/_/g;
+    @$loc = map { s/\//_/g; $_ } @$loc;
+    @$loc = map { s/^\./_/g; $_ } @$loc;
+        
+    my $plugin = pop @$loc or return undef;
+    my $node   = pop @$loc or return undef;
+
+    if (@$loc) { # The rest is used as directory names...
+        $ret .= "/" . join ('/', @$loc);
+    }
+
+    return "$ret/$node/$plugin.html";
+}
+
-# munin_get_picture_filename: Get the full path+name of a picture file
-# Parameters:
@@ -777 +843 @@
-
-    if (defined $sum and $sum) {
--
+/
-    } else {
--
+/
-    }
-}
@@ -1077 +1143 @@
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    my $state = "ok";
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                $state = $fres;
-                last;
-
-
-
+
-                $state = $fres;
-            }
@@ -1105 +1172 @@
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    my $state = undef;
-
-    # Return undef if nagios is turned off, or the field doesn't have any limits
-
-
-
+
-        return undef;
-    }
-
-if (defined $limits->{domain}->{$domain}->{node}->{$node}->{client}->{$service}->{"$field.critical"} and (!defined $check_draw or !$check_draw or 
-
-
+my $loc = munin_get_node_loc ($config);
+
+if (defined munin_get_node ($limits, [$loc,"critical"]) and (!defined $check_draw or !$check_draw or munin_draw_field ($config))) 
-        return "critical";
-
-
-
-
+
-        return "warning";
-
-
-
+
-        return "ok";
-    }

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

@@ -28 +28 @@
-use Time::HiRes;
-use Munin;
+use Data::Dumper;
-use POSIX qw(strftime);
-
-my @times = ( "day", "week", "month", "year" );
-
+my @limit_hosts;
-my $DEBUG=0;
-=
+ = 
-my $conffile = "@@CONFDIR@@/munin.conf";
-my $force_root = 0;
@@ -164 +166 @@
-}
-
+# Make array of what services
+my $work_array = [];
+if (@limit_hosts) { # Limit what to update if needed
+        foreach my $nodename (@limit_hosts) {
+                    push @$work_array, map { @{munin_find_field ($_->{$nodename}, "graph_title")} } @{munin_find_field($config, $nodename)};
+                        }
+} else { # ...else just search for all adresses to update
+        push @$work_array, @{munin_find_field($config, "graph_title")};
+}
+
+# For timestamping graphs
+my $timestamp = strftime("%Y-%m-%d T %T", localtime);
+
+# Draw service pages
+for my $service (@$work_array) {
+
+    next unless munin_get_bool ($service, "graph", 1);
+
+    my %srv;
+    my $fieldnum = 0;
+    my @graph_info;
+    my @field_info;
+    my @loc = munin_get_node_loc ($service);
+    my $pathnodes = get_path_nodes ($service);
+    my $peers     = get_peer_nodes ($service, lc munin_get ($service, "graph_category", "other"));
+    (my $csspath  = $pathnodes->[0]->{'link'}) =~ s/index.html$/style.css/;
+
+    $srv{'node'}     = munin_get_node_name ($service);
+    logger("processing service: $srv{node}");
+    $srv{'service'}  = $service;
+    $srv{'label'}    = munin_get ($service, "graph_title");
+    $srv{'category'} = lc( munin_get ($service, "graph_category", "other") );
+
+    my $method = munin_get ($service, "graph_strategy", "cron");
+
+    $srv{'url'}      = "$srv{node}.html";
+
+    my $path = join ('/', @loc);
+
+    if ($method eq "cgi") {
+        $srv{'imgday'}  =$config->{'cgiurl_graph'}."/$path-day.png";
+        $srv{'imgweek'} =$config->{'cgiurl_graph'}."/$path-week.png";
+        $srv{'imgmonth'}=$config->{'cgiurl_graph'}."/$path-month.png";
+        $srv{'imgyear'} =$config->{'cgiurl_graph'}."/$path-year.png";
+
+        if (munin_get_bool ($service, "graph_sums", 0)) {
+            $srv{'imgweeksum'} = $config->{'cgiurl_graph'}."/$path-week-sum.png";
+            $srv{'imgyearsum'} = $config->{'cgiurl_graph'}."/$path-year-sum.png";
+        }
+    } else {
+        # graph strategy cron
+         
+        $srv{'imgday'}  ="$srv{node}-day.png";
+        $srv{'imgweek'} ="$srv{node}-week.png";
+        $srv{'imgmonth'}="$srv{node}-month.png";
+        $srv{'imgyear'} ="$srv{node}-year.png";
+
+        for my $scale (@times) {
+            if (my ($w, $h) = get_png_size(munin_get_picture_filename($service, $scale))) {
+                $srv{"img".$scale."width"} = $w;
+                $srv{"img".$scale."height"} = $h;
+            }
+        }
+
+        if (munin_get_bool ($service, "graph_sums", 0)) {
+            $srv{imgweeksum} = "$srv{node}-week-sum.png";
+            $srv{imgyearsum} = "$srv{node}-year-sum.png";
+            for my $scale (["week", "year"]) {
+                if (my ($w, $h) = get_png_size (munin_get_picture_filename($service, $scale, 1))) {
+                    $srv{"img".$scale."sumwidth"} = $w;
+                    $srv{"img".$scale."sumheight"} = $h;
+                }
+            }
+        }
+    }
+
+    # Do "help" section
+    if (my $info = munin_get ($service, "graph_info")) {
+        my %graph_info;
+        $graph_info{info} = $info;
+        push @{$srv{graphinfo}}, \%graph_info;
+    }
+
+    $srv{fieldlist} .= "<tr><th align='left' valign='top'>Field</th><th align='left' valign='top'>Type</th><th align='left' valign='top'>Warn</th><th align='left' valign='top'>Crit</th><th></tr>";
+    foreach my $f (@{munin_get_field_order ($service)}) {
+        $f =~ s/=(.*)$//;
+        my $path = $1;
+        next if (!defined $service->{$f});
+        my $fieldobj = $service->{$f};
+        next if (ref ($fieldobj) != "HASH" or !defined $fieldobj->{'label'});
+        next if (!munin_draw_field ($fieldobj));
+
+        logger ("DEBUG: single_value: Checking field \"$f\" ($path).")
+            if $DEBUG;
+
+        if (defined $path) {
+            # This call is to make sure field settings are copied
+            # for aliases, .stack, et al. Todo: put that part of
+            # munin_get_rrd_filename into its own functino.
+            munin_get_rrd_filename ($f, $path);
+        }
+
+        my %field_info;
+        $fieldnum++;
+
+        $field_info{'hr'}    = 1 unless ($fieldnum % 3);
+        $field_info{'field'} = $f;
+        $field_info{'label'} = munin_get ($fieldobj, "label", $f);
+        $field_info{'type'}  = lc( munin_get ($fieldobj, "type", "GAUGE") );
+        $field_info{'warn'}  = munin_get ($fieldobj, "warning");
+        $field_info{'crit'}  = munin_get ($fieldobj, "critical");
+        $field_info{'info'}  = munin_get ($fieldobj, "info");
+
+        my $state = munin_field_status ($config, $limits, 1);
+
+        if (defined $state) {
+            $field_info{'state_warning'}  = 1 if $state eq "warning";
+            $field_info{'state_critical'} = 1 if $state eq "critical";
+            $field_info{'state_unknown'}  = 1 if $state eq "unknown";
+        }
+        push @{$srv{'fieldinfo'}}, \%field_info;
+    }
+
+    my $state = munin_service_status ($service, $limits, 1);
+    if (defined $state) {
+        $srv{'state_warning'}  = 1 if $state eq "warning";
+        $srv{'state_critical'} = 1 if $state eq "critical";
+        $srv{'state_unknown'}  = 1 if $state eq "unknown";
+    }
+
+    $servicetemplate->param(SERVICES  => [\%srv],
+                            PATH      => $pathnodes,
+                            PEERS     => $peers,
+                            CSS       => $csspath,
+                            CATEGORY  => ucfirst $srv{'category'},
+                            TIMESTAMP => $timestamp);
+    my $filename = munin_get_html_filename ($service);
+    open (FILE, ">$filename") or
+        die "Cannot open $filename for writing: $!";
+    print FILE $servicetemplate->output;
+    close FILE;
+}
+
+exit 0;
-#make domain list
-my @domainlist = map { { DOMAIN => $_ } } @domainorder;
@@ -200 +346 @@
-    }
-
-    for my $service (@serviceorder) {
-      logger("processing service: $service");
-      next unless
-        defined($config->{domain}->{$domain}->{node}->{$node}->{client}->{$service} )
-        &&  $config->{domain}->{$domain}->{node}->{$node}->{client}->{$service} ne "";
-
-      next unless
-        munin_get_bool ($config, "graph", 1, $domain, $node, $service);
-
-      my @service;
-      my %service;
-      my $fieldnum = 0;
-      my @graph_info;
-      my @field_info;
-      $service{service}=$service;
-      $service{label}=
-        $config->{domain}->{$domain}->{node}->{$node}->{client}->
-          {$service}->{graph_title};
-
-      my $method = &munin_get ($config, "graph_strategy", "cron");
-      if ($method eq "cgi") {
-        $service{imgday}=$config->{'cgiurl_graph'}.
-          "/$domain/$node/$service-day.png";
-        $service{imgweek}=$config->{'cgiurl_graph'}.
-          "/$domain/$node/$service-week.png";
-        $service{imgmonth}=$config->{'cgiurl_graph'}.
-          "/$domain/$node/$service-month.png";
-        $service{imgyear}=$config->{'cgiurl_graph'}.
-          "/$domain/$node/$service-year.png";
-
-        if (&munin_get_bool_val($config->{domain}->{$domain}->
-                                {node}->{$node}->
-                                {client}->{$service}->{"graph_sums"}, 0)) {
-          $service{imgweeksum} =
-            $config->{'cgiurl_graph'}."/$domain/$node/$service-week-sum.png";
-          $service{imgyearsum} =
-            $config->{'cgiurl_graph'}."/$domain/$node/$service-year-sum.png";
-        }
-
-# There is a disturbance in the force here, the sizes are off.
-#       if (my ($w, $h) =
-#           &calculate_png_size ($config, $domain, $node, $service)) {
-#         for my $scale (@times) {
-#           $service{"img".$scale."width"} = $w;
-#           $service{"img".$scale."height"} = $h;
-#         }
-#         if (&munin_get_bool_val($config->{domain}->{$domain}->
-#                                 {node}->{$node}->
-#                                 {client}->{$service}->{"graph_sums"}, 0)) {
-#           for my $scale (["week", "year"]) {
-#             $service{"img".$scale."sumwidth"} = $w;
-#             $service{"img".$scale."sumheight"} = $h;
-#           }
-#         }
-#       }
-      } else {
-        # graph strategy cron
-        $service{imgday}="$node-$service-day.png";
-        $service{imgweek}="$node-$service-week.png";
-        $service{imgmonth}="$node-$service-month.png";
-        $service{imgyear}="$node-$service-year.png";
-
-        for my $scale (@times) {
-          if (my ($w, $h) =
-              &get_png_size(&munin_get_picture_filename($config, $domain,
-                                                        $node, $service,
-                                                        $scale))) {
-            $service{"img".$scale."width"} = $w;
-            $service{"img".$scale."height"} = $h;
-          }
-        }
-
-        if (&munin_get_bool_val ($config->{domain}->{$domain}->
-                                 {node}->{$node}->{client}->
-                                 {$service}->{"graph_sums"}, 0)) {
-          $service{imgweeksum} = "$node-$service-week-sum.png";
-          $service{imgyearsum} = "$node-$service-year-sum.png";
-          for my $scale (["week", "year"]) {
-            if (my ($w, $h) =
-                &get_png_size (&munin_get_picture_filename($config,$domain,
-                                                           $node, $service,
-                                                           $scale, 1))) {
-              $service{"img".$scale."sumwidth"} = $w;
-              $service{"img".$scale."sumheight"} = $h;
-            }
-          }
-        }
-      }
-      $service{url}="$node-$service.html";
-      $service{domain}="$domain";
-      $service{node}=$node;
-      $service{category}= lc( $config->{domain}->{$domain}->
-                              {node}->{$node}->{client}->
-                              {$service}->{graph_category} || "other" );
-
-      # Do "help" section
-      if (defined($config->{domain}->{$domain}->
-                  {node}->{$node}->
-                  {client}->{$service}->{graph_info})) {
-        my %graph_info;
-
-        $graph_info{info} = $config->{domain}->{$domain}->
-          {node}->{$node}->{client}->{$service}->{graph_info};
-
-        push @{$service{graphinfo}}, \%graph_info;
-      }
-
-      $service{fieldlist} .= "<tr><th align='left' valign='top'>Field</th><th align='left' valign='top'>Type</th><th align='left' valign='top'>Warn</th><th align='left' valign='top'>Crit</th><th></tr>";
-      # foreach my $field (keys %{$config->{domain}->{$domain}->{node}->{$node}->{client}->{$service}})
-      foreach my $f (@{&munin_get_field_order ($config->{domain}->{$domain}->{node}->{$node}, $config, $domain, $node, $service)}) {
-        $f =~ s/=(.*)$//;
-        my $path = $1;
-        next unless &munin_draw_field ($config->{domain}->{$domain}->
-                                       {node}->{$node}, $service, $f);
-
-        print "DEBUG: single_value: Checking field \"$f\" ($path).\n"
-          if $DEBUG;
-
-        if (defined $path) {
-          # HUH? Get the filename and then forget? Some side effect here?
-          munin_get_rrd_filename ($config->{domain}->{$domain}->
-                                  {node}->{$node}, $config, $domain,
-                                  $node, $service, $f, $path);
-        }
-
-        my %field_info;
-        $fieldnum++;
-
-        $field_info{'hr'}    = 1 unless ($fieldnum % 3);
-        $field_info{'field'} = $f;
-        $field_info{'label'} = $config->{domain}->{$domain}->
-          {node}->{$node}->{client}->{$service}->{$f.".label"} || $f;
-
-        $field_info{'type'}  = lc( $config->{domain}->{$domain}->
-                                   {node}->{$node}->{client}->{$service}->
-                                   {$f.".type"} || "GAUGE" );
-
-        $field_info{'warn'}  = $config->{domain}->{$domain}->
-          {node}->{$node}->{client}->{$service}->{$f.".warning"} || "None";
-        $field_info{'crit'}  = $config->{domain}->{$domain}->
-          {node}->{$node}->{client}->{$service}->{$f.".critical"} || "None";
-        $field_info{'info'}  = $config->{domain}->{$domain}->
-          {node}->{$node}->{client}->{$service}->{$f.".info"} || "";
-
-        my $state = &munin_field_status ($config, $limits, $domain,
-                                         $node, $service, $f, 1);
-
-        if (defined $state) {
-          $field_info{'state_warning'}  = 1 if $state eq "warning";
-          $field_info{'state_critical'} = 1 if $state eq "critical";
-          $field_info{'state_unknown'}  = 1 if $state eq "unknown";
-        }
-        push @{$service{fieldinfo}}, \%field_info;
-      }
-
-      {
-        my $state = &munin_service_status ($config, $limits, $domain,
-                                           $node, $service, 1);
-        if (defined $state) {
-          $service{'state_warning'}  = 1 if $state eq "warning";
-          $service{'state_critical'} = 1 if $state eq "critical";
-          $service{'state_unknown'}  = 1 if $state eq "unknown";
-        }
-      }
-
-      push @services, \%service;
-      push @service, \%service;
-      push @{$tmp_cats{$service{'category'}}}, \%service;
-      $servicetemplate->param(SERVICES => \@service,
-                              SERVICE => $service,
-                              NODE => $node,
-                              DOMAIN => $domain, 
-                              DOMAINS => \@domainlist, 
-                              TIMESTAMP => $timestamp);
-      open (FILE, ">$config->{htmldir}/$domain/$node-$service.html") or
-        die "Cannot open $config->{htmldir}/$domain/$node-$service.html: $!";
-      print FILE $servicetemplate->output;
-      close FILE;
-    }
-    foreach my $key (keys %tmp_cats) {
-      next if $key eq "other";
@@ -637 +604 @@
-}
-
+sub get_peer_nodes {
+    my $hash     = shift || return undef;
+    my $category = shift;
+    my $ret      = [];
+    my $link     = "index.html";
+    my $parent   = munin_get_parent ($hash) || return undef;
+    my $me       = munin_get_node_name ($hash);
+
+    foreach my $peer (sort keys %$parent) {
+        next unless defined $peer and defined $parent->{$peer} and ref ($parent->{$peer}) eq "HASH";
+        next if $peer =~ /^#%#/;
+        next if defined $category and lc (munin_get ($parent->{$peer}, "graph_category", "other")) ne $category;
+        if ($peer eq $me) {
+            unshift @$ret, { "name" => munin_get_node_name ($parent->{$peer}), "link" => undef };
+        } else {
+            unshift @$ret, { "name" => munin_get_node_name ($parent->{$peer}), "link" => "$peer.html" };
+        }
+    }
+    return $ret;
+}
+
+sub get_path_nodes {
+    my $hash = shift || return undef;
+    my $ret  = [];
+    my $link = "index.html";
+
+    unshift @$ret, { "name" => munin_get_node_name ($hash), "link" => undef };
+    while ($hash = munin_get_parent ($hash)) {
+        unshift @$ret, { "name" => munin_get_node_name ($hash), "link" => $link };
+        $link = "../" . $link;
+    }
+    $ret->[0]->{'name'} = undef;
+    return $ret;
+}
+
-$update_time = sprintf("%.2f",(Time::HiRes::time - $update_time));
-

people/jo/multilevel-groups-2/server/munin-serviceview.tmpl.in

@@ -4 +4 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-../style.css
+<TMPL_VAR NAME="CSS">
-  <meta http-equiv="refresh" content="300" />
-Munin :: <TMPL_VAR NAME="DOMAIN"> :: <TMPL_VAR NAME="NODE"> :: <TMPL_VAR ESCAPE="HTML" NAME="SERVICE"
+<TMPL_LOOP NAME="PATH"><TMPL_IF NAME="name"> :: <TMPL_VAR ESCAPE="HTML" NAME="name"></a><TMPL_ELSE>Munin</TMPL_IF></TMPL_LOOP
-  <meta http-equiv="content-type" content="application/xhtml+xml; charset=iso-8859-1" />
-  <meta name="author" content="Auto-generated by Munin" />
@@ -15 +15 @@
-     <td><div class="logo">&nbsp;</div></td>
-     <td valign="top">
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-     </td>    
-    </tr>
@@ -82 +91 @@
-  <tr>
-    <td colspan="2" class="linkbox">
-
-
-
+
-    </td>
-  </tr>