Changeset 3408

Timestamp:

03/10/10 14:22:28 (2 years ago)

Author:

ligne

Message:

merge r3406 (multigraph support for munin-node) into 1.4 maintenance branch.

Files:

• branches/1.4-stable/node/lib/Munin/Node/Server.pm (modified) (5 diffs)

branches/1.4-stable/node/lib/Munin/Node/Server.pm

@@ -24 +24 @@
-
-# Services that require the server to support multigraph plugins.
-@multigraph_services
+(@multigraph_services, @dirtyconfig_services)
-
-# Which hosts this node's services applies to. Typically this is the
@@ -90 +90 @@
-                || $config->{fqdn};
-
+        # hostname checks are case insensitive, so store everything in lowercase
+        $node = lc($node);
+
-        print STDERR "\tAdding to node $node\n" if $config->{DEBUG};
-        push @{$nodes{$node}}, $service;
@@ -95 +98 @@
-        # Note any plugins that require particular server capabilities.
-        if (grep /^multigraph\s+/, @response) {
-
-
+
-            push @multigraph_services, $service;
+        }
+        if (grep /^[A-Za-z0-9_]+\.value /, @response) {
+            # very dirty plugins -- they do a dirtyconfig even when
+            # "not allowed" by their environment.
+            print STDERR "\tAdding to dirty plugins\n" if $config->{DEBUG};
+            push @dirtyconfig_services, $service;
-        }
-    }
@@ -213 +221 @@
-    my ($session, $server_capabilities) = @_;
-
-
+
+
+
+
+
-    $session->{server_capabilities} = {
-            map { $_ => 1 } split(/ /, $server_capabilities)
-    };
+
+    $ENV{MUNIN_CAP_DIRTYCONFIG} = 1 if ($session->{server_capabilities}{dirtyconfig});
-
-    _net_write($session, sprintf("cap %s\n",join(" ", @node_cap)));
@@ -297 +311 @@
-
-    if (exists $nodes{$node}) {
-        # remove any plugins that require capabilities the server doesn't provide
-        my @services = @{$nodes{$node}};
+
+        # remove any plugins that require capabilities the master doesn't support
-        @services = Munin::Node::Utils::set_difference(\@services, \@multigraph_services)
-            unless $session->{server_capabilities}{multigraph};
+        @services = Munin::Node::Utils::set_difference(\@services, \@dirtyconfig_services)
+            unless $session->{server_capabilities}{dirtyconfig};
-
-        _net_write($session, join(" ", @services));