Changeset 1346

Timestamp:

10/22/07 21:31:01 (4 years ago)

Author:

jo

Message:

The overview template should now work with the new group format.

Files:

• people/jo/multilevel-groups-2/server/Munin.pm.in (modified) (8 diffs)
• people/jo/multilevel-groups-2/server/munin-html.in (modified) (3 diffs)
• people/jo/multilevel-groups-2/server/munin-overview.tmpl.in (modified) (1 diff)

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

@@ -54 +54 @@
-           'munin_get_field_order',
-           'munin_get_rrd_filename',
-           'munin_find_field',
-           'munin_get_node_name',
-           'munin_get_parent_name',
@@ -63 +62 @@
-           'munin_get_separated_node',
-           'munin_mkdir_p',
+           'munin_find_field',
-           'munin_get_parent',
+           'munin_get_children',
-           'munin_get_node_partialpath'
-           );
@@ -417 +418 @@
-# - Success: A ref to an array of the hash nodes containing $field.
-# - Failure: undef
-
-
+
-    my $hash  = shift;
-    my $field = shift;
@@ -434 +434 @@
-                push @$res, @{munin_find_field ($hash->{$key}, $field, $avoid)};
-            }
+        }
+    }
+
+    return $res;
+}
+
+# munin_get_children: Get all child hash nodes
+# Parameters: 
+# - $hash: A hash ref to the parent node
+# Returns:
+# - Success: A ref to an array of the child nodes
+# - Failure: undef
+sub munin_get_children {
+    my $hash  = shift;
+    my $res = [];
+
+    return undef if (ref ($hash) ne "HASH");
+
+    foreach my $key (keys %{$hash}) {
+        next if $key =~ /^#%#/;
+        if (defined $hash->{$key} and ref ($hash->{$key}) eq "HASH") {
+            push @$res, $hash->{$key};
-        }
-    }
@@ -796 +818 @@
-    my $loc     = munin_get_node_loc ($hash);
-    my $ret     = munin_get ($hash, 'htmldir');
+    my $plugin  = "index";
-
-    # Sanitise
@@ -803 +826 @@
-    @$loc = map { s/^\./_/g; $_ } @$loc;
-        
-
-
+
+
+
-
-    if (@$loc) { # The rest is used as directory names...
@@ -810 +834 @@
-    }
-
-node/$
+
-}
-
@@ -1110 +1134 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $state = $fres;
-                last;
-
-    elsif ($fres eq "warning")
-
+ elsif ($fres eq "warning") {
+       $state = $fres;
+} elsif ($fres eq "unknown" and $state eq "ok") 
-                $state = $fres;
-            }

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

@@ -188 +188 @@
-    my @graph_info;
-    my @field_info;
-
+      
-    my $pathnodes = get_path_nodes ($service);
-    my $peers     = get_peer_nodes ($service, lc munin_get ($service, "graph_category", "other"));
@@ -308 +308 @@
-    close FILE;
-}
+
+# Preparing the group tree...
+my $groups = get_group_tree ($config);
+if (defined $groups->{"name"} and $groups->{"name"} eq "root") {
+    $groups = $groups->{"groups"}; # root->groups
+}
+
+print Dumper ($groups);
+
+# Draw main index
+$template->param(GROUPS    => $groups,
+                 TIMESTAMP => $timestamp);
+my $filename = munin_get_html_filename ($config);
+open (FILE, ">$filename") or
+    die "Cannot open $filename for writing: $!";
+print FILE $template->output;
+close FILE;
-
-exit 0;
@@ -625 +642 @@
-}
-
+sub get_group_tree {
+    my $hash    = shift;
+    my $base    = shift || "";
+    my $graphs  = [];
+    my $groups  = [];
+    my $cattrav = {};
+    my $cats    = [];
+
+    foreach my $child (@{munin_get_children ($hash)}) {
+        if (defined $child->{"graph_title"}) {
+            push @$graphs, { "name" => munin_get_node_name ($child) };
+            $cattrav->{ lc munin_get ($child, "graph_category", "other") } = 1;
+        } elsif (ref ($child) eq "HASH") {
+            push @$groups, get_group_tree ($child, $base . munin_get_node_name ($child) . "/");
+        }
+    }
+
+    # We need the categories in another format.
+    @$cats = map { { "name" => $_, "url" => $base."index.html#".$_, "state_".lc munin_category_status ($hash, $limits, $_, 1) => 1 } } sort keys %$cattrav;
+
+    return { 
+        "name"        => munin_get_node_name ($hash), 
+        "url"         => $base . "index.html", 
+        "groups"      => $groups, 
+        "graphs"      => $graphs,
+        "categories"  => $cats,
+        "ngroups"     => scalar (@$groups),
+        "ngraphs"     => scalar (@$graphs),
+        "ncategories" => scalar (@$cats),
+    };
+}
+
-sub get_path_nodes {
-    my $hash = shift || return undef;

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

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