--- projects/cms/source/server/build/etc/system.conf	2001/03/06 02:35:18	1.23
+++ projects/cms/source/server/build/etc/system.conf	2001/03/07 23:36:31	1.28
@@ -5,8 +5,8 @@
 # configuration system has this file as its 
 # root of configuration
 #
-# $Author: ajm $
-# $Id: system.conf,v 1.23 2001/03/06 02:35:18 ajm Exp $
+# $Author: tdb $
+# $Id: system.conf,v 1.28 2001/03/07 23:36:31 tdb Exp $
 #
 ############################################################
 #### Configuration Files & Groups
@@ -103,7 +103,7 @@ Host.AveragerUpdateTime=5
 
 # The services checks to run on a host
 Host.serviceChecksPackage=uk.ac.ukc.iscream.filter.plugins
-Host.serviceChecks=HTTP;SMTP
+Host.serviceChecks=HTTP;SMTP;POP3;SSH;FTP;IMAP;Telnet
 
 
 
@@ -113,8 +113,9 @@ Host.serviceChecks=HTTP;SMTP
 
 # the monitors to run
 Monitor.PluginsPackage=uk.ac.ukc.iscream.client.monitors
-Monitor.Plugins=CPU;Heartbeat
+Monitor.Plugins=CPU;Memory;Swap;Heartbeat;
 
+
 ## CPU monitor configuration
 # threshold values
 # 
@@ -130,6 +131,39 @@ Monitor.CPU.alertTimeout.WARNING=900
 Monitor.CPU.alertTimeout.CAUTION=1800
 Monitor.CPU.alertTimeout.CRITICAL=3600
 
+
+## Memory monitor configuration
+# threshold values
+# 
+# note: if the UPPER threshold is broken,
+# the alertTimeout values are halved.
+# This is to escalate the alert quicker.
+Monitor.Memory.threshold.LOWER=80
+Monitor.Memory.threshold.UPPER=90
+
+# timings of the alerts (in seconds)
+Monitor.Memory.alertTimeout.NOTICE=60
+Monitor.Memory.alertTimeout.WARNING=900
+Monitor.Memory.alertTimeout.CAUTION=1800
+Monitor.Memory.alertTimeout.CRITICAL=3600
+
+
+## Swap monitor configuration
+# threshold values
+# 
+# note: if the UPPER threshold is broken,
+# the alertTimeout values are halved.
+# This is to escalate the alert quicker.
+Monitor.Swap.threshold.LOWER=80
+Monitor.Swap.threshold.UPPER=90
+
+# timings of the alerts (in seconds)
+Monitor.Swap.alertTimeout.NOTICE=60
+Monitor.Swap.alertTimeout.WARNING=900
+Monitor.Swap.alertTimeout.CAUTION=1800
+Monitor.Swap.alertTimeout.CRITICAL=3600
+
+
 ## Heartbeat monitor configuration
 # threshold values
 # 
@@ -137,6 +171,8 @@ Monitor.CPU.alertTimeout.CRITICAL=3600
 # the alertTimeout values are halved.
 # This is to escalate the alert quicker.
 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