[Mon-commit] mon CHANGES,1.2.2.4,1.2.2.5 mon,1.4.2.19,1.4.2.20

[Jim T. <tr...@us...>]

Update of /cvsroot/mon/mon
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30839

Modified Files:
      Tag: mon-1-0-0pre1
	CHANGES mon 
Log Message:
FL_ACKALERT and freespace.monitor Filesys::DiskFree

Index: CHANGES
===================================================================
RCS file: /cvsroot/mon/mon/CHANGES,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C2 -d -r1.2.2.4 -r1.2.2.5
*** CHANGES	9 Jan 2005 03:27:55 -0000	1.2.2.4
--- CHANGES	13 Dec 2006 16:06:36 -0000	1.2.2.5
***************
*** 1,4 ****
--- 1,13 ----
  $Id$
  
+ Changes between mon-1.0.0pre5 and mon-1.0.0pre6
+ Wed Dec 13 11:04:27 EST 2006 trockij
+ ----------------------------------------------
+ -added $FL_ACKALERT
+ 
+ -update to freespace.monitor to use Filesys::DiskFree rather than
+  Filesys::DiskSpace
+ 
+ 
  Changes between mon-1.0.0pre4 and mon-1.0.0pre5
  Tue Dec 14 17:22:52 EST 2004

Index: mon
===================================================================
RCS file: /cvsroot/mon/mon/mon,v
retrieving revision 1.4.2.19
retrieving revision 1.4.2.20
diff -C2 -d -r1.4.2.19 -r1.4.2.20
*** mon	28 Apr 2005 19:59:03 -0000	1.4.2.19
--- mon	13 Dec 2006 16:06:36 -0000	1.4.2.20
***************
*** 185,189 ****
  my ($FL_MONITOR, $FL_UPALERT,			# alert type flags
  	$FL_TRAP, $FL_TRAPTIMEOUT,
! 	$FL_STARTUPALERT, $FL_TEST);
  
  my $TRAP_PDU;
--- 185,189 ----
  my ($FL_MONITOR, $FL_UPALERT,			# alert type flags
  	$FL_TRAP, $FL_TRAPTIMEOUT,
! 	$FL_STARTUPALERT, $FL_TEST, $FL_ACKALERT);
  
  my $TRAP_PDU;
***************
*** 565,572 ****
  
  	#
! 	# skip upalerts not paired with down alerts
  	# disable by setting "no_comp_alerts" in period section
  	#
! 	if (!$pref->{"no_comp_alerts"} && ($flags & $FL_UPALERT) && !$pref->{"_alert_sent"})
  	{
  	    next;
--- 565,572 ----
  
  	#
! 	# skip upalerts/ackalerts not paired with down alerts
  	# disable by setting "no_comp_alerts" in period section
  	#
! 	if (!$pref->{"no_comp_alerts"} && ($flags & ($FL_UPALERT | $FL_ACKALERT)) && !$pref->{"_alert_sent"})
  	{
  	    next;
***************
*** 3015,3018 ****
--- 3015,3022 ----
  	     || (($tmnow - $sref->{"_first_failure"}) >= $sref->{"upalertafter"})))
  	{
+ 	    #
+ 	    # Save the last failing monitor's output for posterity
+ 	    #
+ 	    $sref->{"_upalertoutput"}= $sref->{"_last_output"};
  	    do_alert ($group, $service, $sref->{"_upalertoutput"}, 0, $FL_UPALERT);
  	}
***************
*** 4330,4333 ****
--- 4334,4338 ----
      $FL_STARTUPALERT = 16;
      $FL_TEST = 32;
+     $FL_ACKALERT = 64;
  
      #