Changeset 3375

Show
Ignore:
Timestamp:
02/25/10 02:07:09 (2 years ago)
Author:
steve.schnepp
Message:

r61@sandra (orig r3366): mha | 2010-02-18 13:04:25 +0100
Add proxy plugin, that makes it possible for a single Munin plugin
to connect to a separate munin-node (or other daemon speaking the
munin-node protocol) and fetch values from there.


This is primarily useful together with multigraph (which is why
multigraph is required for it) to be able to merge multiple sets
of node data into the same stream, for example when fetching
OS statistics directly with munin-plugins and appserver statistics
through an embedded munin-node in the application server.
r62@sandra (orig r3367): feiner.tom | 2010-02-19 22:08:32 +0100
Remove dependency on english error string returned from unlink, as it does not work with non-english locales
r63@sandra (orig r3368): feiner.tom | 2010-02-20 08:23:33 +0100
Correct documentation typo, fixes ticket #864
r64@sandra (orig r3369): feiner.tom | 2010-02-20 09:39:34 +0100
Fix deprecated tomcat plugins to work properly when only one connector is availabe, using XML:Simple ForceArray? & KeyAttr? options to make the xml consistent with one connector or more. This fixes debian bug http://bugs.debian.org/543523
r65@sandra (orig r3370): ssm | 2010-02-22 12:36:12 +0100
Fix shell->perl syntax in perl plugin
r66@sandra (orig r3371): ssm | 2010-02-22 12:36:13 +0100
apt plugin: update description with a pointer to apt_all
r68@sandra (orig r3373): knan | 2010-02-24 15:48:19 +0100
jmx/GCCount - fix negative counts on jvm restart (fixes #852)
r69@sandra (orig r3374): knan | 2010-02-24 15:55:49 +0100
ping_ - fix obvious typo (closes #854)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • people/snide/pre_1.5/master/lib/Munin/Master/ProcessManager.pm

    r3053 r3375  
    8686    my ($self) = @_; 
    8787 
    88     unlink $self->{socket_file} 
    89         or $! ne 'No such file or directory' && croak "unlink failed: $!"; 
     88    if ( -e $self->{socket_file} ) { 
     89            unlink $self->{socket_file} 
     90                or croak "unlink failed: $!"; 
     91    } 
     92 
    9093    socket my $sock, PF_UNIX, SOCK_STREAM, 0 
    9194        or croak "socket failed: $!"; 

  • people/snide/pre_1.5/plugins/javalib/org/munin/plugin/jmx/GCCount.java

    r3226 r3375  
    1818                        "CopyCount.label MinorCount\n" + 
    1919                        "CopyCount.type DERIVE\n" + 
     20                        "CopyCount.min 0\n" + 
    2021                        "CopyCount.info The total number of collections that have occurred. This method returns -1 if the collection count is undefined for this collector. \n" + 
    2122                        "MarkSweepCompactCount.label MajorCount\n" + 
    2223                        "MarkSweepCompactCount.type DERIVE\n" + 
     24                        "MarkSweepCompactCount.min 0\n" + 
    2325                        "MarkSweepCompactCount.info the total number of collections that have occurred. This method returns -1 if the collection count is undefined for this collector.\n" 
    2426                        );  

  • people/snide/pre_1.5/plugins/node.d.linux/apt.in

    r2314 r3375  
    4040 
    4141Link this plugin in @@CONFDIR@@/plugins/ and restart the munin-node. 
     42 
     43=head1 NOTES 
     44 
     45This plugin does not actually draw graphs; it is rather designed to 
     46generated warnings.  To get a graph showing the number of available 
     47packages, please see the "apt_all" plugin. 
    4248 
    4349=head1 MAGIC MARKERS 

  • people/snide/pre_1.5/plugins/node.d/mysql_.in

    r3352 r3375  
    4646MySQL. This ensures minimal inpact on the MySQL server. 
    4747 
    48 =item DBD::Mysql 
     48=item DBD::mysql 
    4949 
    5050=back 

  • people/snide/pre_1.5/plugins/node.d/ping_.in

    r2314 r3375  
    9191 
    9292 
    93 ${ping:-ping} ${ping_args:-'-c 2'} ${host} ${ping_args2} | perl -n -e 'print "ping.value ", $1 / 1000, "\n" if m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@; print "packetloss.value $1\n" if /(\d+)% packet loss/;' 
     93${PING:-ping} ${ping_args:-'-c 2'} ${host} ${ping_args2} | perl -n -e 'print "ping.value ", $1 / 1000, "\n" if m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@; print "packetloss.value $1\n" if /(\d+)% packet loss/;' 
    9494 

  • people/snide/pre_1.5/plugins/node.d/postfix_mailstats.in

    r3130 r3375  
    5252=cut 
    5353 
    54 my $statefile = "$ENV{MUNIN_PLUGSTATE}/munin-plugin-postfix_mailstats.state"; 
     54my $statefile = $ENV{'MUNIN_PLUGSTATE'} . "/munin-plugin-postfix_mailstats.state"; 
    5555my $pos; 
    5656my $delivered = 0; 

  • people/snide/pre_1.5/plugins/node.d/tomcat_access.in

    r2981 r3375  
    103103my $xs = new XML::Simple; 
    104104my $response = $ua->request(HTTP::Request->new('GET',$url)); 
    105 my $xml = $xs->XMLin($response->content); 
     105my %options = ( KeyAttr => { connector => 'name' }, ForceArray => 1 ); 
     106my $xml = $xs->XMLin($response->content, %options); 
    106107 
    107 if($xml->{'connector'}->{'http-'.$PORT}->{'requestInfo'}->{'requestCount'}) { 
    108     print "accesses.value " . $xml->{'connector'}->{'http-'.$PORT}->{'requestInfo'}->{'requestCount'} . "\n"; 
     108if($xml->{'connector'}->{'http-'.$PORT}->{'requestInfo'}->[0]->{'requestCount'}) { 
     109    print "accesses.value " . $xml->{'connector'}->{'http-'.$PORT}->{'requestInfo'}->[0]->{'requestCount'} . "\n"; 
    109110} else { 
    110111    print "accesses.value U\n"; 

  • people/snide/pre_1.5/plugins/node.d/tomcat_threads.in

    r2981 r3375  
    104104my $xs = new XML::Simple; 
    105105my $response = $ua->request(HTTP::Request->new('GET',$url)); 
    106 my $xml = $xs->XMLin($response->content); 
     106my %options = ( KeyAttr => { connector => 'name' }, ForceArray => 1 ); 
     107my $xml = $xs->XMLin($response->content, %options); 
    107108 
    108 if($xml->{'connector'}->{'http-'.$PORT}->{'threadInfo'}->{'currentThreadsBusy'} && 
    109     $xml->{'connector'}->{'http-'.$PORT}->{'threadInfo'}->{'currentThreadCount'}) { 
    110     print "busy.value " . $xml->{'connector'}->{'http-'.$PORT}->{'threadInfo'}->{'currentThreadsBusy'} . "\n"; 
     109if($xml->{'connector'}->{'http-'.$PORT}->{'threadInfo'}->[0]->{'currentThreadsBusy'} && 
     110    $xml->{'connector'}->{'http-'.$PORT}->{'threadInfo'}->[0]->{'currentThreadCount'}) { 
     111    print "busy.value " . $xml->{'connector'}->{'http-'.$PORT}->{'threadInfo'}->[0]->{'currentThreadsBusy'} . "\n"; 
    111112    print "idle.value " . 
    112           ($xml->{'connector'}->{'http-'.$PORT}->{'threadInfo'}->{'currentThreadCount'} - 
    113           $xml->{'connector'}->{'http-'.$PORT}->{'threadInfo'}->{'currentThreadsBusy'}) . "\n"; 
     113          ($xml->{'connector'}->{'http-'.$PORT}->{'threadInfo'}->[0]->{'currentThreadCount'} - 
     114          $xml->{'connector'}->{'http-'.$PORT}->{'threadInfo'}->[0]->{'currentThreadsBusy'}) . "\n"; 
    114115} else { 
    115116    print "busy.value U\n"; 

  • people/snide/pre_1.5/plugins/node.d/tomcat_volume.in

    r2981 r3375  
    123123my $xs = new XML::Simple; 
    124124my $response = $ua->request(HTTP::Request->new('GET',$url)); 
    125 my $xml = $xs->XMLin($response->content); 
     125my %options = ( KeyAttr => { connector => 'name' }, ForceArray => 1 ); 
     126my $xml = $xs->XMLin($response->content, %options); 
    126127 
    127 if($xml->{'connector'}->{'http-'.$PORT}->{'requestInfo'}->{'bytesSent'}) { 
    128     print "volume.value " . $xml->{'connector'}->{'http-'.$PORT}->{'requestInfo'}->{'bytesSent'} . "\n"; 
     128 
     129if($xml->{'connector'}->{'http-'.$PORT}->{'requestInfo'}->[0]->{'bytesSent'}) { 
     130    print "volume.value " . $xml->{'connector'}->{'http-'.$PORT}->{'requestInfo'}->[0]->{'bytesSent'} . "\n"; 
    129131} else { 
    130132    print "volume.value U\n";