Changeset 1352

Timestamp:

24/10/07 18:54:25 (4 years ago)

Author:

jo

Message:

nodeview template now works with multilevel groups.

Files:

• people/jo/multilevel-groups-2/server/munin-html.in (modified) (2 diffs)
• people/jo/multilevel-groups-2/server/munin-nodeview.tmpl.in (modified) (3 diffs)

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

@@ -661 +661 @@
-        if (defined $child->{"graph_title"}) {
-            my $childname = munin_get_node_name ($child);
-{}
+generate_service_templates ($child)
-            push @$graphs, { "name" => $childname };
-            $childnode->{'name'} = $child->{"graph_title"};
@@ -748 +748 @@
-                print FILE $grouptemplate->output;
-                close FILE;
+            } 
+
+            if (defined $key->{'ngraphs'} and $key->{'ngraphs'}) {
+                my $graphtemplate = HTML::Template->new(
+                    filename => munin_get ($config, "tmpldir", "")."/munin-nodeview.tmpl",
+                    die_on_bad_params => 0,
+                    loop_context_vars => 1,
+                    filter => sub { my $ref=shift; $$ref =~ s/URLX/URL$key->{'depth'}/g; }
+                );
+
+                $graphtemplate->param (
+                    GROUPS      => $key->{'groups'},
+                    PATH        => $key->{'path'},
+                    CSSPATH     => $key->{'csspath'},
+                    PEERS       => $key->{'peers'},
+                    PARENT      => $key->{'path'}->[-2]->{'name'},
+                    NAME        => $key->{'name'},
+                    CATEGORIES  => $key->{'categories'},
+                    NCATEGORIES => $key->{'ncategories'},
+                );
+                my $filename = $key->{'filename'};
+                open (FILE, ">$filename") or
+                    die "Cannot open $filename for writing: $!";
+                print FILE $graphtemplate->output;
+                close FILE;
+            } 
+        }
+    }
+}
+
+sub generate_service_templates { 
+}
+
+sub generate_service_templates { 
+
+    my $service = shift || return undef;
+    return undef 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;
-            }
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

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

@@ -4 +4 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-../style.css
+<TMPL_VAR NAME="CSSPATH">
-  <meta http-equiv="refresh" content="300" />
-:: <TMPL_VAR ESCAPE="HTML" NAME="DOMAIN"> :: <TMPL_VAR ESCAPE="HTML" NAME="NODE"
+<TMPL_LOOP NAME="PATH">:: <TMPL_VAR ESCAPE="HTML" NAME="NAME"></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 rowspan="2"><div class="logo">&nbsp;</div></td>
-    <td valign="top">
-
-
+
-    </td>    
-  </tr>
-  <tr>
-    <td valign="top">
-ODE"> :: [ <TMPL_LOOP NAME="CATEGORIES"><a <TMPL_IF NAME="STATE_WARNING">class="warn"</TMPL_IF> <TMPL_IF NAME="STATE_CRITICAL">class="crit"</TMPL_IF> href="#<TMPL_VAR ESCAPE="HTML" NAME="NAME">"><TMPL_VAR ESCAPE="HTML" NAME="NAME"></a> </TMPL_LOOP>]
+AME"><TMPL_IF NAME="NCATEGORIES"> :: [ <TMPL_LOOP NAME="CATEGORIES"><a <TMPL_IF NAME="STATE_WARNING">class="warn"</TMPL_IF> <TMPL_IF NAME="STATE_CRITICAL">class="crit"</TMPL_IF> href="#<TMPL_VAR ESCAPE="HTML" NAME="NAME">"><TMPL_VAR ESCAPE="HTML" NAME="NAME"></a> </TMPL_LOOP>]</TMPL_IF>
-    </td>
-  </tr>
@@ -39 +38 @@
-        <TMPL_LOOP NAME="SERVICES">
-                  <tr><td></td></tr>
-">"><TMPL_VAR ESCAPE="HTML" NAME="LABEL
+X">"><TMPL_VAR ESCAPE="HTML" NAME="NAME
-          <tr>
-">"><img src="<TMPL_VAR NAME="IMGDAY">" alt="<TMPL_VAR ESCAPE="HTML" NAME="LABEL
-">"><img src="<TMPL_VAR NAME="IMGWEEK">" alt="<TMPL_VAR ESCAPE="HTML" NAME="LABEL
+X">"><img src="<TMPL_VAR NAME="IMGDAY">" alt="<TMPL_VAR ESCAPE="HTML" NAME="NAME
+X">"><img src="<TMPL_VAR NAME="IMGWEEK">" alt="<TMPL_VAR ESCAPE="HTML" NAME="NAME
-          </tr>
-        </TMPL_LOOP>