Changeset 1502 for people/jo

Timestamp:

02/29/08 20:15:18 (4 years ago)

Author:

jo

Message:

Merged changes from multilevel-groups-2 and trunk.

Files:

• people/jo/multilevel-groups-3/server/Munin.pm.in (modified) (23 diffs)
• people/jo/multilevel-groups-3/server/munin-domainview.tmpl.in (modified) (5 diffs)
• people/jo/multilevel-groups-3/server/munin-graph.in (modified) (14 diffs)
• people/jo/multilevel-groups-3/server/munin-html.in (modified) (4 diffs)
• people/jo/multilevel-groups-3/server/munin-limits.in (modified) (5 diffs)
• people/jo/multilevel-groups-3/server/munin-nodeview.tmpl.in (modified) (4 diffs)
• people/jo/multilevel-groups-3/server/munin-overview.tmpl.in (modified) (1 diff)
• people/jo/multilevel-groups-3/server/munin-serviceview.tmpl.in (modified) (3 diffs)
• people/jo/multilevel-groups-3/server/munin-update.in (modified) (17 diffs)
• people/jo/multilevel-groups-3/server/style.css (modified) (1 diff)

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

@@ -1 +1 @@
-package Munin; # -*- perl -*-
-#
-4
+7
-#
-# This program is free software; you can redistribute it and/or
@@ -23 +23 @@
-
-use Exporter;
+
-@ISA = ('Exporter');
-@EXPORT = ('munin_trend',
@@ -45 +46 @@
-           'munin_category_status',
-           'munin_get_picture_filename',
+           'munin_get_html_filename',
-           'munin_get_filename',
-           'munin_graph_column_headers',
-           'munin_get_max_label_length',
-           'munin_get_field_order',
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-           );
-
@@ -84 +99 @@
-        "tls_verify_certificate", "tls_verify_depth", "tls_ca_certificate",
-        "graph_data_size", "colour", "graph_printf", "ok", "unknown",
-
+
+
-    );
-
@@ -90 +106 @@
-
-# Fields to copy when "aliasing" a field
-copy_fields    = ("label", "draw", "type", "rrdfile", "fieldname", "info");
+COPY_FIELDS    = ("label", "draw", "type", "rrdfile", "fieldname", "info"); 
-
-sub munin_trend {
@@ -110 +126 @@
-}
-
+# munin_draw_field: Check whether a field will be visible in the graph or not
+# Parameters:
+# - $hash: A ref to the hash node for the field
+# Returns:
+# - Success: Boolean; true if field will be graphed, false if not
+# - Failure: undef
-sub munin_draw_field {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
@@ -218 +236 @@
-    my ($configfile,$overwrite) = @_;
-    for my $key (keys %$overwrite) {
+        next if $key =~ /^#%#/;
-        if (ref $overwrite->{$key}) {
-            &munin_overwrite($overwrite->{$key},$configfile->{$key});
@@ -233 +252 @@
-    $conf ||= $configfile;
-    if (! -r $conf and ! $missingok) {
-       
-       
+
+
-    }
-    if (open (CFG, $conf))
@@ -250 +269 @@
-    $config->{'tmpldir'}||= "@@CONFDIR@@/templates/";
-    $config->{'htmldir'}||= "@@HTMLDIR@@/";
+    $config->{'#%#parent'}= undef;
+    $config->{'#%#name'}= "root";
-    return ($config);
-}
@@ -256 +277 @@
-{
-    my $lines    = shift;
-undef
+{}
-    my $prefix   = "";
-    my $prevline = "";
@@ -263 +284 @@
-    {
-        chomp $line;
-#$line =~ s/(^|[^\\])#.*/$1/g if $line =~ /#/;  # Skip comments...
-        if ($line =~ /#/) {
-            next if ($line =~ /^#/);
@@ -367 +387 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    my $hash = shift;
@@ -373 +584 @@
-    my $val  = shift;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -440 +719 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if ($outstring =~ /\\$/)
-            { # Backslash as last char has special meaning. Avoid it.
-re$a
+ath
-            } else {
-re$a
+ath
-            }
-        }
-    }
-}
+
-sub munin_writeconfig {
-    my ($datafilename,$data,$fh) = @_;
-#   my $datafile = new Config::General();
-#   $datafile->save_file($datafilename,$data);
-
-    if (!defined $fh)
@@ -506 +777 @@
-    print $fh "version $VERSION\n";
-    # Write datafile
-, ""
+
-    
-    if (defined $fh)
@@ -527 +798 @@
-}
-
+# 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');
+    my $plugin  = "index";
+
+    # Sanitise
+    $ret =~ s/[^\w_\/"'\[\]\(\)+=-]\./_/g;
+    $hash =~ s/[^\w_\/"'\[\]\(\)+=-]/_/g;
+    @$loc = map { s/\//_/g; $_ } @$loc;
+    @$loc = map { s/^\./_/g; $_ } @$loc;
+        
+    if (defined $hash->{'graph_title'}) {
+        $plugin = pop @$loc or return undef;
+    }
+
+    if (@$loc) { # The rest is used as directory names...
+        $ret .= "/" . join ('/', @$loc);
+    }
+
+    return "$ret/$plugin.html";
+}
+
+# munin_get_picture_filename: Get the full path+name of a picture file
+# Parameters:
+# - $hash: A ref to the service hash node
+# - $scale: The scale (day, week, year, month)
+# - $sum: [optional] Boolean value, whether it's a sum graph or not.
+# Returns:
+# - Success: The file name with full path
+# - Failure: undef
-sub munin_get_picture_filename {
-
-
-
-
+
-    my $scale   = shift;
-    my $sum     = shift;
-
+
+
-
-    # Sanitise
-
-
-
-
+
+
-    $scale =~ s/[^\w_\/"'\[\]\(\)+=-]/_/g;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-sub munin_get_filename {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-sub munin_get_bool
-{
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    return undef if not defined $ans;
-
@@ -580 +960 @@
-        $ans =~ /^enable$/i or
-        $ans =~ /^enabled$/i
-
-
-
-
-
+
+
+
-        $ans =~ /^false$/i or
-        $ans =~ /^off$/i or
-        $ans =~ /^disable$/i or
-        $ans =~ /^disabled$/i
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-}
@@ -648 +1021 @@
-}
-
+# munin_get: Get variable
+# Parameters:
+# - $hash: Ref to hash node
+# - $field: Name of field to get
+# - $default: [optional] Value to return if $field isn't set
+# Returns:
+# - Success: field contents
+# - Failure: $default if defined, else undef
-sub munin_get
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -722 +1125 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $state = $fres;
-                last;
-
-    elsif ($fres eq "warning")
-
+ elsif ($fres eq "warning") {
+       $state = $fres;
+} elsif ($fres eq "unknown" and $state eq "ok") 
-                $state = $fres;
-            }
@@ -755 +1165 @@
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    my $state = "ok";
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                $state = $fres;
-                last;
-
-
-
+
-                $state = $fres;
-            }
@@ -783 +1194 @@
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    my $state = undef;
-
-    # Return undef if nagios is turned off, or the field doesn't have any limits
-
-
-
+
-        return undef;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    }
-}
@@ -834 +1241 @@
-}
-
+# munin_get_max_label_length: Get the length of the longest labe in a graph
+# Parameters:
+# - $hash: the graph in question
+# - $order: A ref to an array of fields (graph_order)
+# Returns:
+# - Success: The length of the longest label in the graph
+# - Failure: undef
-sub munin_get_max_label_length
-{
-    my $node    = shift;
-    my $config  = shift;
-    my $domain  = shift;
-    my $host    = shift;
-    my $service = shift;
-    my $order   = shift;
-    my $result  = 0;
+    my $tot     = munin_get ($service, "graph_total");
-
-    for my $field (@$order) {
-        my $path = undef;
-        (my $f = $field) =~ s/=.+//;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return $result;
-}
-
+# munin_get_field_order: Get the field order in a graph
+# Parameters:
+# - $hash: A hash ref to the service
+# Returns:
+# - Success: A ref to an array of the field names
+# - Failure: undef
-sub munin_get_field_order
-{
-
-
-
-
-
+
-    my $result  = [];
-
-
-
-
-
+
+
+
+
+
+
-            push (@$result, "-".$gs);
-        }
-    } 
-
-
-
+
+
-    } 
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-    
@@ -898 +1306 @@
-}
-
+# munin_get_rrd_filename: Get the name of the rrd file corresponding to a 
+#                         field. Checks for lots of bells and whistles.
+#                         This function is the correct one to use when 
+#                         figuring out where to fetch data from.
+# Parameters:
+# - $field: The hash object of the field
+# - $path: [optional] The path to the field (as given in graph_order/sum/stack/et al)
+# Returns:
+# - Success: A string with the filename of the rrd file
+# - Failure: undef
-sub munin_get_rrd_filename {
-    my $node    = shift;
-    my $config  = shift;
-    my $domain  = shift;
-    my $name    = shift;
-    my $service = shift;
-    my $field   = shift;
-    my $path    = shift;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    }
-    return $result;
-}
-
+# munin_mkdir_p: Make directory (and path to it)
+# Parameters:
+# - $dirname: Directory to create
+# - $umask: Umask (in addition to the user umask)
+# Returns:
+# - Success: $dirname
+# - Failure: undef
+sub munin_mkdir_p
+{
+    my $dirname = shift;
+    my $umask   = shift;
+
+    return $dirname if (-e $dirname);
+
+
+    ::logger ("Notice: Created directory \"$dirname\".");
+    (my $prev = $dirname) =~ s/\/[^\/]+\/?$//;
+    if (munin_mkdir_p ($prev, $umask)) {
+        if (mkdir ($dirname, $umask)) {
+            return $dirname;
+        } else {
+            return undef;
+        }
+    } else {
+        return undef;
+    }
+}
+
-
-1;

