Changeset 94

Show
Ignore:
Timestamp:
02/03/04 18:17:25 (8 years ago)
Author:
jimmyo
Message:

Generic/apache-plugins have been modified to properly to report the correct autoconf value. Also, bugfixes in _processes and _volume.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    • Property cvs2svn:cvs-rev changed from 1.38 to 1.39
    r92 r94  
    1313  * Fixed bug in munin-graph where it caused a flood of cron-mail. 
    1414  * Linux/iostat now shows only disks also on machines without devfs. 
     15  * Generic/apache-plugins have been modified to properly to report the 
     16    correct autoconf value. Also, bugfixes in _processes and _volume. 
    1517 
    1618munin (1.0.0pre2) 

  • trunk/node/node.d/apache_accesses.in

    • Property cvs2svn:cvs-rev changed from 1.2 to 1.3
    r34 r94  
    77#       - Needs access to http://localhost/server-status?auto (or modify the 
    88#         address for another host). See your apache documentation on how to 
    9 #         set up this url in your httpd.conf. 
     9#         set up this url in your httpd.conf. Apache needs ExtendedStatus 
     10#         enabled for this plugin to work 
    1011# 
    1112# Tip: To see if it's already set up correctly, just run this plugin 
    …… 
    2425# 
    2526# $Log$ 
     27# Revision 1.3  2004/02/03 17:17:25  jimmyo 
     28# Generic/apache-plugins have been modified to properly to report the correct autoconf value. Also, bugfixes in _processes and _volume. 
     29# 
    2630# Revision 1.2  2004/01/29 18:47:30  jimmyo 
    2731# Made plugins apache_* compatible with older versions of LWP::UserAgent (SF#881411). 
    …… 
    6973                my $url = sprintf $URL, $port; 
    7074                my $response = $ua->request(HTTP::Request->new('GET',$url)); 
    71                 push @badports, $port unless $response->is_success and $response->content =~ /IdleServers/; 
     75                push @badports, $port unless $response->is_success and $response->content =~ /^Total Accesses:/; 
    7276        } 
    7377        if (@badports) { 
    74                 print "no (no apache server-status on ports @badports)\n"; 
     78                print "no (no apache server-status or ExtendedStatus missing on ports @badports)\n"; 
    7579                exit 1; 
    7680        } else { 

  • trunk/node/node.d/apache_processes.in

    • Property cvs2svn:cvs-rev changed from 1.3 to 1.4
    r34 r94  
    2424# 
    2525# $Log$ 
     26# Revision 1.4  2004/02/03 17:17:25  jimmyo 
     27# Generic/apache-plugins have been modified to properly to report the correct autoconf value. Also, bugfixes in _processes and _volume. 
     28# 
    2629# Revision 1.3  2004/01/29 18:47:30  jimmyo 
    2730# Made plugins apache_* compatible with older versions of LWP::UserAgent (SF#881411). 
    …… 
    7376                my $url = sprintf $URL, $port; 
    7477                my $response = $ua->request(HTTP::Request->new('GET',$url)); 
    75                 push @badports, $port unless $response->is_success and $response->content =~ /IdleServe 
    76 rs/; 
     78                push @badports, $port unless $response->is_success and $response->content =~ /Idle(?:Servers|Workers)/; 
    7779        } 
    7880 
    …… 
    120122    my $url = sprintf $URL, $port; 
    121123    my $response = $ua->request(HTTP::Request->new('GET',$url)); 
    122     if ($response->content =~ /^BusyServers:\s+(.+)$/im) { 
     124    if ($response->content =~ /^Busy(?:Servers|Workers):\s+(.+)$/im) { 
    123125            print "busy$port.value $1\n"; 
    124126    } else { 
    125127            print "busy$port.value U\n"; 
    126128    } 
    127     if ($response->content =~ /^IdleServers:\s+(.+)$/im) { 
     129    if ($response->content =~ /^Idle(?:Servers|Workers):\s+(.+)$/im) { 
    128130            print "idle$port.value $1\n"; 
    129131    } else { 

  • trunk/node/node.d/apache_volume.in

    • Property cvs2svn:cvs-rev changed from 1.2 to 1.3
    r34 r94  
    77#       - Needs access to http://localhost/server-status?auto (or modify the 
    88#         address for another host). See your apache documentation on how to 
    9 #         set up this url in your httpd.conf. 
     9#         set up this url in your httpd.conf. Apache needs ExtendedStatus 
     10#         enabled for this plugin to work. 
    1011# 
    1112# Tip: To see if it's already set up correctly, just run this plugin 
    …… 
    2425# 
    2526# $Log$ 
     27# Revision 1.3  2004/02/03 17:17:25  jimmyo 
     28# Generic/apache-plugins have been modified to properly to report the correct autoconf value. Also, bugfixes in _processes and _volume. 
     29# 
    2630# Revision 1.2  2004/01/29 18:47:30  jimmyo 
    2731# Made plugins apache_* compatible with older versions of LWP::UserAgent (SF#881411). 
    …… 
    6872                my $url = sprintf $URL, $port; 
    6973                my $response = $ua->request(HTTP::Request->new('GET',$url)); 
    70                 push @badports, $port unless $response->is_success and $response->content =~ /IdleServers/; 
     74                push @badports, $port unless $response->is_success and $response->content =~ /^Total Accesses:/; 
    7175        } 
    7276        if (@badports) { 
    73                 print "no (no apache server-status on ports @badports)\n"; 
     77                print "no (no apache server-status or ExtendedStatus missing on ports @badports)\n"; 
    7478                exit 1; 
    7579        } else { 
    …… 
    96100        my $url = sprintf $URL, $port; 
    97101        my $response = $ua->request(HTTP::Request->new('GET',$url)); 
    98         if ($response->content =~ /^Total Accesses:\s+(.+)$/im) { 
    99                 print "volume$port.value $1\n"; 
     102        if ($response->content =~ /^Total kBytes:\s+(.+)$/im) { 
     103                print "volume$port.value ", ($1*1024), "\n"; 
    100104        } else { 
    101105                print "volume$port.value U\n";