Changeset 1503

Timestamp:

29/02/08 21:19:12 (4 years ago)

Author:

jo

Message:

Final fix for merge of multilevel-groups (I think).

Files:

• people/jo/multilevel-groups-3/server/Munin.pm.in (modified) (1 diff)
• people/jo/multilevel-groups-3/server/munin-graph.in (modified) (2 diffs)
• people/jo/multilevel-groups-3/server/munin-update.in (modified) (4 diffs)

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

@@ -308 +308 @@
-        } elsif ($line =~ /^\s*\[([^\]]*)]\s*$/) {
-            $prefix = $1;
-;
+
-                $prefix .= ":";
-            } elsif ($prefix =~ /^([^:;]+);$/) {

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

@@ -817 +817 @@
-        push (@rrd, "GPRINT:apostotal:MAX:$rrdformat" . $rrdscale . "\\j");
-    }
-            push(@complete,'-W', $watermark) if $RRDs::VERSION >= 1.2;
-
-    for my $time (keys %times) {
@@ -831 +830 @@
-                  '--font' ,'AXIS:7:@@LIBDIR@@/VeraMono.ttf');
-        }
+        push(@complete,'-W', $watermark) if $RRDs::VERSION >= 1.2;
-
-        # Do the header (title, vtitle, size, etc...)

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

@@ -443 +443 @@
-
-  # First we get lock...
-$newconf->{"address"}
+"/munin-".join('-',@{munin_get_node_loc($newconf)})."-".munin_get_node_name($newconf)
-    logger ("[ERROR] Could not get lock for \"$name\". Skipping node.");
-    if ($do_fork) { # Send the old config to the server before we die
@@ -528 +528 @@
-      }
-      alarm (0);
-"$config->{rundir}/munin-$domain-$name
+munin_get($newconf, "rundir")."/munin-".join('-',@{munin_get_node_loc($newconf)})."-".munin_get_node_name($newconf)."
-      exit;
-  }
@@ -547 +547 @@
-
-  }
-"$config->{rundir}/munin-$domain-$name
+munin_get($newconf, "rundir")."/munin-".join('-',@{munin_get_node_loc($newconf)})."-".munin_get_node_name($newconf)."
-}
-
@@ -880 +880 @@
-{
-    my ($newconf,$oldconf,$socket) = @_;
-    my ($domain,$name,$node,$oldnode,$socket) = @_;
-    my $clientdomain = read_socket_single ($socket);
-    my $fetchdomain;