Changeset 700

Timestamp:

01/02/05 22:51:51 (7 years ago)

Author:

jimmyo

Message:

Added category_order, to complete the *_order options.

Files:

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

trunk/ChangeLog

@@ -4 +4 @@
-  * Main: Make munin-limits work properly with perl <5.8 (SF#1109039).
-  * Main: Bugfix in munin-cgi-graph with hostnames including - (SF#1111510).
+  * Main: Added category_order, to complete the *_order options.
-  * Main/Node: Added support for TLS.
-  * Plugin: linux/users now has proper hashbang.

trunk/munin-doc-base.html

@@ -279 +279 @@
-<dt>domain_order [domain1] [domain2] .... <dd>In which order the domains
-    should be listed, defaults to sorted. This is a top-level option.</dd>
+<dt>category_order_order [category1] [category2] .... <dd>In which order
+        the categories should be listed, defaults to sorted. This is a
+        node-level option.</dd>
+<dt>service_order_order [service1] [service2] .... <dd>In which order
+        the services should be listed, defaults to sorted. This is a
+        node-level option.</dd>
-
-<h3>munin-limits</h3>

trunk/server/Munin.pm.in

@@ -23 +23 @@
-#
-# $Log$
+# Revision 1.46  2005/02/01 21:51:50  jimmyo
+# Added category_order, to complete the *_order options.
+#
-# Revision 1.45  2005/01/10 20:48:58  jimmyo
-# Main/Node: Added support for TLS.
@@ -281 +284 @@
-        "text", "command", "contact", "contacts",  "max_messages", 
-        "always_send", "notify_alias", "line", "state", "graph_period",
-
+, "service_order", "category_order"
-    );
-

trunk/server/munin-html.in

@@ -21 +21 @@
-#
-# $Log$
+# Revision 1.43  2005/02/01 21:51:51  jimmyo
+# Added category_order, to complete the *_order options.
+#
-# Revision 1.42  2005/01/29 18:21:41  jimmyo
-# Bugfix in munin-cgi-graph with hostnames including - (SF#1111510).
@@ -331 +334 @@
-        my @services;
-        my @categories;
+        my %categories;
-        my %tmp_cats;
-        my @serviceorder;
@@ -499 +503 @@
-            $tmp{node} = $node;
-            $tmp{domain} = $domain;
-push @categories,
+$categories{ucfirst $key} =
-            $comparisons{$key}{$node} = \%tmp;
-        }
@@ -518 +522 @@
-            $tmp{node} = $node;
-            $tmp{domain} = $domain;
-push @categories,
+$categories{ucfirst $key} =
-            $comparisons{'other'}{$node} = \%tmp;
+        }
+        # Handle category_order
+        @categories = ();
+        if ($config->{domain}->{$domain}->{node}->{$node}->{category_order}) {
+            foreach my $cat (split /\s+/, $config->{domain}->{$domain}->{node}->{$node}->{category_order})
+            {
+                push @categories, $categories{ucfirst $cat};
+            }
+            foreach my $cat (sort keys %categories)
+            {
+                push @categories, $categories{$cat}
+                        unless (grep /^$cat$/, @categories);
+            }
+        } else {
+            @categories = map { $categories{$_} } sort keys %categories;
-        }
-        $nodetemplate->param(SERVICES => \@services,