Changeset 610

Timestamp:

05/01/05 19:32:49 (7 years ago)

Author:

jimmyo

Message:

Main: Tables in service-view now containt the correct "Type" when using data aliases.

Files:

• trunk/ChangeLog (modified) (1 diff, 1 prop)
• trunk/server/Munin.pm.in (modified) (4 diffs, 1 prop)
• trunk/server/munin-graph.in (modified) (4 diffs, 1 prop)
• trunk/server/munin-html.in (modified) (2 diffs, 1 prop)

trunk/ChangeLog

@@ -8 +8 @@
-  * Main: Bugfix with graphs using both "graph_sums" and data aliases.
-  * Main: Tables in service-view now sorted according to graph_order.
+  * Main: Tables in service-view now containt the correct "Type" when using
+    data aliases.
-  * Plugins: generic/sendmail_mail{stats,traffic} updated.
-  * Plugins: Made generic/samba more portable (fixes by Nicolas Stransky).

trunk/server/Munin.pm.in

@@ -23 +23 @@
-#
-# $Log$
+# Revision 1.44  2005/01/05 18:32:49  jimmyo
+# Main: Tables in service-view now containt the correct "Type" when using data aliases.
+#
-# Revision 1.43  2005/01/05 18:08:01  jimmyo
-# Main: Tables in service-view now sorted according to graph_order.
@@ -245 +248 @@
-           'munin_graph_column_headers',
-           'munin_get_max_label_length',
-
+
+
-           );
-
@@ -279 +283 @@
-my %legal_expanded = map { $_ => 1 } @legal;
-
+# Fields to copy when "aliasing" a field
+my @copy_fields    = ("label", "draw", "type", "rrdfile", "fieldname", "info"); 
+
+
-sub munin_trend {
-    my (@array) = @_;
@@ -1098 +1106 @@
-}
-
+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;
+    my $result  = "unknown";
+
+    if ($node->{client}->{$service}->{$field.".filename"})
+    {
+        $result = $node->{client}->{$service}->{$field.".filename"};
+    }
+    elsif ($path)
+    {
+        if (!defined ($node->{client}->{$service}->{$field.".label"}))
+        {
+            print "DEBUG: Setting label: $field\n" if $DEBUG;
+            $node->{client}->{$service}->{$field.".label"} = $field;
+        }
+
+        if ($path =~ /^\s*([^:;]+)[:;]([^:]+):([^:\.]+)[:\.]([^:\.]+)\s*$/)
+        {
+            $result = munin_get_filename ($config, $1, $2, $3, $4);
+            print "\nDEBUG1: Expanding $path...\n" if $DEBUG;
+            if (! defined $node->{client}->{$service}->{$field."label"})
+            {
+                for my $f (@copy_fields)
+                {
+                    if (not exists $node->{client}->{$service}->{"$field.$f"} and
+                            exists $config->{'domain'}->{$1}->{'node'}->{$2}->{'client'}->{$3}->{"$4.$f"})
+                    {
+                        $node->{client}->{$service}->{"$field.$f"} = $config->{'domain'}->{$1}->{'node'}->{$2}->{'client'}->{$3}->{"$4.$f"};
+                    }
+                }
+            }
+        }
+        elsif ($path =~ /^\s*([^:]+):([^:\.]+)[:\.]([^:\.]+)\s*$/)
+        {
+            print "\nDEBUG2: Expanding $path...\n" if $DEBUG;
+            $result = munin_get_filename ($config, $domain, $1, $2, $3);
+            for my $f (@copy_fields)
+            {
+                if (not exists $node->{client}->{$service}->{"$field.$f"} and
+                        exists $config->{'domain'}->{$domain}->{'node'}->{$1}->{'client'}->{$2}->{"$3.$f"})
+                {
+                    print "DEBUG: Copying $f...\n" if $DEBUG;
+                    $node->{client}->{$service}->{"$field.$f"} = $config->{'domain'}->{$domain}->{'node'}->{$1}->{'client'}->{$2}->{"$3.$f"};
+                }
+            }
+        }
+        elsif ($path =~ /^\s*([^:\.]+)[:\.]([^:\.]+)\s*$/)
+        {
+            print "\nDEBUG3: Expanding $path...\n" if $DEBUG;
+            $result = munin_get_filename ($config, $domain, $name, $1, $2);
+            for my $f (@copy_fields)
+            {
+                if (not exists $node->{client}->{$service}->{"$field.$f"} and
+                        exists $node->{client}->{$1}->{"$2.$f"})
+                {
+                    $node->{client}->{$service}->{"$field.$f"} = $node->{client}->{$1}->{"$2.$f"};
+                }
+            }
+        }
+        elsif ($path =~ /^\s*([^:\.]+)\s*$/)
+        {
+            print "\nDEBUG4: Expanding $path...\n" if $DEBUG;
+            $result = munin_get_filename ($config, $domain, $name, $service, $1);
+            for my $f (@copy_fields)
+            {
+                if (not exists $node->{client}->{$service}->{"$field.$f"} and
+                        exists $node->{client}->{$service}->{"$1.$f"})
+                {
+                    $node->{client}->{$service}->{"$field.$f"} = $node->{client}->{$service}->{"$1.$f"};
+                }
+            }
+        }
+    }
+    else
+    {
+        print "\nDEBUG5: Doing path...\n" if $DEBUG;
+        $result = munin_get_filename($config, $domain,$name,$service,$field);
+    }
+    return $result;
+}
+
-
-1;

trunk/server/munin-graph.in