people/jo/multilevel-groups-3/server/munin-domainview.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 NAME="DOMAIN"
+<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">
-         <h2><a href="../index.html">Overview</a> :: <TMPL_VAR ESCAPE="HTML" NAME="DOMAIN"></h2
+        <h2><TMPL_LOOP NAME="PATH"><TMPL_IF NAME="PATH"><a href="<TMPL_VAR NAME="PATH">"></TMPL_IF><TMPL_VAR NAME="NAME"><TMPL_IF NAME="PATH"></a> :: </TMPL_IF></TMPL_LOOP></title
-    </td>    
-  </tr>
@@ -21 +21 @@
-  <tr>
-    <td valign="top">
-DOMAIN
+NAME
-    </td>
-  </tr></TMPL_IF>
@@ -30 +30 @@
-   <td class="linkbox">
- <ul>   
-NODE
-<li><span class="domain"><a href="<TMPL_VAR NAME="NODE">.html"><TMPL_VAR ESCAPE="HTML" NAME="NOD
+GROUP
+    <li><span class="domain"><a href="<TMPL_VAR NAME="URLX">"><TMPL_VAR ESCAPE="HTML" NAME="NAM
-      <ul>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-      <ul>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      </ul>
-
-
+
+
+
-      </ul>
-
-
+
+
+
+
+
+
- </ul>
- </td></tr>
@@ -50 +86 @@
- <tr>
-   <td class="linkbox">
-
-
-
+
- </td>
- </tr>

