--- projects/cms/source/server/build/etc/system.conf	2001/03/15 14:29:09	1.37
+++ projects/cms/source/server/build/etc/system.conf	2001/03/16 15:15:27	1.40
@@ -6,7 +6,7 @@
 # root of configuration
 #
 # $Author: tdb $
-# $Id: system.conf,v 1.37 2001/03/15 14:29:09 tdb Exp $
+# $Id: system.conf,v 1.40 2001/03/16 15:15:27 tdb Exp $
 #
 ############################################################
 #### Configuration Files & Groups
@@ -37,9 +37,12 @@ ConfigurationProxy.updateTime=60
 
 # The time interval at which the Queue's should be monitored
 Queue.MonitorInterval=15
+# The upper limit for a Queue
+Queue.SizeLimit=1000
+# The removal algorithm
+Queue.RemoveAlgorithm=FIRST
 
 
-
 ############################################################
 #### FilterManager configuration
 ############################################################
@@ -200,7 +203,10 @@ Monitor.Services.alertTimeout.WARNING=900
 Monitor.Services.alertTimeout.CAUTION=1800
 Monitor.Services.alertTimeout.CRITICAL=3600
 
+# Make sure we shut up eventually
+Monitor.Services.reachFINALcount=5
 
+
 ## Heartbeat monitor configuration
 # threshold values
 # 
@@ -211,7 +217,7 @@ Monitor.Heartbeat.checkPeriod=50
 # these are values in seconds from when the heartbeat
 # was *expected* to arrive (ie. last + hearbeat period)
 Monitor.Heartbeat.threshold.LOWER=120
-Monitor.Heartbeat.threshold.LOWER=300
+Monitor.Heartbeat.threshold.UPPER=300
 
 # timings of the alerts (in seconds)
 Monitor.Heartbeat.alertTimeout.NOTICE=60
@@ -251,13 +257,14 @@ Alerter.PluginsPackage=uk.org.iscream.client.alerters
 Alerter.Plugins=EMail;IRC;WebFeeder;
 
 # EMail alerter configuration
-Alerter.EMail.level = CAUTION
-Alerter.EMail.defaultDestList = dev@i-scream.org.uk
+Alerter.EMail.level = WARNING
+Alerter.EMail.destList = dev@i-scream.org.uk
 Alerter.EMail.sender = dev@i-scream.org.uk
 Alerter.EMail.smtpServer = mercury.ukc.ac.uk
 Alerter.EMail.subject = i-scream alert: %level% alert on %source% for %attributeName%
-Alerter.EMail.message = The i-scream distributed central monitoring system has\nraised a %level% alert for the host %source%.\n\nThe value for %attributeName% of %value% has exceeded the\n%threshold% threshold value of %thresholdValue%.\n\nThe next alert (should one occur) will be sent in %timeTillNextAlert%.
+Alerter.EMail.message = The i-scream distributed central monitoring system has\nraised a %level% alert for the host %source%.\n\nThe value for %attributeName% of %value% has exceeded the\n%threshold% threshold value of %thresholdValue%.\n\nThis alert was originally raised at %timeOfFirstAlert%,\nwhich was %timeSinceFirstAlert% ago.\n\nThe next alert (should one occur) will be sent in %timeTillNextAlert%.
 
+
 # IRC alerter configuration
 Alerter.IRC.level = OK
 Alerter.IRC.IRCServer = killigrew.ukc.ac.uk
@@ -291,11 +298,11 @@ WebFeeder.latestActive = true
 WebFeeder.alertActive = true
 
 # Check period in seconds (for cleaning stale/old alerts)
-WebFeeder.checkPeriod = 1800
+WebFeeder.checkPeriod = 900
 
 # Delete alerts older than this, in seconds.
 # Files are only check every WebFeeder.checkPeriod seconds.
-WebFeeder.alertDeleteOlderThan = 3600
+WebFeeder.alertDeleteOlderThan = 1800
 
 # Root Path
 WebFeeder.rootPath = /usr/local/proj/co600_10/webroot