Merge 6d7b0b2 into 1d5d60d

contrib/munin-node-debug

@@ -14,6 +14,7 @@ use warnings;
 use IO::Socket;
 use IO::Select;
 use Getopt::Long;
+use POSIX;
 
 # No buffering
 $| = 1;
@@ -149,7 +150,7 @@ while (my @ready = $select->can_read()) {
 			service($client);
 			# Exit the child
 			debug("[$$] Finished");
-			exit;
+			POSIX::_exit(0);
 		}
 	}
 }

lib/Munin/Master/UpdateWorker.pm

@@ -919,7 +919,7 @@ sub _create_rrd_file {
     );
 
     INFO "[INFO] RRDs::create @args";
-    RRDs::create @args;
+    RRDs::create @args unless $ENV{NO_UPDATE_RRD};
     if (my $ERROR = RRDs::error) {
         ERROR "[ERROR] Unable to create '$rrd_file': $ERROR";
     }
@@ -1069,14 +1069,14 @@ sub _update_rrd_file {
 		# https://lists.oetiker.ch/pipermail/rrd-users/2011-October/018196.html
 		for my $update_rrd_data (@update_rrd_data) {
 			DEBUG "RRDs::update($rrd_file, $update_rrd_data)";
-			RRDs::update($rrd_file, $update_rrd_data);
+			RRDs::update($rrd_file, $update_rrd_data) unless $ENV{NO_UPDATE_RRD};
 			# Break on error.
 			last if RRDs::error;
 		}
 	} else {
 		# normal vector-update the RRD
 		DEBUG "RRDs::update($rrd_file, @update_rrd_data)";
-		RRDs::update($rrd_file, @update_rrd_data);
+		RRDs::update($rrd_file, @update_rrd_data) unless $ENV{NO_UPDATE_RRD};
 	}
 
 	if (my $ERROR = RRDs::error) {

lib/Munin/Node/Server.pm

@@ -74,7 +74,10 @@ sub _add_services_to_nodes
     for my $service (@services) {
         DEBUG("Configuring $service\n") if $config->{DEBUG};
 
-        my @response = _run_service($service, 'config');
+        # Adding a 'cap' sub-argument to 'config' to signal 3.0+ plugins that
+        # they don't need to do any expensive stuff, they are only called for
+        # the initial node config
+        my @response = _run_service($service, [ 'config', 'cap', ]);
 
         if (!@response or grep(/# Timed out/, @response)) {
             DEBUG("Error running $service.  Dropping it.") if $config->{DEBUG};

lib/Munin/Node/Service.pm

@@ -262,7 +262,10 @@ sub exec_service
 
     Munin::Node::OS::set_umask();
 
-    my @command = grep defined, _service_command($self->{servicedir}, $service, $arg);
+    # Dereference $argument if ARRAYREF
+    my @arguments = ref($arg) ? @$arg : ( $arg );
+
+    my @command = grep defined, _service_command($self->{servicedir}, $service, @arguments);
     print STDERR "# About to run '", join (' ', @command), "'\n"
         if $config->{DEBUG};
 
@@ -275,7 +278,9 @@ sub exec_service
 # <http://munin-monitoring.org/wiki/plugin-conf.d>).
 sub _service_command
 {
-    my ($dir, $service, $argument) = @_;
+    my $dir = shift;
+    my $service = shift;
+    my @arguments = @_;
 
     my @run;
     my $sconf = $config->{sconf};
@@ -290,14 +295,14 @@ sub _service_command
             # though, since who will ever need to pass "%c" in a place
             # like that?
             if ($t =~ s/%c/$dir\/$service/g) {
-                push @run, ($t, $argument);
+                push @run, ($t, @arguments);
             } else {
                 push @run, ($t);
             }
         }
     }
     else {
-        @run = ("$dir/$service", $argument);
+        @run = ("$dir/$service", @arguments);
     }
 
     return @run;

lib/Munin/Plugin/SNMP.pm

@@ -531,6 +531,29 @@ sub get_by_regex
     return \%result;
 }
 
+=head2 handle_caps() - Emit relevant "config" output for node
+
+This emits the relevant config lines for the initial run of the node
+
+=cut
+sub handle_caps
+{
+	# XXX - Should handle this way better !
+	return unless ($ARGV[1] && $ARGV[0] eq "config" && $ARGV[1] eq "cap" );
+
+	# Only asking for "cap"
+	my ($host,undef,$version) = config_session();
+
+	# We are a virtualhost enabled plugin
+	print "host_name $host\n" unless $host eq 'localhost';
+
+	# We are a multigraph enabled plugin
+	print "multigraph dummy\n"; 
+
+	# Stopping here
+	exit(0);
+}
+
 1;
 
 =head1 TODO

plugins/node.d/snmp__if_multi

@@ -822,6 +822,8 @@ sub do_fetch {
 
 # ############################## MAIN ################################
 
+Munin::Plugin::SNMP::handle_caps();
+
 do_collect;
 do_preprocess;
 

plugins/node.d/snmp__uptime

@@ -72,6 +72,8 @@ GPLv2 or (at your option) any later version.
 use strict;
 use Munin::Plugin::SNMP;
 
+Munin::Plugin::SNMP::handle_caps();
+
 if (defined $ARGV[0] and $ARGV[0] eq "snmpconf") {
         print "require 1.3.6.1.2.1.1.3.0 [0-9]\n"; # Number
         exit 0;

script/munin-run

@@ -108,7 +108,7 @@ my $config = Munin::Node::Config->instance();
 sub main
 {
     my @original_argv = @ARGV;
-    my ($plugin, $arg) = parse_args();
+    my ($plugin, $args) = parse_args();
 
     # Loads the settings from munin-node.conf.
     # Ensures that, where options can be set both in the config and in
@@ -123,12 +123,12 @@ sub main
         return execute_plugin($plugin, $arg);
     } elsif (!check_systemd_run_permissions()) {
         print STDERR "# Skipping systemd properties simulation due to lack of permissions.\n" if $config->{DEBUG};
-        return execute_plugin($plugin, $arg);
+        return execute_plugin($plugin, $args);
     } else {
         my $systemd_version = get_systemd_version();
         if ((not defined $systemd_version) or ($systemd_version < $REQUIRED_SYSTEMD_VERSION)) {
             print STDERR "# Skipping systemd properties simulation due to required systemd version ($REQUIRED_SYSTEMD_VERSION)\n" if $config->{DEBUG};
-            return execute_plugin($plugin, $arg);
+            return execute_plugin($plugin, $args);
         } else {
             my @munin_node_hardening_flags;
             my $parse_flags_success = 0;
@@ -143,7 +143,7 @@ sub main
                 # Failed to retrieve systemd properties of munin-node service.
                 # Probable causes: systemd is not installed/enabled or the
                 # service unit does not exist.
-                return execute_plugin($plugin, $arg);
+                return execute_plugin($plugin, $args);
             }
         }
     }
@@ -329,7 +329,7 @@ sub parse_args
     my $sconfdir   = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
     my $sconffile;
 
-    my ($plugin, $arg);
+    my ($plugin, $args);
 
     print_usage_and_exit() unless GetOptions(
             "config=s"     => \$conffile,
@@ -348,10 +348,14 @@ sub parse_args
     print_usage_and_exit() unless $ARGV[0];
 
     # Detaint the plugin name
-    ($plugin) = ($ARGV[0] =~ m/^([-\w.:]+)$/) or die "# ERROR: Invalid plugin name '$ARGV[0].\n";
-    if ($ARGV[1]) {
-        ($arg) = ($ARGV[1] =~ m/^(\w+)$/)
-            or die "# ERROR: Invalid characters in argument '$ARGV[1]'.\n";
+    my $dirty_plugin = shift @ARGV;
+    ($plugin) = ($dirty_plugin =~ m/^([-\w.:]+)$/) or die "# ERROR: Invalid plugin name '$dirty_plugin.\n";
+
+    # Detaint the plugin args
+    for my $dirty_arg (@ARGV) {
+        my ($arg) = ($dirty_arg =~ m/^(\w+)$/)
+            or die "# ERROR: Invalid characters in argument '$dirty_arg'.\n";
+       push @$args, $arg;
     }
 
     # Detaint service directory.  FIXME: do more strict detainting?
@@ -372,7 +376,7 @@ sub parse_args
         paranoia   => $paranoia,
     });
 
-    return ($plugin, $arg);
+    return ($plugin, $args);
 }