Changeset 2726

Timestamp:

10/27/09 13:17:17 (2 years ago)

Author:

janl

Message:

* Munin-update: Multigraph has come! (but we need it in munin-graph, munin-html and munin-limits too)
* Node/UpdateWorker/Update: Multiple log/error message enhancements

Multigraph adapt munin_master_plugin_fetch test

Files:

• trunk/master/lib/Munin/Master/Node.pm (modified) (13 diffs)
• trunk/master/lib/Munin/Master/Update.pm (modified) (1 diff)
• trunk/master/lib/Munin/Master/UpdateWorker.pm (modified) (16 diffs)
• trunk/master/t/munin_master_plugin_fetch.t (modified) (2 diffs)

trunk/master/lib/Munin/Master/Node.pm

@@ -13 +13 @@
-use Munin::Common::Timeout;
-use Munin::Common::TLSClient;
-use Munin::Master::Logger;
-use Data::Dumper;
-use Log::Log4perl qw( :easy );
@@ -69 +68 @@
-sub _extract_name_from_greeting {
-    my ($self, $greeting) = @_;
-
-
-
+
+
+
+
+
+
-    return $1;
-}
@@ -102 +104 @@
-        $self->{tls} = undef;
-        if ($tls_requirement eq "paranoid" or $tls_requirement eq "enabled") {
-            croak("[ERROR] Could not establish TLS connection to '$self->{address}'. Skipping.")
+           die "[ERROR] Could not establish TLS connection to '$self->{address}'. Skipping.\n"
-        }
-    }
@@ -141 +143 @@
-
-
-service
+plugin
-    my ($self) = @_;
-
@@ -148 +150 @@
-        : $self->{host};
-
-
+
+
+
-
-    $self->_node_write_single("list $host\n");
@@ -154 +158 @@
-
-    if (not $list) {
-logger("[WARNING] Config node $self->{host} listed no services for $host")
+WARN "[WARNING] Config node $self->{host} listed no services for $host"
-    }
-
@@ -164 +168 @@
-    my ($self, $service, @lines) = @_;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    for my $line (@lines) {
-
-
+
+
+
+
+
+
+
-        next unless $line;
-        next if $line =~ /^\#/;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            my ($ds_name, $ds_var, $ds_val) = ($1, $2, $3);
-            $ds_name = $self->_sanitise_fieldname($ds_name);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -215 +261 @@
-
-sub _validate_data_sources {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    for my $line (@lines) {
-
-
+
+
+
+
+
+
+
+
+
-        next unless $line;
-        next if $line =~ /^\#/;
-
-
+
+
+
+
+
+
+
+
+
+
+
-            my ($data_source, $value, $when) = ($1, $2, 'N');
-
@@ -248 +321 @@
-            }
-
-
+
+
-        }
-        else {
-croak "Protocol exception: while fetching '$service': unrecogniced line '$line'";
+die "[ERROR] Protocol exception while fetching '$service' from $nodedesignation: unrecogniced line '$line'"
-        }
-    }
-
-    return %values;
+}
+
+
+sub fetch_service_data {
+    my ($self, $plugin) = @_;
+
+    $self->_node_write_single("fetch $plugin\n");
+    my @lines = $self->_node_read();
+
+    return $self->parse_service_data($plugin,@lines);
-}
-
@@ -276 +360 @@
-    my ($self, $text) = @_;
-
-logger("[DEBUG] Writing to socket: \"$text\".") if $config->{debug}
+DEBUG "[DEBUG] Writing to socket: \"$text\"."
-    my $timed_out = !do_with_timeout($self->{io_timeout}, sub {
-        if ($self->{tls} && $self->{tls}->session_started()) {
@@ -287 +371 @@
-    });
-    if ($timed_out) {
-logger("[WARNING] Socket write timed out\n")
+WARN "[WARNING] Socket write timed out to ".$self->{host}."\n"
-        return;
-    }
@@ -308 +392 @@
-    });
-    if ($timed_out) {
-logger("[WARNING] Socket read timed out\n")
+WARN "[WARNING] Socket read timed out to ".$self->{host}."\n"
-        return;
-    }
-logger("[DEBUG] Reading from socket: \"$res\".") if $config->{debug}
+DEBUG "[DEBUG] Reading from socket to ".$self->{host}.": \"$res\"."
-    return $res;
-}
@@ -332 +416 @@
-    });
-    if ($timed_out) {
-logger ("[WARNING] Socket read timed out: $@\n")
+WARN "[WARNING] Socket read timed out to ".$self->{host}.": $@\n"
-        return;
-    }
-logger ("[DEBUG] Reading from socket: \"".(join ("\\n",@array))."\".") if $config->{debug}
+DEBUG "[DEBUG] Reading from socket: \"".(join ("\\n",@array))."\"."
-    return @array;
-}

