--- projects/cms/source/server/build/etc/system.conf	2001/03/02 00:47:54	1.14
+++ projects/cms/source/server/build/etc/system.conf	2001/03/05 04:21:20	1.21
@@ -5,26 +5,41 @@
 # configuration system has this file as its 
 # root of configuration
 #
-# $Author: ajm $
-# $Id: system.conf,v 1.14 2001/03/02 00:47:54 ajm Exp $
+# $Author: tdb $
+# $Id: system.conf,v 1.21 2001/03/05 04:21:20 tdb Exp $
 #
 ############################################################
 #### Configuration Files & Groups
 ############################################################
 
 # for computing machines
-group.computing=Host.raptor.ukc.ac.uk;Host.slate.ukc.ac.uk;Host.granite.ukc.ac.uk;
-config.rocks=rocks.conf
+group.computing=Host.129.12.4.*;
+config.computing=computing.conf
 
 # for library machines
-group.library=Host.killigrew.ukc.ac.uk;
+group.library=Host.129.12.58.*;
 config.library=library.conf
 
+# for SSB machines
+group.ssb=Host.stue*.ukc.ac.uk;
+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
 ############################################################
@@ -79,11 +94,12 @@ ClientInterface.listenPort=4510
 ############################################################
 
 # The default filter for a new host
-Host.filter=computingFilter
+Host.filter=computingFilter;
 
 # The default update times for a new host
 Host.UDPUpdateTime=10
 Host.TCPUpdateTime=60
+Host.AveragerUpdateTime=5
 
 # The services checks to run on a host
 Host.serviceChecksPackage=uk.ac.ukc.iscream.filter.plugins
@@ -91,11 +107,6 @@ Host.serviceChecks=HTTP;SMTP
 
 
 
-# The time interval at which the Queue's should be monitored
-Queue.MonitorInterval=15
-
-
-
 ############################################################
 #### Monitor Configuration
 ############################################################
@@ -105,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
 ############################################################
@@ -120,19 +141,35 @@ Alerter.PluginsPackage=uk.ac.ukc.iscream.client.alerte
 Alerter.Plugins=EMail;IRC;
 
 # EMail alerter configuration
-Alerter.EMail.level = 2
-Alerter.EMail.destList = dev@i-scream.org.uk
+Alerter.EMail.level = CAUTION
+Alerter.EMail.defaultDestList = 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 = 1
+Alerter.IRC.level = OK
 Alerter.IRC.IRCServer = killigrew.ukc.ac.uk
 Alerter.IRC.IRCPort = 6667
-Alerter.IRC.nick = iscreamBot
+Alerter.IRC.nickList = iscreamBot;_iscreamBot;i-screamBot
+Alerter.IRC.user = i-scream
+Alerter.IRC.comment = i-scream alerting bot
 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%
+Alerter.IRC.reconnectDelay = 30
+Alerter.IRC.startupNotice = i-scream alerting bot activated 
+Alerter.IRC.stopCommand = stop alerts
+Alerter.IRC.startCommand = start alerts
+Alerter.IRC.lastAlertCommand = last alert
+Alerter.IRC.joinCommand = join
+Alerter.IRC.nickChangeCommand = nick
+Alerter.IRC.statCommand = statistics
+Alerter.IRC.uptimeCommand = uptime
+Alerter.IRC.timeSinceLastAlertCommand = time since last alert
+Alerter.IRC.versionCommand = version
+Alerter.IRC.helpCommand = help
+Alerter.IRC.rejectMessage = sorry, I don't understand your request
 
-############################################################
\ No newline at end of file
+############################################################
+