Changeset 3390

Show
Ignore:
Timestamp:
02/26/10 21:25:18 (5 months ago)
Author:
steve.schnepp
Message:

r73@sandra (orig r3378): feiner.tom | 2010-02-26 09:03:11 +0100
Add patch from munin ticket #828, to suppress "occasional" unknown states to avoid alerts. Thanks to Steve Wilson for the patch!
r74@sandra (orig r3379): feiner.tom | 2010-02-26 10:10:56 +0100
Moving tcp plugin to manual, and removing suggest marker, as this isnt a wildcard plugin
r75@sandra (orig r3380): feiner.tom | 2010-02-26 10:55:51 +0100
Update ChangeLog? and plugins.history for 1.4.4
r77@sandra (orig r3382): feiner.tom | 2010-02-26 12:44:24 +0100
Set RELEASE to 1.4.4
r78@sandra (orig r3383): feiner.tom | 2010-02-26 12:58:21 +0100
Revert trunk RELEASE to svn-trunk
r80@sandra (orig r3385): knan | 2010-02-26 13:11:47 +0100
snort_* - clean up autoconf

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • people/snide/pre_1.5/ChangeLog

    r3275 r3390  
    99* Way too much time since the last major stable release. 1.2.0 was 
    1010  uploaded to sourceforge in february 2005. 
     11 
     12 
     13munin 1.4.4, r3276,3379, 2010-2-26 
     14 
     15* Localization problem in 1.4.1 (closes #781) 
     16* Sort plugin configuration file order. This ensures some predictability  
     17  regarding where a configuration setting comes from when multiple files 
     18  specify the same configuration variables. 
     19  For details, see debian bug http://bugs.debian.org/564098 
     20* munin-cgi-graph*: cgi semaphore fix, hopefully cures #834 
     21* Munin/Master/GraphOld.pm sum+colour fix (closes #731) 
     22  plugin to connect to a separate munin-node (or other daemon speaking the 
     23  munin-node protocol) and fetch values from there. 
     24* munin-update: Fix config line continuation hadling 
     25* Add patch from munin ticket #828, to suppress "occasional" unknown states  
     26  to avoid alerts. Thanks to Steve Wilson for the patch! 
     27* proxy_plugin: New proxy plugin, that makes it possible for a single Munin 
     28* jmx/Uptime: decimal days, not integer - closes #815 
     29* nvidia_: fix suggest 
     30* linux/vserver*: fix autoconf exit codes 
     31* linux/ip_: RE fix to be able to match IPv6 addresses 
     32* linux/selinux_avcstat: New plugin from Lars Strand showing selinux stats  
     33  Taken from Muninexchange.  Thanks to Lars!  
     34* linux/lpar_cpu: A plugin to measure IBM PPC hardware virtualization logical 
     35  partition CPU usage (made for the platform once called OpenPower) 
     36* varnish_: backend_unhealthy is a DERIVE value, note that canonical upstream  
     37  is the varnish project 
     38* Add simfs" to linux df* plugins ignore list 
     39* linux/buddyinfo multigraph plugin by Gábor Gombás  
     40* Remediate patches from Gentoo that never came upstream.   
     41  Prevents possible output on stderr in plugin linux/iostat_ios and corrects  
     42  linux/fw_forwarded_local to handle a missing /proc/net/ip_conntrack 
     43  linux/fw_forwarded_local: need to dereference the _conntrack_file variable 
     44* linux/diskstats: Upstream update, closes #838 #835 #837 
     45* linux/ip_: Better matching of IPv6 addresses.  Use a single awk command  
     46  instead of a mix of awk and grep. 
     47* mysql_: fix graph_base error (Closes #840) Patch from Gábor Gombás 
     48* mysql_: plugin suggests wrong values (closes #857) 
     49* linux/selinux_avcstat - exit 0 on autoconf 
     50* linux/tcp: Add contributed plugin from Tim Small 
     51* linux/df_abs: multiple filesystem excludes do not work in df_abs 
     52  Thanks to Daniel Reichelt for the patch! 
     53* snort*: Add documentation and minor updates 
     54* multips_memory: correct printing out raw fieldname,  
     55  instead of clean_fieldname, documentation updates 
     56* linux/df_abs: Added configuration option to df_abs to Enable/Disable the  
     57  graph total (The default is on). Thanks to Daniel Reichelt for the patch,  
     58  submitted at http://bugs.debian.org/567895 - adapted, tested   
     59  and documented by Tom Feiner 
     60* snmp__if_multi: Add env.ifTypeOnly filtering, fix multiple buglets 
     61* mailman: Corrected incorrect use of $MUNIN_PLUGSTATE in mailman plugin 
     62* amavis: Change amavis mktempfile function to run with backticks instead of  
     63  $(command) as it doesnt work correctly piping to sed 
     64* exim_mailstats: exim_mailstats doesnt count Completed properly.  
     65  Thanks to Wakko Warner for noticing this in http://bugs.debian.org/569621 
     66* Deprecated tomcat plugins: Fix in to work properly when only one connector 
     67  is availabe http://bugs.debian.org/543523 
     68* postfix_mailstats: Fix shell->perl syntax in perl plugin 
     69* apt: update description with a pointer to apt_all 
     70* jmx/GCCount - fix negative counts on jvm restart (closes #852) 
     71* ping_: fix obvious typo (closes #854) 
    1172 
    1273 

  • people/snide/pre_1.5/common/lib/Munin/Common/Config.pm

    r3389 r3390  
    3737        "cdef_name", "graphable", "process", "realname", 
    3838        "onlynullcdef", "group_order", "pipe", "pipe_command", 
    39         "unknown_limit", "notify_countdown", "dropdownlimit", 
     39        "unknown_limit", "num_unknowns", "dropdownlimit", 
    4040        "max_graph_jobs", "munin_cgi_graph_jobs", 
    4141        "cgitmpdir", 

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

    r3264 r3390  
    331331            $crit->[0] ||= ""; 
    332332            $crit->[1] ||= ""; 
    333             $hash->{'worst'} = "UNKNOWN" if $hash->{"worst"} eq "OK"; 
    334             $hash->{'worstid'} = 3 if $hash->{"worstid"} == 0; 
    335             munin_set_var_loc(\%notes, [@$fpath, "state"], "unknown"); 
    336             munin_set_var_loc( 
    337                 \%notes, 
    338                 [@$fpath, "unknown"], ( 
    339                     defined $field->{"extinfo"} 
     333 
     334            my $state = "unknown"; 
     335            my $extinfo = defined $field->{"extinfo"} 
    340336                    ? "unknown: " . $field->{"extinfo"} 
    341                     : "Value is unknown." 
    342                 )); 
     337                    : "Value is unknown."; 
     338            my $num_unknowns; 
    343339 
    344340            if (   !defined $onfield 
    …… 
    347343                $hash->{'state_changed'} = 1; 
    348344            } 
    349         } 
     345            else { 
     346                $hash->{'state_changed'} = 0; 
     347            } 
     348 
     349            # First we'll need to check whether the user wants to ignore 
     350            # a few UNKNOWN values before actually changing the state to 
     351            # UNKNOWN. 
     352            if ($unknown_limit > 1) { 
     353                if (defined $onfield and defined $onfield->{"state"}) { 
     354                    if ($onfield->{"state"} ne "unknown") { 
     355                        if (defined $onfield->{"num_unknowns"}) { 
     356                            if ($onfield->{"num_unknowns"} < $unknown_limit) { 
     357                                # Don't change the state to UNKNOWN yet. 
     358                                $hash->{'state_changed'} = 0; 
     359                                $state = $onfield->{"state"}; 
     360                                $extinfo = $onfield->{$state}; 
     361 
     362                                # Increment the number of UNKNOWN values seen. 
     363                                $num_unknowns = $onfield->{"num_unknowns"} + 1; 
     364                            } 
     365                        } 
     366                        else { 
     367                            # Don't change the state to UNKNOWN yet. 
     368                            $hash->{'state_changed'} = 0; 
     369                            $state = $onfield->{"state"}; 
     370                            $extinfo = $onfield->{$state}; 
     371                             
     372                            # Start counting the number of consecutive UNKNOWN 
     373                            # values seen. 
     374                            $num_unknowns = 1; 
     375                        } 
     376                    } 
     377                } 
     378            } 
     379 
     380            if ($state eq "unknown") { 
     381                $hash->{'worst'} = "UNKNOWN" if $hash->{"worst"} eq "OK"; 
     382                $hash->{'worstid'} = 3 if $hash->{"worstid"} == 0; 
     383            } 
     384            elsif ($state eq "critical") { 
     385                $hash->{'worst'} = "CRITICAL"; 
     386                $hash->{'worstid'} = 2; 
     387            } 
     388            elsif ($state eq "warning") { 
     389                $hash->{'worst'} = "WARNING" if $hash->{"worst"} ne "CRITICAL"; 
     390                $hash->{'worstid'} = 1 if $hash->{"worstid"} != 2; 
     391            } 
     392 
     393            munin_set_var_loc(\%notes, [@$fpath, "state"], $state); 
     394            munin_set_var_loc(\%notes, [@$fpath, $state], $extinfo); 
     395            if (defined $num_unknowns) { 
     396                munin_set_var_loc(\%notes, [@$fpath, "num_unknowns"], 
     397                        $num_unknowns); 
     398            } 
     399        } 
     400 
    350401        elsif ((defined($crit->[0]) and $value < $crit->[0]) 
    351402            or (defined($crit->[1]) and $value > $crit->[1])) { 
    …… 
    423474    my $crit          = munin_get($hash, "critical",      undef); 
    424475    my $warn          = munin_get($hash, "warning",       undef); 
    425     my $unknown_limit = munin_get($hash, "unknown_limit", 1); 
     476    my $unknown_limit = munin_get($hash, "unknown_limit", 3); 
    426477 
    427478    my $name = munin_get_node_name($hash); 
    …… 
    455506    } 
    456507 
    457     # The merge of the unknown_limit implementation was somewhat botched.  Not tested. - janl 
    458508    if ($unknown_limit =~ /^\s*(\d+)\s*$/) { 
    459         $unknown_limit = $1 if defined $1; 
    460         DEBUG "[DEBUG] processing unknown_limit: $name -> $unknown_limit"; 
     509        $unknown_limit = $1 if defined $1; 
     510        if (defined $unknown_limit) { 
     511            if ($unknown_limit < 1) { 
     512                # Zero and negative numbers are not valid.   
     513                $unknown_limit = 1; 
     514            } 
     515        } 
     516        DEBUG "[DEBUG] processing unknown_limit: $name -> $unknown_limit"; 
    461517    } 
    462518 

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

    r3328 r3390  
    3535=head1 MAGIC MARKERS 
    3636 
    37  #%# family=auto 
    38  #%# capabilities=autoconf suggest 
     37 #%# family=manual 
     38 #%# capabilities=autoconf 
    3939 
    4040=cut 

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

    r3340 r3390  
    5757=cut 
    5858 
    59 EOF 
    60  
    6159 
    6260if [ -z $statsfile  ]; then 
    …… 
    6967        if [ -f $_target ]; then 
    7068                echo yes 
    71                 exit 0 
    7269        else 
    7370                echo "no ($_target not readable)" 
    74                 exit 1 
    7571        fi 
     72        exit 0 
    7673fi 
    7774 

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

    r3340 r3390  
    5757=cut 
    5858 
    59 EOF 
    60  
    6159 
    6260if [ -z $statsfile  ]; then 
    …… 
    6967        if [ -f $_target ]; then 
    7068                echo yes 
    71                 exit 0 
    7269        else 
    7370                echo "no ($_target not readable)" 
    74                 exit 1 
    7571        fi 
     72        exit 0 
    7673fi 
    7774 

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

    r3340 r3390  
    5757=cut 
    5858 
    59 EOF 
    60  
    6159 
    6260if [ -z $statsfile  ]; then 
    …… 
    6967        if [ -f $_target ]; then 
    7068                echo yes 
    71                 exit 0 
    7269        else 
    7370                echo "no ($_target not readable)" 
    74                 exit 1 
    7571        fi 
     72        exit 0 
    7673fi 
    7774 

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

    r3340 r3390  
    5858=cut 
    5959 
    60 EOF 
    61  
    6260 
    6361if [ -z $statsfile  ]; then 
    …… 
    7068        if [ -f $_target ]; then 
    7169                echo yes 
    72                 exit 0 
    7370        else 
    7471                echo "no ($_target not readable)" 
    75                 exit 1 
    7672        fi 
     73        exit 0 
    7774fi 
    7875 

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

    r3340 r3390  
    5858=cut 
    5959 
    60 EOF 
    61  
    6260 
    6361if [ -z $statsfile  ]; then 
    …… 
    7068        if [ -f $_target ]; then 
    7169                echo yes 
    72                 exit 0 
    7370        else 
    7471                echo "no ($_target not readable)" 
    75                 exit 1 
    7672        fi 
     73        exit 0 
    7774fi 
    7875 

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

    r3340 r3390  
    5757=cut 
    5858 
    59 EOF 
    60  
    6159 
    6260if [ -z $statsfile  ]; then 
    …… 
    6967        if [ -f $_target ]; then 
    7068                echo yes 
    71                 exit 0 
    7269        else 
    7370                echo "no ($_target not readable)" 
    74                 exit 1 
    7571        fi 
     72        exit 0 
    7673fi 
    7774 

  • people/snide/pre_1.5/plugins/plugins.history.in

    r3275 r3390  
    321321[1.4.3] 
    322322linux/diskstats 
     323 
     324[1.4.4] 
     325linux/selinux_avcstat.in 
     326linux/lpar_cpu.in 
     327linux/buddyinfo.in 
     328linux/tcp.in 
     329node.d/proxy_plugin.in 
     330