--- projects/cms/source/server/build/etc/system.conf	2001/03/03 15:29:12	1.15
+++ projects/cms/source/server/build/etc/system.conf	2001/03/04 02:45:14	1.16
@@ -5,8 +5,8 @@
 # configuration system has this file as its 
 # root of configuration
 #
-# $Author: tdb $
-# $Id: system.conf,v 1.15 2001/03/03 15:29:12 tdb Exp $
+# $Author: ajm $
+# $Id: system.conf,v 1.16 2001/03/04 02:45:14 ajm Exp $
 #
 ############################################################
 #### Configuration Files & Groups
@@ -27,8 +27,19 @@ config.ssb=ssb.conf
 # mySQL configuration
 config.mySQL=mySQL.conf
 
+############################################################
+#### Misc system-wide configuration
+############################################################
 
+# the time (in seconds) that checks should be made for
+# changes in configuration
+ConfigurationProxy.updateTime=60
 
+# The time interval at which the Queue's should be monitored
+Queue.MonitorInterval=15
+
+
+
 ############################################################
 #### FilterManager configuration
 ############################################################
@@ -83,7 +94,7 @@ ClientInterface.listenPort=4510
 ############################################################
 
 # The default filter for a new host
-Host.filter=computingFilter
+Host.filter=filter1
 
 # The default update times for a new host
 Host.UDPUpdateTime=10
@@ -96,11 +107,6 @@ Host.serviceChecks=HTTP;SMTP
 
 
 
-# The time interval at which the Queue's should be monitored
-Queue.MonitorInterval=15
-
-
-
 ############################################################
 #### Monitor Configuration
 ############################################################
@@ -110,12 +116,22 @@ Monitor.PluginsPackage=uk.ac.ukc.iscream.client.monito
 Monitor.Plugins=CPU;
 
 # CPU monitor configuration
-Monitor.CPU.level.1=90
-Monitor.CPU.level.2=95
-Monitor.CPU.level.3=100
+# threshold values
+# 
+# note: if the UPPER threshold is broken,
+# the alertTimeout values are halved.
+# This is to escalate the alert quicker.
+Monitor.CPU.threshold.LOWER=90
+Monitor.CPU.threshold.UPPER=99
 
+# timings of the alerts (in seconds)
+Monitor.CPU.alertTimeout.NOTICE=60
+Monitor.CPU.alertTimeout.WARNING=900
+Monitor.CPU.alertTimeout.CAUTION=1800
+Monitor.CPU.alertTimeout.CRITICAL=3600
 
 
+
 ############################################################
 #### Alerter Configuration
 ############################################################
@@ -125,19 +141,22 @@ Alerter.PluginsPackage=uk.ac.ukc.iscream.client.alerte
 Alerter.Plugins=EMail;IRC;
 
 # EMail alerter configuration
-Alerter.EMail.level = 2
+Alerter.EMail.level = CAUTION
 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 %level% alert on %source for %attributeName%
-Alerter.EMail.message = The i-scream distributed central monitoring system has\nraised a level %level% alert for the host %source%.\n\nThe value for %attributeName% of %value% has exceeded the\nthreshold value of %thresholdValue%.
+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%.
 
 # IRC alerter configuration
-Alerter.IRC.level = 0
+Alerter.IRC.level = OK
 Alerter.IRC.IRCServer = killigrew.ukc.ac.uk
+
 Alerter.IRC.IRCPort = 6667
 Alerter.IRC.nick = iscreamBot
 Alerter.IRC.channel = #i-scream
-Alerter.IRC.message = level %level%: %attributeName% on %source% has reached %value%
+Alerter.IRC.message = %level%: %attributeName% on %source% has passed %threshold%(%thresholdValue%) threshold with %value% - time till next alert (should one occur), %timeTillNextAlert%
+
+
 
 ############################################################