Changeset 167

Show
Ignore:
Timestamp:
05/09/04 23:11:16 (8 years ago)
Author:
jimmyo
Message:

New plugin (pm3users) and a bunch of patches from Jacques Caruso.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    • Property cvs2svn:cvs-rev changed from 1.77 to 1.78
    r166 r167  
    4141  * Fixed problem with sunos/memory, when memory was reported in gigabytes 
    4242    (SF#930964) 
     43  * New plugin (pm3users) and a bunch of patches from Jacques Caruso. 
    4344 
    4445munin (1.0.0pre3) 

  • trunk/munin-faq-base.html

    • Property cvs2svn:cvs-rev changed from 1.7 to 1.8
    r159 r167  
    226226</p> 
    227227 
     228<h3>Q: I don't like the bandwith usage graph, how to make it look like MRTG or Cricket graphs?</h3> 
     229<p> 
     230For interface eth0 on host foo.bar.example,<pre> 
     231 
     232        if_eth0.graph no 
     233 
     234        my_ifeth0.graph_args --base 1000 --lower-limit 0 
     235        my_ifeth0.graph_title Traffic on interface eth0 
     236        my_ifeth0.graph_order received=foo.bar.example:if_eth0.down sent=foo.bar.example:if_eth0.up 
     237        my_ifeth0.graph_vlabel Bits per second 
     238        my_ifeth0.received.cdef received,8,* 
     239        my_ifeth0.received.draw AREA 
     240        my_ifeth0.sent.cdef sent,8,* 
     241        my_ifeth0.sent.draw LINE1 
     242 
     243</pre> 
     244 
     245(Answer supplied by Jacques Caruso.) 
     246</p> 
     247 
    228248<h2>3. Client plugins</h2> 
    229249<h3>Q: What is the minimum requirements of a client plugin?</h3> 

  • trunk/node/node.d/postfix_mailqueue.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r167  
    66#  
    77# $Log$ 
     8# Revision 1.2  2004/05/09 21:11:15  jimmyo 
     9# New plugin (pm3users) and a bunch of patches from Jacques Caruso. 
     10# 
    811# Revision 1.1  2004/01/02 18:50:00  jimmyo 
    912# Renamed occurrances of lrrd -> munin 
    …… 
    6467cat <<EOF 
    6568deferred.value `(test -d deferred && find deferred -type f ) | wc -l` 
    66 active.value `(test -d active && find active -type f ) | wc -l`  
     69active.value `(test -d active && find active -type f ) | wc -l` 
    6770maildrop.value `(test -d maildrop && find maildrop -type f ) | wc -l` 
    6871incoming.value `(test -d incoming && find incoming -type f ) | wc -l` 

  • trunk/server/munin-graph.in

    • Property cvs2svn:cvs-rev changed from 1.7 to 1.8
    r138 r167  
    66# 
    77# $Log$ 
     8# Revision 1.8  2004/05/09 21:11:16  jimmyo 
     9# New plugin (pm3users) and a bunch of patches from Jacques Caruso. 
     10# 
    811# Revision 1.7  2004/04/28 21:32:26  jimmyo 
    912# Make "graph_scale no" affect y-axis as well as numbers below the graph (Deb#236834). 
    …… 
    129132    --host <host>       Limit graphed hosts to <host>. Multiple --host options 
    130133                        may be supplied. 
    131     --config <file>     Use <file> as configuration file. [/etc/munin/munin.conf] 
     134    --config <file>     Use <file> as configuration file. [@@CONFDIR@@/munin.conf] 
    132135    --[no]list-images   List the filenames of the images created.  
    133136                        [--nolist-images] 
    …… 
    234237            my $fnum = 0; 
    235238            my @rrd; 
    236                my @added = (); 
     239            my @added = (); 
    237240 
    238241            # See if we should skip it because of conf-options 
    …… 
    300303                } 
    301304            } 
    302             # Array to keep 'preprosess'ed fields. 
     305            # Array to keep 'preprocess'ed fields. 
    303306            my @rrd_preprocess = (); 
    304307            my $fieldnum = 0; 
    …… 
    411414            } 
    412415            @field_order = (@rrd_preprocess, @field_order); 
    413             print "DEBUG: DDrawing fields \"", join "\",\"", (@rrd_preprocess, @field_order), "\".\n" if $DEBUG; 
     416            print "DEBUG: Drawing fields \"", join "\",\"", (@rrd_preprocess, @field_order), "\".\n" if $DEBUG; 
    414417            for my $field (@field_order) { 
    415418                my $path = undef; 
    …… 
    431434            # Array to keep negative data until we're finished with positive. 
    432435            my @rrd_negatives = (); 
    433             my $filename = "unkown"; 
     436            my $filename = "unknown"; 
    434437            my %total_pos; 
    435438            my %total_neg; 
    …… 
    454457                    if (!defined ($node->{client}->{$service}->{$field.".label"})) 
    455458                    { 
    456                         print "DEBBUG: Setting label: $field\n" if $DEBUG; 
     459                        print "DEBUG: Setting label: $field\n" if $DEBUG; 
    457460                        $node->{client}->{$service}->{$field.".label"} = $field; 
    458461                    } 
    …… 
    856859=item B<< --config <file> >> 
    857860 
    858 Use E<lt>fileE<gt> as configuration file. [/etc/munin/munin.conf] 
     861Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf] 
    859862 
    860863=item B<< --[no]list-images >> 

  • trunk/server/munin-update.in

    • Property cvs2svn:cvs-rev changed from 1.7 to 1.8
    r117 r167  
    66# 
    77# $Log$ 
     8# Revision 1.8  2004/05/09 21:11:16  jimmyo 
     9# New plugin (pm3users) and a bunch of patches from Jacques Caruso. 
     10# 
    811# Revision 1.7  2004/02/10 19:27:02  jimmyo 
    912# Munin-update now properly ignores nodes with "update no". 
    …… 
    125128                        may be supplied. 
    126129    --config <file>     Use <file> as configuration file.  
    127                         [/etc/munin/munin.conf] 
     130                        [@@CONFDIR@@/munin.conf] 
    128131    --[no]debug         View debug messages. [--nodebug] 
    129132    --[no]fork          Don't fork one instance for each host. [--fork] 
    …… 
    572575  } 
    573576  my $nodeconf_time = Time::HiRes::time; 
    574   logger("Configurating node: $name") if $DEBUG; 
     577  logger("Configuring node: $name") if $DEBUG; 
    575578  my @services; 
    576579  eval { 
    …… 
    607610        $node->{client}->{$servname}->{realservname} = $service; 
    608611    } 
    609     logger("Configurating service: $name->$servname") if $DEBUG; 
     612    logger("Configuring service: $name->$servname") if $DEBUG; 
    610613    print $socket "config $service\n"; 
    611614    my @lines = read_socket($socket); 
    …… 
    678681    $serviceconf_time = sprintf ("%.2f",(Time::HiRes::time - $serviceconf_time)); 
    679682    print STATS "CS|$domain|$name|$servname|$serviceconf_time\n"; 
    680     logger ("Configurated service: $name -> $servname ($serviceconf_time sec)"); 
     683    logger ("Configured service: $name -> $servname ($serviceconf_time sec)"); 
    681684  } 
    682685  $nodeconf_time = sprintf ("%.2f",(Time::HiRes::time - $nodeconf_time)); 
    683686  print STATS "CN|$domain|$name|$nodeconf_time\n"; 
    684   logger("Configurated node: $name ($nodeconf_time sec)"); 
     687  logger("Configured node: $name ($nodeconf_time sec)"); 
    685688  return 1; 
    686689} 
    …… 
    785788=item B<< --config <file> >> 
    786789 
    787 Use E<lt>fileE<gt> as configuration file. [/etc/munin/munin.conf] 
     790Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf] 
    788791 
    789792=item B<< --help >>