@@ -21 +21 @@
-#
-# $Log$
+# Revision 1.51  2005/01/05 18:32:49  jimmyo
+# Main: Tables in service-view now containt the correct "Type" when using data aliases.
+#
-# Revision 1.50  2005/01/05 18:08:01  jimmyo
-# Main: Tables in service-view now sorted according to graph_order.
@@ -231 +234 @@
-my @limit_hosts = ();
-my @limit_services = ();
-
-# Fields to copy when "aliasing" a field
-my @copy_fields    = ("label", "draw", "type", "rrdfile", "fieldname", "info"); 
-
-# Force drawing of "graph no". 
@@ -715 +715 @@
-}
-
-sub get_rrd_filename {
-    my $node    = shift;
-    my $config  = shift;
-    my $domain  = shift;
-    my $name    = shift;
-    my $service = shift;
-    my $field   = shift;
-    my $path    = shift;
-    my $result  = "unknown";
-
-    if ($node->{client}->{$service}->{$field.".filename"})
-    {
-        $result = $node->{client}->{$service}->{$field.".filename"};
-    }
-    elsif ($path)
-    {
-        if (!defined ($node->{client}->{$service}->{$field.".label"}))
-        {
-            print "DEBUG: Setting label: $field\n" if $DEBUG;
-            $node->{client}->{$service}->{$field.".label"} = $field;
-        }
-
-        if ($path =~ /^\s*([^:;]+)[:;]([^:]+):([^:\.]+)[:\.]([^:\.]+)\s*$/)
-        {
-            $result = munin_get_filename ($config, $1, $2, $3, $4);
-            print "\nDEBUG1: Expanding $path...\n" if $DEBUG;
-            if (! defined $node->{client}->{$service}->{$field."label"})
-            {
-                for my $f (@copy_fields)
-                {
-                    if (not exists $node->{client}->{$service}->{"$field.$f"} and
-                            exists $config->{'domain'}->{$1}->{'node'}->{$2}->{'client'}->{$3}->{"$4.$f"})
-                    {
-                        $node->{client}->{$service}->{"$field.$f"} = $config->{'domain'}->{$1}->{'node'}->{$2}->{'client'}->{$3}->{"$4.$f"};
-                    }
-                }
-            }
-        }
-        elsif ($path =~ /^\s*([^:]+):([^:\.]+)[:\.]([^:\.]+)\s*$/)
-        {
-            print "\nDEBUG2: Expanding $path...\n" if $DEBUG;
-            $result = munin_get_filename ($config, $domain, $1, $2, $3);
-            for my $f (@copy_fields)
-            {
-                if (not exists $node->{client}->{$service}->{"$field.$f"} and
-                        exists $config->{'domain'}->{$domain}->{'node'}->{$1}->{'client'}->{$2}->{"$3.$f"})
-                {
-                    print "DEBUG: Copying $f...\n" if $DEBUG;
-                    $node->{client}->{$service}->{"$field.$f"} = $config->{'domain'}->{$domain}->{'node'}->{$1}->{'client'}->{$2}->{"$3.$f"};
-                }
-            }
-        }
-        elsif ($path =~ /^\s*([^:\.]+)[:\.]([^:\.]+)\s*$/)
-        {
-            print "\nDEBUG3: Expanding $path...\n" if $DEBUG;
-            $result = munin_get_filename ($config, $domain, $name, $1, $2);
-            for my $f (@copy_fields)
-            {
-                if (not exists $node->{client}->{$service}->{"$field.$f"} and
-                        exists $node->{client}->{$1}->{"$2.$f"})
-                {
-                    $node->{client}->{$service}->{"$field.$f"} = $node->{client}->{$1}->{"$2.$f"};
-                }
-            }
-        }
-        elsif ($path =~ /^\s*([^:\.]+)\s*$/)
-        {
-            print "\nDEBUG4: Expanding $path...\n" if $DEBUG;
-            $result = munin_get_filename ($config, $domain, $name, $service, $1);
-            for my $f (@copy_fields)
-            {
-                if (not exists $node->{client}->{$service}->{"$field.$f"} and
-                        exists $node->{client}->{$service}->{"$1.$f"})
-                {
-                    $node->{client}->{$service}->{"$field.$f"} = $node->{client}->{$service}->{"$1.$f"};
-                }
-            }
-        }
-    }
-    else
-    {
-        print "\nDEBUG5: Doing path...\n" if $DEBUG;
-        $result = munin_get_filename($config, $domain,$name,$service,$field);
-    }
-    return $result;
-}
-
-sub process_node {
-    my ($domain,$name,$node) = @_;
@@ -863 +776 @@
-                
-            # Getting name of rrd file
-
+munin_
-
-            my $update = RRDs::last ($filename);

trunk/server/munin-html.in

@@ -21 +21 @@
-#
-# $Log$
+# Revision 1.41  2005/01/05 18:32:49  jimmyo
+# Main: Tables in service-view now containt the correct "Type" when using data aliases.
+#
-# Revision 1.40  2005/01/05 18:08:01  jimmyo
-# Main: Tables in service-view now sorted according to graph_order.
@@ -423 +426 @@
-                foreach my $f (@{&munin_get_field_order ($config->{domain}->{$domain}->{node}->{$node}, $config, $domain, $node, $service)})
-                {
-
+
+
-                        next unless (&munin_draw_field ($config->{domain}->{$domain}->{node}->{$node}, $service, $f));
-
+
+
+
+
+
+
-
-                        my %field_info;