--- projects/cms/source/server/build/etc/system.conf	2001/03/08 23:20:04	1.32
+++ projects/cms/source/server/build/etc/system.conf	2001/03/10 04:09:22	1.35
@@ -6,7 +6,7 @@
 # root of configuration
 #
 # $Author: tdb $
-# $Id: system.conf,v 1.32 2001/03/08 23:20:04 tdb Exp $
+# $Id: system.conf,v 1.35 2001/03/10 04:09:22 tdb Exp $
 #
 ############################################################
 #### Configuration Files & Groups
@@ -113,7 +113,7 @@ Host.serviceChecks=HTTP;SMTP;POP3;SSH;FTP;IMAP;Telnet
 
 # the monitors to run
 Monitor.PluginsPackage=uk.ac.ukc.iscream.client.monitors
-Monitor.Plugins=CPU;Memory;Swap;Heartbeat;WebFeeder;
+Monitor.Plugins=CPU;Disk;Memory;Swap;Services;Heartbeat;WebFeeder;
 
 
 ## CPU monitor configuration
@@ -162,6 +162,43 @@ Monitor.Swap.alertTimeout.NOTICE=60
 Monitor.Swap.alertTimeout.WARNING=900
 Monitor.Swap.alertTimeout.CAUTION=1800
 Monitor.Swap.alertTimeout.CRITICAL=3600
+
+
+## Disk monitor configuration
+# threshold values
+# 
+# note: if the UPPER threshold is broken,
+# the alertTimeout values are halved.
+# This is to escalate the alert quicker.
+Monitor.Disk.threshold.LOWER=80
+Monitor.Disk.threshold.UPPER=90
+
+# timings of the alerts (in seconds)
+Monitor.Disk.alertTimeout.NOTICE=60
+Monitor.Disk.alertTimeout.WARNING=900
+Monitor.Disk.alertTimeout.CAUTION=1800
+Monitor.Disk.alertTimeout.CRITICAL=3600
+
+
+## Services monitor configuration
+# threshold values
+# 
+# THE SERVICES MONITOR USES A HACK
+# WHEREBY IT USES THE SERVICE STATUS
+# AS THE THRESHOLD LEVEL.  THIS SHOULD
+# BE LOOKED AT!
+#
+# note: if the UPPER threshold is broken,
+# the alertTimeout values are halved.
+# This is to escalate the alert quicker.
+#Monitor.Services.threshold.LOWER=120
+#Monitor.Services.threshold.LOWER=300
+
+# timings of the alerts (in seconds)
+Monitor.Services.alertTimeout.NOTICE=60
+Monitor.Services.alertTimeout.WARNING=900
+Monitor.Services.alertTimeout.CAUTION=1800
+Monitor.Services.alertTimeout.CRITICAL=3600
 
 
 ## Heartbeat monitor configuration