Changeset 1344

Timestamp:

14/10/07 20:44:34 (4 years ago)

Author:

jo

Message:

Merged multilevel-groups branch into trunk changes (into multileve-groups-2 branch).

Files:

• people/jo/multilevel-groups-2/server/Munin.pm.in (modified) (20 diffs)
• people/jo/multilevel-groups-2/server/munin-graph.in (modified) (14 diffs)
• people/jo/multilevel-groups-2/server/munin-update.in (modified) (18 diffs)

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

@@ -24 +24 @@
-
-use Exporter;
+use Data::Dumper;
+
-@ISA = ('Exporter');
-@EXPORT = ('munin_trend', 
@@ -50 +52 @@
-           'munin_get_max_label_length',
-           'munin_get_field_order',
-
+
+
+
+
+
+
+
+
+
+
-           );
-
@@ -84 +95 @@
-        "version", "tls_certificate", "tls_private_key", "tls_pem", 
-        "tls_verify_certificate", "tls_verify_depth", "graph_data_size",
-
+
+
-    );
-
@@ -90 +102 @@
-
-# Fields to copy when "aliasing" a field
-copy_fields
+COPY_FIELDS
-
-
@@ -111 +123 @@
-}
-
+# 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 {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
@@ -219 +233 @@
-    my ($configfile,$overwrite) = @_;
-    for my $key (keys %$overwrite) {
+        next if $key =~ /^#%#/;
-        if (ref $overwrite->{$key}) {
-            &munin_overwrite($overwrite->{$key},$configfile->{$key});
@@ -234 +249 @@
-    $conf ||= $configfile;
-    if (! -r $conf and ! $missingok) {
-       
-       
+
+
-    }
-    if (open (CFG, $conf))
@@ -246 +261 @@
-
-    # Some important defaults before we return...
-/tmp/
-/var/lib/munin/
-/var/log/
-/etc/munin/templates/
+@@STATEDIR@@
+@@DBDIR@@
+@@LOGDIR@@
+@@CONFDIR@@/templates
-    $config->{'htmldir'}||= "@@HTMLDIR@@/";
+    $config->{'#%#parent'}= undef;
+    $config->{'#%#name'}= "root";
-    return ($config);
-}
@@ -257 +274 @@
-{
-    my $lines    = shift;
-undef
+{}
-    my $prefix   = "";
-    my $prevline = "";
@@ -264 +281 @@
-    {
-        chomp $line;
-
-
+
-        { 
-            next if ($line =~ /^#/);
@@ -297 +313 @@
-        {
-            $prefix = $1;
-;
+
-            {
-                $prefix .= ":";
-            }
-;
+
-            {
-                $prefix .= "";
-            }
-;
+
-            {
-                $prefix .= ".";
@@ -389 +405 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    my $hash = shift;
@@ -395 +538 @@
-    my $val  = shift;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -462 +668 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if ($outstring =~ /\\$/)
-            { # Backslash as last char has special meaning. Avoid it.
-re$a
+ath
-            } else {
-
-
-
-
-
+
+
+
+
+
+
-sub munin_writeconfig {
-    my ($datafilename,$data,$fh) = @_;
-#   my $datafile = new Config::General();
-#   $datafile->save_file($datafilename,$data);
-
-    if (!defined $fh)
@@ -528 +726 @@
-    print $fh "version $VERSION\n";
-    # Write datafile
-, ""
+
-    
-    if (defined $fh)
@@ -549 +747 @@
-}
-
+# 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;
-
@@ -602 +880 @@
-        $ans =~ /^enable$/i or
-        $ans =~ /^enabled$/i
-
-
-
-
-
+
+
+
-        $ans =~ /^false$/i or
-        $ans =~ /^off$/i or
-        $ans =~ /^disable$/i or
-        $ans =~ /^disabled$/i
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-}
@@ -670 +941 @@
-}
-
+# 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
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -856 +1156 @@
-}
-
+# 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);
-        }
-    } 
-
-
-
+
+
-    } 
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-    
@@ -920 +1221 @@
-}
-
+# 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-2/server/munin-graph.in

@@ -30 +30 @@
-use Getopt::Long;
-use Time::HiRes;
+use Data::Dumper qw(Dumper);
-
-my $graph_time= Time::HiRes::time;
@@ -185 +186 @@
-        );
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-$graph_time = sprintf ("%.2f",(Time::HiRes::time - $graph_time));
@@ -203 +208 @@
-close $log;
-
-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;
-    }
@@ -244 +231 @@
-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;
@@ -288 +261 @@
-
-    # Picture filename
-&munin_get_picture_filename ($config, $domain, $host, 
+munin_get_picture_filename (
-
-    # Title
-&get_title ($node, 
+get_title (
-
-    # When to start the graph
@@ -297 +270 @@
-
-    # 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;
@@ -317 +289 @@
-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;
@@ -365 +319 @@
-    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);
@@ -400 +372 @@
-                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";
@@ -445 +408 @@
-                push (@$preproc, "$name=$pre");
-            }
-
-
-
-
-
-
+
+
+
-                print "Oh bugger...($field)...\n" if $DEBUG;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -488 +437 @@
-sub single_value
-{
-    my $node    = shift;
-    my $config  = shift;
-    my $domain  = shift;
-    my $host    = shift;
-    my $service = shift;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -529 +462 @@
-
-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");
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            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
@@ -1076 +969 @@
-    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;
@@ -1089 +979 @@
-    }
-
-&set_cdef_name ($service, $$cfield_ref
+munin_set_var_loc ($service, [$$cfield_ref, "cdef_name"]
-    $$cfield_ref = $new_field;
-

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

@@ -33 +33 @@
-use POSIX ":sys_wait_h";
-use Storable qw(fd_retrieve nstore_fd);
+use Data::Dumper qw(Dumper);
-
-my $TIMEOUT = 240;
@@ -158 +159 @@
-my $bad_procs = 0;
-my $uaddr;
-
-
+
+if ($do_fork) 
-    # Set up socket
-    $uaddr =  sockaddr_un("$config->{rundir}/$serversocket");
@@ -171 +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
@@ -289 +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"))
@@ -330 +344 @@
-    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"));
-}
@@ -439 +404 @@
-sub change_min
-{
-
-
-
-
-
-
-
-
-
+
+
+
+
-    RRDs::tune ($file, "-i", "42:".(defined $val?$val:"U"));
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-  # Then we fork...
@@ -496 +430 @@
-      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
@@ -508 +442 @@
-
-  # 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;
-    }
@@ -533 +468 @@
-  my $socket;
-  
-&munin_get ($config, "local_address", undef, $domain, $node
+munin_get ($newconf, "local_address"
-  {
-
-
-
-
-
+
+
+
+
-  }
-  else
-  {
-
-
-
-
+
+
+
-  }
-  my $err = ($socket ? "" : $!);
@@ -555 +488 @@
-      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);
@@ -579 +509 @@
-      } 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: $!";
-"$config->{rundir}
+munin_get($newconf, "rundir")."
-                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;
@@ -606 +535 @@
-  {
-      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;
@@ -948 +877 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        "RRA:AVERAGE:0.5:1:576", # resolution 5 minutes
-                        "RRA:MIN:0.5:1:576",
@@ -1107 +1028 @@
-                        "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);
@@ -1176 +1091 @@
-
-                $key = &sanitise_fieldname ($key, $fields);
-
-
-
-
-
-
+
+
-
-                    logger("[DEBUG] Updating $fname with $value") if $DEBUG;
@@ -1189 +1100 @@
-                    }
-                } 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.");
-}
-
@@ -1279 +1173 @@
-}
-
+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;
-
@@ -1368 +1278 @@
-=head1 COPYRIGHT
-
-
+Â
-
-This is free software; see the source for copying conditions. There is