people/jo/multilevel-groups-3/server/munin-graph.in

@@ -214 +214 @@
-my $watermark = "Munin $VERSION";
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-$graph_time = sprintf ("%.2f",(Time::HiRes::time - $graph_time));
@@ -236 +240 @@
-# ### The End
-
-sub process_domain {
-    my ($domain) = @_;
-    for my $key ( keys %{$config->{domain}->{$domain}->{node}}) {
-        my $node_time= Time::HiRes::time;
-
-        process_node($domain,$key ,$config->{domain}->{$domain}->{node}->{$key} );
-        $node_time = sprintf ("%.2f",(Time::HiRes::time - $node_time));
-        logger ("Processed node: $key ($node_time sec)");
-        print STATS "GN|$domain|$key|$node_time\n" unless $skip_stats;
-    }
-}
-
-sub get_title {
-    my $node    = shift;
-    my $service = shift;
-    my $scale   = shift;
-
-
-
-
+
-}
-
-sub get_custom_graph_args
-{
-    my $node    = shift;
-    my $service = shift;
-    my $result  = [];
-
-
-
+
+
+
-        return $result;
-
-
-
+
-        return undef;
-    }
@@ -276 +263 @@
-sub get_vlabel
-{
-    my $node    = shift;
-    my $service = shift;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
-sub should_scale
-{
-    my $node    = shift;
-    my $service = shift;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
-sub get_header {
-    my $node    = shift;
-    my $config  = shift;
-    my $domain  = shift;
-    my $host    = shift;
-    my $service = shift;
-    my $scale   = shift;
@@ -320 +293 @@
-
-    # Picture filename
-&munin_get_picture_filename ($config, $domain, $host, 
+munin_get_picture_filename (
-
-    # Title
-&get_title ($node, 
+get_title (
-
-    # When to start the graph
@@ -329 +302 @@
-
-    # Custom graph args, vlabel and graph title
-&get_custom_graph_args ($node, 
+get_custom_graph_args (
-        push (@$result, @{$tmp_field});
-    }
-&get_vlabel ($node, $service, munin_get ($config, "graph_period", "second", $domain, $host, $service)
+get_vlabel ($service
-        push @$result, ("--vertical-label", $tmp_field);
-    }
-
-&munin_get ($config, "graph_height", "175", $domain, $host, $service
-&munin_get ($config, "graph_width", "400", $domain, $host, $service
+munin_get ($service, "graph_height", "175"
+munin_get ($service, "graph_width", "400"
-    push @$result,"--imgformat", "PNG";
-    push @$result,"--lazy" if ($force_lazy);
-
-
-
+
-
-    return $result;
@@ -349 +321 @@
-sub get_sum_command
-{
-    my $node    = shift;
-    my $service = shift;
-    my $field   = shift;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
-sub get_stack_command
-{
-    my $node    = shift;
-    my $service = shift;
-    my $field   = shift;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
-sub expand_specials
-{
-    my $node    = shift;
-    my $config  = shift;
-    my $domain  = shift;
-    my $host    = shift;
-    my $service = shift;
-    my $preproc = shift;
@@ -397 +351 @@
-    my $fieldnum = 0;
-    for my $field (@$order) { # Search for 'specials'...
-
-
-{
+
+
+if ($field =~ /^-(.+)$/) { # Invisible field
-            $field = $1;
-
-
-
-
-
+
-        }
-
-        $fieldnum++;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            my @spc_stack = ();
-
-
+
-                (my $name = $pre) =~ s/=.+//;
-
-
-
-
-
-
-
-
+
+
+
+
+
-                }
-                push (@spc_stack, $name);
@@ -432 +404 @@
-                push @$result, "$name.cdef";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                    push @$result, "$name.onlynullcdef";
-                }
-            }
-
-
-
+
-            my @spc_stack = ();
-            my $last_name = "";
-
-
-
-
-
-
-
+
+
+
+
+
-                
-
-
+
-                (my $path = $pre) =~ s/.+=//;
-                my $name = "z".$fieldnum."_".scalar (@spc_stack);
-                $last_name = $name;
-
-$node->{client}->{$service}->{$name.".cdef"}  = "$name,UN,0,$name,IF"
-$node->{client}->{$service}->{$name.".graph"} = "no"
-$node->{client}->{$service}->{$name.".label"} = $name
+munin_set_var_loc ($service, [$name, "cdef"], "$name,UN,0,$name,IF")
+munin_set_var_loc ($service, [$name, "graph"], "no")
+munin_set_var_loc ($service, [$name, "label"], $name)
-                push @$result, "$name.cdef";
-                push @$result, "$name.graph";
@@ -477 +440 @@
-                push (@$preproc, "$name=$pre");
-            }
-
-
-
-
-
-
+
+
+
-                print "Oh bugger...($field)...\n" if $DEBUG;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -520 +469 @@
-sub single_value
-{
-    my $node    = shift;
-    my $config  = shift;
-    my $domain  = shift;
-    my $host    = shift;
-    my $service = shift;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -561 +494 @@
-
-sub process_field {
-    my $node    = shift;
-    my $service = shift;
-    my $field   = shift;
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-    # Make my graphs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            if ($single_value) {
-                # Only one field. Do min/max range.     
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-            # Draw HRULEs
-config, "line", undef, $domain, $name, $service, $field
+negfield, "line"
-            if ($linedef) {
-                my ($number, $ldcolour, $label) = split (/:/, $linedef, 3);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            push (@rrd, "CDEF:ipostotal=".join (",", map { "$_,UN,0,$_,IF" } @{$total_pos{'min'}}).(",+" x (@{$total_pos{'min'}}-1)));
-            push (@rrd, "CDEF:gpostotal=".join (",", map { "$_,UN,0,$_,IF" } @{$total_pos{'avg'}}).(",+" x (@{$total_pos{'avg'}}-1)));
-            push (@rrd, "CDEF:apostotal=".join (",", map { "$_,UN,0,$_,IF" } @{$total_pos{'max'}}).(",+" x (@{$total_pos{'max'}}-1)));
-
+
+
+
-            push (@rrd, "CDEF:dpostotal=ipostotal,UN,ipostotal,UNKN,IF");
-" . $node->{client}->{$service}->{graph_total} . (" " x ($max_field_len - length ($node->{client}->{$service}->{graph_total}
-COMMENT: Cur$RRDkludge:") unless $global_headers
+$graphtotal" . (" " x ($max_field_len - length ($graphtotal
+GPRINT:gnegtotal:LAST:$rrdformat" . $rrdscale . "/\\g")
-            push (@rrd, "GPRINT:gpostotal:LAST:$rrdformat" . $rrdscale . "");
-COMMENT: Min$RRDkludge:") unless $global_headers
+GPRINT:inegtotal:MIN:$rrdformat" . $rrdscale . "/\\g")
-            push (@rrd, "GPRINT:ipostotal:MIN:$rrdformat" . $rrdscale . "");
-COMMENT: Avg$RRDkludge:") unless $global_headers
-
-COMMENT: Max$RRDkludge:") unless $global_headers
+GPRINT:gnegtotal:AVERAGE:$avgformat" . $rrdscale . "/\\g")
+ 
+GPRINT:anegtotal:MAX:$rrdformat" . $rrdscale . "/\\g")
-            push (@rrd, "GPRINT:apostotal:MAX:$rrdformat" . $rrdscale . "\\j");
-        }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            push(@complete,'-W', $watermark) if $RRDs::VERSION >= 1.2;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            if (time - 300 < $lastupdate) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if (my $ERROR = RRDs::error) {
-$filename
+". munin_get_picture_filename ($service, $time) . "
-            } elsif ($list_images) {
-                # Command-line option to list images created
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-sub graph_by_minute {
-    my $config  = shift;
-    my $domain  = shift;
-    my $name    = shift;
-    my $service = shift;
-
-config, "graph_period", "second", $domain, $name, $service
+service, "graph_period", "second"
-}
-
-sub orig_to_cdef {
+    my $service   = shift;
+    my $fieldname = shift;
+
+    return undef unless ref ($service) eq "HASH";
+
+    if (defined $service->{$fieldname}->{"cdef_name"}) {
+        return orig_to_cdef ($service, $service->{$fieldname}->{"cdef_name"});
+    }
+    return $fieldname;
+}
+
+sub skip_service {
-    my $service = shift;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    # See if we should skip it because of conf-options
-
-
-
-
-
-
+
+
-
-    # Don't skip
@@ -1109 +1001 @@
-    my ($max, $min, $avg) = ("CDEF:a$new_field=$cdef", "CDEF:i$new_field=$cdef", "CDEF:g$new_field=$cdef");
-
-
-
-
-
+
+
-        my $rrdname = &orig_to_cdef ($service, $fieldname);
-
-
+
-                $max =~ s/([,=])$fieldname([,=]|$)/$1a$rrdname$2/g;
-                $min =~ s/([,=])$fieldname([,=]|$)/$1i$rrdname$2/g;
@@ -1122 +1011 @@
-    }
-
-&set_cdef_name ($service, $$cfield_ref
+munin_set_var_loc ($service, [$$cfield_ref, "cdef_name"]
-    $$cfield_ref = $new_field;
-
@@ -1131 +1020 @@
-    my $dirname = shift;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-}
-
-sub logger {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}

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

@@ -32 +32 @@
-my @times = ( "day", "week", "month", "year" );
-
+my @limit_hosts;
-my $DEBUG=0;
-=
+ = 
-my $conffile = "@@CONFDIR@@/munin.conf";
-my $force_root = 0;
@@ -144 +145 @@
-if ($config->{domain_order}) {
-    @domainorder = split /\s+/, $config->{domain_order};
-}
-foreach my $d (sort (keys %{$config->{domain}})) {
-    unless (grep (/^$d$/, @domainorder)) {
-        push @domainorder, $d;
-    }
-}
-
@@ -165 +161 @@
-}
-
-
-
+
-my $timestamp = strftime("%Y-%m-%d T %T", localtime);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-print FILE $template->output;
-close FILE;
+
+generate_group_templates ($groups);
-
-munin_removelock("$config->{rundir}/munin-html.lock");
@@ -640 +298 @@
-}
-
+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);
+    my $pchildren = munin_get_children ($parent);
+
+    foreach my $peer (sort {munin_get_node_name($a) <=> munin_get_node_name($b)} @$pchildren) {
+        next unless defined $peer and ref ($peer) eq "HASH";
+        next if defined $category and lc (munin_get ($peer, "graph_category", "other")) ne $category;
+        logger ("FNORD! ". munin_get_node_name ($peer)." -- ".munin_get_node_name ($parent));
+        my $peername = munin_get_node_name ($peer);
+        next if $peername eq "contact" and munin_get_node_name ($parent) eq "root";
+        if ($peername eq $me) {
+            unshift @$ret, { "name" => $peername, "link" => undef };
+        } else {
+            if (defined $peer->{'graph_title'}) {
+                unshift @$ret, { "name" => $peername, "link" => "$peername.html" };
+            } else {
+                unshift @$ret, { "name" => $peername, "link" => "../$peername/index.html" };
+            }
+        }
+    }
+    return $ret;
+}
+
+sub get_group_tree {
+    my $hash    = shift;
+    my $base    = shift || "";
+    my $graphs  = [];
+    my $groups  = [];
+    my $cattrav = {};
+    my $cats    = [];
+    my $path    = [];
+    my $rpath   = undef;
+    my $ret     = {};
+    my $csspath;
+
+    foreach my $child (@{munin_get_children ($hash)}) {
+        next unless defined $child and ref ($child) eq "HASH" and keys %$child;
+        next if munin_get_node_name ($child) eq "contact";
+        if (defined $child->{"graph_title"}) {
+            my $childname = munin_get_node_name ($child);
+            my $childnode = generate_service_templates ($child);
+            push @$graphs, { "name" => $childname };
+            $childnode->{'name'} = $child->{"graph_title"};
+            $childnode->{'url'} = $base . $childname.".html";
+            for (my $shrinkpath = $childnode->{'url'}, my $counter = 0; $shrinkpath; $shrinkpath =~ s/^[^\/]+\/?//, $counter++) {
+                $childnode->{'url'.$counter} = $shrinkpath;
+            }
+            push @{$cattrav->{ lc munin_get ($child, "graph_category", "other") }}, $childnode;
+        } elsif (ref ($child) eq "HASH") {
+            push @$groups, get_group_tree ($child, $base . munin_get_node_name ($child) . "/");
+        }
+    }
+
+    # We need the categories in another format.
+    foreach my $cat (sort keys %$cattrav) {
+        my $obj = {};
+        $obj->{'name'} = $cat;
+        $obj->{'url'} = $base."index.html#".$cat;
+        $obj->{'services'} = $cattrav->{$cat};
+        $obj->{'state_'.lc munin_category_status ($hash, $limits, $cat, 1)} = 1;
+        for (my $shrinkpath = $obj->{'url'}, my $counter = 0; $shrinkpath =~ /\//; $shrinkpath =~ s/^[^\/]+\/*//, $counter++) {
+            $obj->{'url'.$counter} = $shrinkpath;
+        }
+        push @$cats, $obj;
+    }
+
+    # ...and we need a couple of paths available.
+    @$path = reverse map { { "name" => $_, "path" => (defined $rpath?($rpath.="../")."index.html":($rpath="")) } } reverse ( "Overview", split ('\/', $base) );
+    ($csspath = $path->[0]->{'path'}) =~ s/index.html$/style.css/;
+
+    $ret = { 
+        "name"        => munin_get_node_name ($hash), 
+        "url"         => $base . "index.html", 
+        "path"        => $path,
+        "depth"       => scalar(split("/",$base."index.html"))-1,
+        "filename"    => munin_get_html_filename ($hash),
+        "csspath"     => $csspath,
+        "groups"      => $groups, 
+        "graphs"      => $graphs,
+        "categories"  => $cats,
+        "ngroups"     => scalar (@$groups),
+        "ngraphs"     => scalar (@$graphs),
+        "ncategories" => scalar (@$cats),
+        "peers"       => get_peer_nodes ($hash),
+    };
+    if ($ret->{'url'} ne "/index.html") {
+        for (my $shrinkpath = $ret->{'url'}, my $counter = 0; $shrinkpath =~ /\//; $shrinkpath =~ s/^[^\/]+\/*//, $counter++) {
+            $ret->{'url'.$counter} = $shrinkpath;
+        }
+    }
+
+    return $ret;
+}
+
+sub generate_group_templates {
+    my $arr = shift || return undef;
+    return undef unless ref ($arr) eq "ARRAY";
+
+    foreach my $key (@$arr) {
+        if (defined $key and ref ($key) eq "HASH") {
+            if (defined $key->{'ngroups'} and $key->{'ngroups'}) {
+                generate_group_templates ($key->{'groups'});
+
+                my $grouptemplate = HTML::Template->new(
+                    filename => munin_get ($config, "tmpldir", "")."/munin-domainview.tmpl",
+                    die_on_bad_params => 0,
+                    loop_context_vars => 1,
+                    filter => sub { my $ref=shift; $$ref =~ s/URLX/URL$key->{'depth'}/g; }
+                );
+
+                $grouptemplate->param (
+                    GROUPS  => $key->{'groups'},
+                    PATH    => $key->{'path'},
+                    CSSPATH => $key->{'csspath'},
+                    PEERS   => $key->{'peers'},
+                    PARENT  => $key->{'path'}->[-2]->{'name'}
+                );
+                my $filename = $key->{'filename'};
+                open (FILE, ">$filename") or
+                    die "Cannot open $filename for writing: $!";
+                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 { 
+
+    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;
+            }
+        }
+
+        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 ($fieldobj, $limits, 1);
+        logger ("state of ".join('::',@{munin_get_node_loc ($fieldobj)}).": $state");
+
+        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;
+
+    return \%srv;
+}
+
+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-3/server/munin-limits.in

@@ -100 +100 @@
-
-if (!defined $config->{'contact'}->{'nagios'}->{'command'} and
-
-
+
-    $config->{'contact'}->{'old-nagios'}->{'command'} = "$config->{nsca} $config->{nsca_server} -c $config->{nsca_config} -to 60";
-    $config->{'contact'}->{'old-nagios'}->{'always_send'} = "critical warning";
-}
-
-
+
-    $config->{'contact'}->{'nagios'}->{'always_send'} = "critical warning";
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-&munin_writeconfig ("$config->{dbdir}/limits", \%notes);
-
@@ -122 +145 @@
-logger("munin-limits finished ($update_time sec)");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-sub process_service {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    my @critical = (undef, undef);
-    my @warning  = (undef, undef);
-
-
-
+
+
+
+
+
-        $critical[0] = $1 if length $1;
-        $critical[1] = $2 if length $2;
-
-
-
-
-
+
+
-        $critical[1] = $1 if defined $1;
-
-
-
-
+
+
-        @critical = (0, 0);
-
-
-
-
-
+
+
+
+
-        $warning[0] = $1 if length $1;
-        $warning[1] = $2 if length $2;
-
-
-
-
-
+
+
-        $warning[1] = $1 if defined $1;
-
-
-
-
+
+
-        @warning = (0, 0);
-domain -> $name -> $clientname -> $key
+name
-    }
-    return (\@warning, \@critical);
@@ -294 +283 @@
-
-sub generate_service_message {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        exit 3;
+                    } 
+                    if (!$logpid) { # Child
+                        while (<STDIN>) {
+                            chomp;
+                            logger ("Command \"$c\" stdout: $_");
+                        }
+                        exit 0;
-                    }
-
-
-
-
-
-
+
+
+
+
-                        logger ("Fatal: Unable to  fork: $!");
-                        exit 3;
-                    }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                    }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -472 +429 @@
-
-sub message_expand {
+    my $hash   = shift;
-    my $text   = shift;
-    my $client = shift;
-    my $prefix = shift || "";
-    my @res    = ();
-
-    
-
-
-
-
+
+
-            push @res, $1;
-            $text = $2;
-        }   
-        my @a = extract_bracketed ($text, '{}');
-
-
-
-
-
-
+
+
+
-            my $d = $1;
-            my $f = $2;
-            my $t = $3;
+            my $fields = munin_get ($hash, $f, "");
-            my @res  = ();
-defined $client->{$f})
-   
-foreach my $sub (split /\s+/, $client->{$f})
-{
-push @res, message_expand ($t, $client, $sub.".");
+$fields) {
+       foreach my $sub (split /\s+/, $fields)
+    if (defined $hash->{$sub}) {
+       push @res, message_expand ($hash->{$sub}, $t);
+}
-                }
-            } 
-            $a[0] = join ($d, @res);
-
-
-
+
-            my $f = $1;
-            my $t = $2;
+            my $fields = munin_get ($hash, $f, "");
-            my $res  = "";
-defined $client->{$f})
-   
-foreach my $sub (split /\s+/, $client->{$f})
-{
-$res .= message_expand ($t, $client, $sub.".");
+$fields) {
+       foreach my $sub (split /\s+/, $fields)
+    if (defined $hash->{$sub}) {
+       push @res, message_expand ($hash->{$sub}, $t);
+}
-                }
-            } 
-            $a[0] = $res;
-
-
-
+
-            my $f = "%.".$1."s";
-            my $t = $2;
-
-
-
-
+
+
-            my $n = $1;
-            my $f = $2;
-            my $t = $3;
-            my $res  = "";
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-            } 
-            $a[0] = $res;
@@ -552 +497 @@
-    # Called from the Munin module when we call munin_config
-    my $dirname = shift;
-
-
-    if (!$log->opened) {

people/jo/multilevel-groups-3/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>
@@ -52 +51 @@
-  </TMPL_LOOP>
-  <tr><td class="linkbox">
-
-
-
+
- </td></tr>
-</table>

people/jo/multilevel-groups-3/server/munin-overview.tmpl.in

@@ -18 +18 @@
- </table>
- <div class="box">
-DOMAIN
+GROUP
- <ul>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   </li>
- </ul>

people/jo/multilevel-groups-3/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>

people/jo/multilevel-groups-3/server/munin-update.in

@@ -159 +159 @@
-my $bad_procs = 0;
-my $uaddr;
-
-
+
+if ($do_fork) 
-    # Set up socket
-    $uaddr =  sockaddr_un("$config->{rundir}/$serversocket");
@@ -172 +172 @@
-logger("Starting munin-update");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-                }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
+            delete $children{$pid};
+            waitpid ($pid, 0);
+            logger ("connection from $name ($pid) closed");
+        }
+        if (@queue and defined $config->{max_processes} and
+            $config->{max_processes} and
+            scalar (keys %children) < (($config->{max_processes})-1-$bad_procs)) {
+            do_node(@{pop @queue});
+            close (Client);
+        }
-    }
-    alarm (0);
-
+
+
+
+
+
+
+
-
-if ($bad_procs) # Use old configuration for killed children
@@ -290 +302 @@
-        foreach my $key (keys %children)
-        {
-domain
-ame   
-node   
-oldnode = $children{$key}->[3]
-
-use_old_config ($domain, $name, $oldnode
-domain -> $
+loc   
+ewnode
+oldnode
+name    = munin_get_node_name ($newnode)
+
+munin_copy_node_toloc ($oldnode, $config, $loc
+
-        }
-}
-
-unlink ("$config->{rundir}/$serversocket");
+
-
-my $overwrite = &munin_readconfig($conffile);
-$config = &munin_overwrite($config,$overwrite);
-
-&
+
-
-if (&munin_getlock("$config->{rundir}/munin-datafile.lock")) {
@@ -332 +345 @@
-    my $just_upgraded = 0;
-
-
-
-
+
-        $just_upgraded = 1;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-sub change_type
-{
-
-
-
-
-
-
+
+
-    my $val    = shift;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
-sub change_max
-{
-
-
-
-
-
-
-
-
-
+
+
+
+
-    RRDs::tune ($file, "-a", "42:".(defined $val?$val:"U"));
-}
@@ -441 +405 @@
-sub change_min
-{
-
-
-
-
-
-
-
-
-
+
+
+
+
-    RRDs::tune ($file, "-i", "42:".(defined $val?$val:"U"));
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-  # Then we fork...
@@ -498 +431 @@
-      if (!defined($pid)) 
-      { # Something went wrong
-warn "cannot fork: $!"
+logger ("Error: Unable to fork: $!")
-              return; 
-      } elsif ($pid) 
-      { # I'm the parent
-domain, $name, $node, $oldnode
+loc, $newconf, $oldconf
-              return; 
-      } # else I'm the child -- go spawn
@@ -510 +443 @@
-
-  # First we get lock...
-
-
-
-
-
+
+
+
-        socket (SOCK, PF_UNIX, SOCK_STREAM, 0)   || die "socket: $!";
-"$config->{rundir}
-
-  $config->{domain}->{$domain}->{node}->{$name} = $oldnode
-  alarm (0); # Don't want to interrupt this.
-my @tmp = ($$, $domain, $name
+munin_get($newconf, "rundir")."
+
+my @tmp = ($$, munin_get_node_loc($newconf), $name)
+if (ref $oldconf) {
+copy_node ($oldconf, $newconf
-          nstore_fd \@tmp, \*SOCK || die "Could not nstore_fd: $!";
-$config->{domain}->{$domain}->{node}->{$name}
+munin_get_separated_node ($newconf)
-          close SOCK;
+        } else { # Well, we'll have to give _something_ to the server, or it'll time out.
+          socket (SOCK, PF_UNIX, SOCK_STREAM, 0)   || die "socket: $!";
+          connect (SOCK, sockaddr_un (munin_get($newconf, "rundir")."/$serversocket")) || die "connect: $!";
+          nstore_fd \@tmp, \*SOCK || die "Could not nstore_fd: $!";
+          nstore_fd ({}, \*SOCK);
-        }
-        exit 1;
-
-
-
+
-        return 0;
-    }
@@ -535 +469 @@
-  my $socket;
-  
-&munin_get ($config, "local_address", undef, $domain, $node
+munin_get ($newconf, "local_address"
-  {
-
-
-
-
-
+
+
+
+
-  } else {
-
-
-
-
+
+
+
-  }
-  my $err = ($socket ? "" : $!);
@@ -554 +486 @@
-      alarm ($timeout);
-
-$domain
+munin_get_node_loc ($newconf)
-
-      if (!$socket) {
-ode
+ewconf
-        # If we can't reach the client. Using old Configuration.
-node
-$config->{domain}->{$domain}->{node}->{$name} = $oldnode
+conf
+copy_node ($oldconf, $newconf)
-          alarm (0); # Don't want to interrupt this.
-          socket (SOCK, PF_UNIX, SOCK_STREAM, 0)   || die "socket: $!";
-"$config->{rundir}
+munin_get($newconf, "rundir")."
-          nstore_fd \@tmp, \*SOCK || die "Could not nstore_fd: $!";
-
-
+
-          close SOCK;
-
-
-
+
-          socket (SOCK, PF_UNIX, SOCK_STREAM, 0)   || die "socket: $!";
-"$config->{rundir}
+munin_get($newconf, "rundir")."
-          nstore_fd \@tmp, \*SOCK || die "Could not nstore_fd: $!";
-          nstore_fd ({}, \*SOCK);
@@ -578 +507 @@
-      } else {
-                my $ctx;
-
-
-
+
+
-                    socket (SOCK, PF_UNIX, SOCK_STREAM, 0)   || die "socket: $!";
-"$config->{rundir}
+munin_get($newconf, "rundir")."
-                    nstore_fd \@tmp, \*SOCK || die "Could not nstore_fd: $!";
-$config->{domain}->{$domain}->{node}->{$name}
+munin_get_separated_node ($newconf)
-                    close SOCK;
-                    exit 1;
-                }
-domain,$name,$node
+newconf,$oldconf
-#               Net::SSLeay::free ($tls) if ($tls); # Shut down TLS
-                close $socket;
-                alarm (0); # Don't want to interrupt this.
-                socket (SOCK, PF_UNIX, SOCK_STREAM, 0)   || die "socket: $!";
-
-
+
-                nstore_fd \@tmp, \*SOCK || die "Could not nstore_fd: $!";
-       nstore_fd \%{$config->{domain}->{$domain}->{node}->{$name}
+        nstore_fd \%{munin_get_separated_node ($newconf)
-                alarm ($timeout);
-                close SOCK;
@@ -607 +534 @@
-  {
-      if (!$socket) {
-ode
+ewconf
-        # If we can't reach the client. Using old Configuration.
-node
-$config->{domain}->{$domain}->{node}->{$name} = $oldnode
+conf
+  copy_node ($oldconf, $newconf)
-        }
-      } else {
-&config_node($domain,$name,$node,$oldnode
-&fetch_node($domain,$name,$node
+config_node($newconf,$oldconf
+fetch_node($newconf,$oldconf
-#               Net::SSLeay::free ($tls) if ($tls); # Shut down TLS
-                close $socket;
@@ -950 +877 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        "RRA:AVERAGE:0.5:1:576", # resolution 5 minutes
-                        "RRA:MIN:0.5:1:576",
@@ -1111 +1032 @@
-                        "RRA:MIN:0.5:288:450",
-                        "RRA:MAX:0.5:288:450");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return 0 unless $socket;
-logger("Configured node: $name ($nodeconf_time sec)")
-
-
-
-sub fetch_node 
-domain,$name,$node
-odefetch_time = Time::HiRes::time
+  return 1
+
+
+
+
+newconf,$oldconf
+ame = munin_get_node_name ($newconf)
-    logger("[DEBUG] Fetching node: $name") if $DEBUG;
-ode->{client}
-my $servicefetch_time = Time::HiRes::time
-logger("[DEBUG] Fetching service: $name->$service") if $DEBUG
-next if (exists ($node->{client}->{$service}->{fetch_data}) and 
-        $node->{client}->{$service}->{fetch_data} == 0
-if (exists ($node->{client}->{$service}->{update}) and 
-        $node->{client}->{$service}->{update} ne "yes"
+ewconf
+next if ref ($newconf->{$service}) ne "HASH"
+next if $service =~ /^#%#/
+logger("[DEBUG] Fetching service: $service") if $DEBUG;
+next unless exists ($newconf->{$service}->{"graph_title"}
+unless (munin_get_bool ($newconf->{$service}, "update", "true"));
+next unless (munin_get_bool ($newconf->{$service}, "fetch_data", "true")
-        next if (@limit_services and !grep (/^$service$/, @limit_services));
-
-
-
-
+
+
+
+
+
+
-        write_socket_single ($socket, "fetch $realservname\n");
-        my @lines = &read_socket($socket);
@@ -1180 +1095 @@
-
-                $key = &sanitise_fieldname ($key, $fields);
-
-
-
-
-
-
+
+
-
-                    logger("[DEBUG] Updating $fname with $value") if $DEBUG;
@@ -1193 +1104 @@
-                    }
-                } else {
-domain -> $
+
-                }
-            } elsif (/(\w+)\.extinfo\s+(.+)/) {
-$config->{domain}->{$domain}->{node}->{$name}->{client}->{$service}->{$1.".extinfo"} = $2
+munin_set_var_loc ($newconf, [$service, $service, $1, "extinfo"], $2)
-            }
-        }
-
-
-
-
-
-
-
-
+
-    return 1;
-}
-
-sub use_old_config
-{
-    my $domain  = shift;
-    my $name    = shift;
-    my $oldnode = shift;
-
-    $config->{domain}->{$domain}->{node}->{$name} = $oldnode;
-    logger ("Attempting to use old configuration for $domain -> $name.");
-}
-
@@ -1283 +1177 @@
-}
-
+sub copy_node
+{
+    my $from = shift;
+    my $to   = shift;
+    
+    if (ref ($from) eq "HASH") {
+        foreach my $key (keys %$from) {
+            next if $key =~ /^#%#/;
+            $to->{$key} = $from->{$key};
+        }
+    } else {
+        $to = $from;
+    }
+    return $to;
+}
+
-1;
-
@@ -1372 +1282 @@
-=head1 COPYRIGHT
-
-(C)
+©
-
-This is free software; see the source for copying conditions. There is

people/jo/multilevel-groups-3/server/style.css

@@ -38 +38 @@
- }
-
+.service { 
+  font-size: x-small;
+  font-weight: bold;
+ }
+
-.center { 
-  text-align: center;