Changeset 1297

Timestamp:

08/28/07 16:07:44 (4 years ago)

Author:

jo

Message:

Milestone 2 finished; munin-graph should now work properly with multilevel groups.

Files:

• people/jo/multilevel-groups/server/Munin.pm.in (modified) (4 diffs)
• people/jo/multilevel-groups/server/munin-graph.in (modified) (10 diffs)

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

@@ -60 +60 @@
-           'munin_copy_node_toloc',
-           'munin_get_separated_node',
-
+
+
-           );
-
@@ -573 +574 @@
-}
-
+# munin_get_node_partialpath: gets a node froma partial path
+# Parameters: 
+# - $hash: A ref to the "current" location in the hash tree
+# - $var: A path string with relative location (from the $hash).
+# Returns:
+# - Success: The node
+# - Failure: undef
+sub munin_get_node_partialpath
+{
+    my $hash = shift;
+    my $var  = shift;
+    my $ret  = undef;
+
+    return undef if !defined $hash or ref ($hash) ne "HASH";
+
+    my $root    = munin_get_root_node ($hash);
+    my $hashloc = munin_get_node_loc ($hash);
+    my $varloc  = undef;
+
+    if ($var =~ /^\s*([^:]+):(\S+)\s*$/) {
+        my ($leftstring, $rightstring) = ($1, $2);
+
+        my @leftarr = split (/;/, $leftstring);
+        my @rightarr = split (/\./, $rightstring);
+        push @$varloc, @leftarr, @rightarr
+    } elsif ($var =~ /^\s*([^;:\.]+)\s*$/) {
+        push @$varloc, $var;
+    } elsif ($var =~ /^\s*(.+)\.([^\.:;]+)$/) {
+        my ($leftstring, $rightstring) = ($1, $2);
+
+        my @leftarr = split (/;/, $leftstring);
+        my @rightarr = split (/\./, $rightstring);
+        push @$varloc, @leftarr, @rightarr;
+    } elsif ($var =~ /^\s*(\S+)\s*$/) {
+        my @leftarr = split (/;/, $1);
+        push @$varloc, @leftarr;
+    } else {
+        ::logger ("Error: munin_get_node_partialpath: Malformatted variable path \"$var\".");
+    }
+
+    # We've got both parts of the loc (varloc and hashloc) -- let's figure out 
+    # where they meet up.
+    do {
+        $ret = munin_get_node ($root, [@$hashloc, @$varloc]);
+    } while (!defined $ret and pop @$hashloc);
+
+    return $ret;
+}
+
-# munin_set_var_path: sets a variable in a hash
-# Parameters: 
@@ -1187 +1237 @@
-    my $name    = munin_get_node_name ($field);
-
+    # Bail out on bad input data
+    return undef if !defined $field or ref ($field) ne "HASH";
+
-    # If the field has a .filename setting, use it
-    return $result if $result = munin_get ($field, "filename");
@@ -1192 +1245 @@
-    # Handle custom paths (used in .sum, .stack, graph_order, et al)
-    if (defined $path and length $path) {
-
-
-
-
-
-
+
+
-        $result = munin_get_filename ($sourcenode);
-

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

@@ -319 +319 @@
-    my $fieldnum = 0;
-    for my $field (@$order) { # Search for 'specials'...
-
-
+
+
+
-            $field = $1;
-            munin_set_var_loc ($service, [$field, "graph"], "no");
@@ -326 +327 @@
-
-        $fieldnum++;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            my @spc_stack = ();
-            foreach my $pre (split (/\s+/, $tmp_field)) {
-                (my $name = $pre) =~ s/=.+//;
-                if (!@spc_stack) {
-->{$name}, ["draw"], munin_get ($service->{$field}, "draw
-->{$field}, [
+, [$name, "draw"], munin_get ($service->{$field}, "draw", "LINE2
+, [$field, 
-                } else {
-->{$name}, [
+, [$name, 
-                }
-                push (@spc_stack, $name);
@@ -344 +372 @@
-                push @$result, "$name.cdef";
-
-->{$name}, [
-->{$name}, [
+, [$name, 
+, [$name, 
-                if (munin_get ($service->{$field}, "cdef") and !munin_get_bool ($service->{$name}, "onlynullcdef", 0)) {
-print "NotOnlynullcdef ($field)...\n"
+logger ("NotOnlynullcdef ($field)...")
-                    $service->{$name}->{"cdef"} .= "," . $service->{$field}->{"cdef"};
-                    $service->{$name}->{"cdef"} =~ s/\b$field\b/$name/g;
-                } else {
-print "Onlynullcdef ($field)...\n"
-->{$name}, [
+logger ("Onlynullcdef ($field)...")
+, [$name, 
-                    push @$result, "$name.onlynullcdef";
-                }
-            }
-&
+
-            my @spc_stack = ();
-            my $last_name = "";
-print "DEBUG: Doing special_sum...\n"
+logger ("DEBUG: expand_specials ($tmp_field): Doing sum...")
-
-            if (@$order == 1 or (@$order == 2 and munin_get {$field, "negative", 0})) {
@@ -451 +479 @@
-
-    # See if we should skip the service
-next
+return
-
-    my $field_count = 0;
@@ -471 +499 @@
-
-    # Get max label length
-&
+
-
-    # Global headers makes the value tables easier to read no matter how
@@ -505 +533 @@
-    logger ("DEBUG: Treating fields \"" . join ("\",\"", @field_order) . "\".") if $DEBUG;
-    for my $fname (@field_order) {
-        my $field = munin_get_node ($service, [$fname]);
-        my $path     = undef;
+        my $field    = undef;
-
-        if ($fname =~ s/=(.+)//) {
-            $path = $1;
-        }
+        $field = munin_get_node ($service, [$fname]);
-
-        next if !process_field ($field);
-
+ [".munin_get_node_name($field)."]
-
-        my $fielddraw = munin_get ($field, "draw", "LINE2");
@@ -794 +823 @@
-        RRDs::graph (@complete);
-        if (my $ERROR = RRDs::error) {
-$filename
+". munin_get_picture_filename ($service, $time) . "
-        } elsif ($list_images) {
-            # Command-line option to list images created
@@ -876 +905 @@
-
-            if (my $ERROR = RRDs::error) {
-$filename
+". munin_get_picture_filename ($service, $time) . "
-            } elsif ($list_images) {
-                # Command-line option to list images created
@@ -888 +917 @@
-    print STATS "GS|$service_time\n" unless $skip_stats;
-
+    print "Final look of service subtree: ", Dumper (munin_get_separated_node ($service)), "\n\n";
-    foreach (@added) {
-        delete $service->{$_} if exists $service->{$_};
@@ -914 +944 @@
-sub skip_service {
-    my $service = shift;
+    my $sname   = munin_get_node_name ($service);
+
+    # Skip if we've limited services with cli options
+    return 1 if (@limit_services and !grep /^$sname$/, @limit_services);
-
-    # Always graph if --force is present