trunk/master/lib/Munin/Master/Update.pm

@@ -259 +259 @@
-    print $io "version $Munin::Common::Defaults::MUNIN_VERSION\n";
-    for my $host (keys %{$self->{service_configs}}) {
-
-$service}{global
+{data_source}
+global}{$service
-                print $io "$host:$service.$attr->[0] $attr->[1]\n";
-            }
-$service}{data_sour
-$service}{data_sour
-$service}{data_sour
+data_source}{$servi
+data_source}{$servi
+data_source}{$servi
-                }
-            }

trunk/master/lib/Munin/Master/UpdateWorker.pm

@@ -2 +2 @@
-use base qw(Munin::Master::Worker);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-use warnings;
@@ -9 +31 @@
-use Carp;
-use English qw(-no_match_vars);
+use Log::Log4perl qw( :easy );
+
-use File::Basename;
-use File::Path;
-use File::Spec;
-use Munin::Master::Config;
-use Munin::Master::Logger;
-use Munin::Master::Node;
-use Munin::Master::Utils;
@@ -40 +63 @@
-    my $update_time = Time::HiRes::time;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    $self->{node}->do_in_session(sub {
-        $self->{node}->negotiate_capabilities();
-        # Note: A multigraph plugin can present multiple services.
-
-
+
-
-        for my $plugin (@plugins) {
@@ -63 +95 @@
-            my %service_config = $self->uw_fetch_service_config($plugin);
-            unless (%service_config) {
-logger("[WARNING] Service $plugin returned no config")
+WARN "[WARNING] Service $plugin on $nodedesignation returned no config"
-                next;
-            }
-
-            $self->_compare_and_act_on_config_changes($plugin,
-                                                      \%service_config);
-
-            my %service_data = eval {
@@ -74 +103 @@
-            };
-            if ($EVAL_ERROR) {
-
+
+
-                next;
-            }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -96 +147 @@
-sub uw_fetch_service_config {
-    # not sure why fetch_service_config needs eval and fetch_service_data
-.10.
+-10-
-    my ($self, $plugin) = @_;
-
@@ -105 +156 @@
-        # FIX Report failed service so that we can use the old service
-        # config.
-
+
+
-        return;
-    }
-
+    # FIX for nested services
-    if ($self->{host}{service_config} && $self->{host}{service_config}{$plugin}) {
-        %service_config
@@ -119 +172 @@
-
-sub _compare_and_act_on_config_changes {
-service, $
+nested_
-
-    # Kjellm: Why do we need to tune RRD files after upgrade?
-    # Shouldn't we create a upgrade script or something instead?
-    #
-
+
+
-
-    my $just_upgraded = 0;
@@ -136 +190 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -215 +280 @@
-                                                 $old_ds_config);
-
+    my $hostspec = $self->{node}{hostname}.'/'.$self->{node}{address}.':'.
+        $self->{node}{port};
+
-    if ($rrd_file ne $old_rrd_file) {
-        if (-f $old_rrd_file and -f $rrd_file) {
-            my $host = $self->{host}{host_name};
-logger("[WARNING]: $host $service $data_source config change
-                   . " suggests moving '$old_rrd_file' to '$rrd_file' but
-                   . " both exist; manually merge the data or remove
-   . " whichever file you care less about.\n")
-        
+WARN "[WARNING]: $hostspec $service $data_source config change 
+               . "suggests moving '$old_rrd_file' to '$rrd_file' 
+               . "but both exist; manually merge the data 
+. "or remove whichever file you care less about.\n"
+       
-        } elsif (-f $old_rrd_file) {
-logger(
-")
+INFO 
+ on $hostspec "
-            unless (rename ($old_rrd_file, $rrd_file)) {
-logger (
-                        . " '$rrd_file': $!\n")
+ERROR 
+                   . " '$rrd_file' for $hostspec: $!\n"
-                return '';
-            }
@@ -251 +319 @@
-
-    for my $rrd_prop (qw(type max min)) {
-logger(
-               . " '$rrd_file' is '$ds_config->{$rrd_prop}'.\n")
+INFO 
+           . " '$rrd_file' is '$ds_config->{$rrd_prop}'.\n"
-        RRDs::tune($rrd_file, $tune_flags{$rrd_prop},
-                   "42:$ds_config->{$rrd_prop}");
-        if (my $tune_error = RRDs::error()) {
-logger(
-                   . " '$ds_config->{$rrd_prop}' failed.\n")
+ERROR 
+               . " '$ds_config->{$rrd_prop}' failed.\n"
-            $success = '';
-        }
@@ -267 +335 @@
-
-sub _update_rrd_files {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -334 +411 @@
-    } ($group, $file);
-        
-logger("[DEBUG] Made rrd filename: $group / $file\n") if $config->{debug}
+DEBUG "[DEBUG] Made rrd filename: $group / $file\n"
-
-    return File::Spec->catfile($config->{dbdir}, 
@@ -345 +422 @@
-    my ($self, $rrd_file, $service, $ds_name, $ds_config) = @_;
-
-logger("creating rrd-file for $service->$ds_name: '$rrd_file'")
+INFO "[INFO] creating rrd-file for $service->$ds_name: '$rrd_file'"
-    mkpath(dirname($rrd_file), {mode => oct(777)});
-    my @args = (
@@ -377 +454 @@
-    RRDs::create @args;
-    if (my $ERROR = RRDs::error) {
-logger("[ERROR] Unable to create '$rrd_file': $ERROR")
+ERROR "[ERROR] Unable to create '$rrd_file': $ERROR"
-    }
-}
@@ -403 +480 @@
-    }
-
-logger("[DEBUG] Updating $rrd_file with $value") if $config->{debug}
+DEBUG "[DEBUG] Updating $rrd_file with ".$ds_values->{when}.":$value"
-    RRDs::update($rrd_file, "$ds_values->{when}:$value");
-    if (my $ERROR = RRDs::error) {
-logger ("[ERROR] In RRD: unable to update $rrd_file: $ERROR")
+ERROR "[ERROR] In RRD: Error updating $rrd_file: $ERROR"
-    }
-}

trunk/master/t/munin_master_plugin_fetch.t

@@ -23 +23 @@
-
-# print Dumper \%answer;
+
+=comment
+
+Keep old correct answer for reference.
-
-my $fasit = {
@@ -55 +59 @@
-        };
-
+=cut
+
+my $fasit = {
+          'cpu' => {
+                     'irq' => {
+                                'when' => '1256305015',
+                                'value' => '2770'
+                              },
+                     'system' => {
+                                   'when' => 'N',
+                                   'value' => '66594'
+                                 },
+                     'softirq' => {
+                                    'when' => '1256305015',
+                                    'value' => '127'
+                                  },
+                     'user' => {
+                                 'when' => 'N',
+                                 'value' => '145923'
+                               },
+                     'iowait' => {
+                                   'when' => 'N',
+                                   'value' => '14375'
+                                 },
+                     'idle' => {
+                                 'when' => 'N',
+                                 'value' => '2245122'
+                               },
+                     'nice' => {
+                                 'when' => 'N',
+                                 'value' => '268'
+                               }
+                   }
+        };
+
-is_deeply(\%answer,$fasit,"Plugin fetch output");
-