--- projects/cms/source/server/build/etc/system.conf	2003/02/23 12:45:21	1.70
+++ projects/cms/source/server/build/etc/system.conf	2003/03/09 21:49:12	1.74
@@ -10,7 +10,7 @@
 # setup, aswell as a some example configuration.
 #
 # $Author: tdb $
-# $Id: system.conf,v 1.70 2003/02/23 12:45:21 tdb Exp $
+# $Id: system.conf,v 1.74 2003/03/09 21:49:12 tdb Exp $
 #
 # http://www.i-scream.org.uk/
 #
@@ -73,7 +73,7 @@ ConfigurationProxy.updateTime=60
 # The internal Queue's can be monitored. This specifies
 # the interval, in seconds, at which their state should
 # be monitored.
-Queue.MonitorInterval=15
+Queue.MonitorInterval=300
 # The maximum size a Queue can be before items are
 # dropped when new ones arrive.
 Queue.SizeLimit=1000
@@ -114,10 +114,9 @@ FilterManager.ACL=DEFAULT:ALLOW
 #### Filter configuration
 ############################################################
 
-# A Filter accepts data from hosts on both a TCP port
-# and a UDP port. They are specified here.
+# A Filter accepts data from hosts on a UDP port. It is
+# specified here.
 Filter.UDPListenPort=4589
-Filter.TCPListenPort=4589
 
 # Filters contain plugins for checking the data passing
 # through them. This plugins do the job of "filtering".
@@ -125,7 +124,7 @@ Filter.TCPListenPort=4589
 # contained in.
 Filter.PluginsPackage=uk.org.iscream.cms.server.filter.plugins
 # And the names of the plugins to be loaded.
-Filter.Plugins=TypeChecker;EnforceEssentialData;SourceChecker;KeyChecker
+Filter.Plugins=TypeChecker;EnforceEssentialData;SourceChecker
 
 # The special filter known as the "Root Filter" needs
 # a name within the system.
@@ -137,22 +136,19 @@ RootFilter.name=root
 # filter - giving a tree structure.
 Filter.parentFilter=root
 
-# A Filter can accept data through UDP, TCP, or from
+# A Filter can accept data through UDP, or from
 # an upstream Filter (CORBA). These methods can be
 # individually turned of on a filter. The default
 # is to have them all on.
 # (comment or set to 0 to disable)
-Filter.ActivateTCPReader=1
 Filter.ActivateUDPReader=1
 Filter.ActivateCORBAReader=1
 
 # We can also specify Access Control Lists for the
-# TCP and UDP inputs of the Filters. One might want
-# something restrictive like this:
+# UDP input of the Filters. One might want something
+# restrictive like this:
 #
-# Filter.TCPACL=DEFAULT:DENY;*.example.com:ALLOW
 # Filter.UDPACL=DEFAULT:DENY;*.example.com:ALLOW
-Filter.TCPACL=DEFAULT:ALLOW
 Filter.UDPACL=DEFAULT:ALLOW
 
 # A Filter plugin called the SourceChecker verifies
@@ -163,14 +159,7 @@ Filter.UDPACL=DEFAULT:ALLOW
 # Filter.SourceCheckerPluginACL=DEFAULT:DENY;*.example.com:ALLOW
 Filter.SourceCheckerPluginACL=DEFAULT:ALLOW
 
-# Enforce that hosts use the key based authentication.
-# (comment or set to 0 to disable)
-Filter.EnforceHostAuth=1
 
-# Length of keys to use in authentication.
-Filter.KeyLength=15
-
-
 ############################################################
 #### Root filter interfaces configuration
 ############################################################
@@ -221,11 +210,15 @@ DBInterface.name=database
 # for all hosts to be 'filter1'. This can be a list.
 Host.filter=filter1;
 
-# Hosts send data every UDPUpdateTime, in seconds, and then
-# perform a heartbeat every TCPUpdateTime, in seconds.
-Host.UDPUpdateTime=10
-Host.TCPUpdateTime=60
+# Hosts send data every UDPUpdateTime, in seconds.
+Host.UDPUpdateTime=60
 
+# How long a hosts config is valid for (a TTL effectively)
+# after this time, in seconds, has passed a host should
+# consider it's configuration invalid and check for a new
+# configuration as soon as it can.
+Host.ConfigTTL=3600
+
 # We can run service checks on a host. The java package
 # which contains them is specified here.
 Host.serviceChecksPackage=uk.org.iscream.cms.server.filter.plugins
@@ -240,7 +233,8 @@ Host.serviceChecksPackage=uk.org.iscream.cms.server.fi
 Monitor.PluginsPackage=uk.org.iscream.cms.server.client.monitors
 # And which ones should be loaded.
 Monitor.Plugins=CPU;Load;Process;Disk;Memory;Swap;Services;\
-                Heartbeat;Queue;UserCount;WebFeeder;
+                Heartbeat;Queue;UserCount;WebFeeder;DiskIO;\
+                NetIO;Paging;
 
 # Alerts timeout after a given time in seconds and go up
 # to the next level. These can be overridden for monitors
@@ -266,6 +260,10 @@ Monitor.CPU.threshold.UPPER=95
 Monitor.Load.threshold.LOWER=10.0
 Monitor.Load.threshold.UPPER=20.0
 
+# Paging monitor threshold values
+Monitor.Paging.threshold.LOWER=1000
+Monitor.Paging.threshold.UPPER=5000
+
 # Process Count threshold values
 Monitor.Process.threshold.LOWER=500
 Monitor.Process.threshold.UPPER=1000
@@ -288,10 +286,25 @@ Monitor.UserCount.threshold.UPPER=200
 # Disk monitor threshold values
 Monitor.Disk.threshold.LOWER=90
 Monitor.Disk.threshold.UPPER=95
+Monitor.DiskInode.threshold.LOWER=90
+Monitor.DiskInode.threshold.UPPER=95
 # Thresholds given are PERCENTAGE or VALUE
 # where PERCENTAGE is a percentage of disk in use
 # and VALUE is an absolute value of space free
 Monitor.Disk.thresholdMeasure=PERCENTAGE
+Monitor.DiskInode.thresholdMeasure=PERCENTAGE
+
+# DiskIO monitor threshold values (in bytes)
+Monitor.DiskIO.rbytes.threshold.LOWER=10000000
+Monitor.DiskIO.rbytes.threshold.UPPER=50000000
+Monitor.DiskIO.wbytes.threshold.LOWER=10000000
+Monitor.DiskIO.wbytes.threshold.UPPER=50000000
+
+# NetIO monitor threshold values (in bytes)
+Monitor.NetIO.rxbytes.threshold.LOWER=10000000
+Monitor.NetIO.rxbytes.threshold.UPPER=50000000
+Monitor.NetIO.txbytes.threshold.LOWER=10000000
+Monitor.NetIO.txbytes.threshold.UPPER=50000000
 
 # Queue monitor threshold values
 Monitor.Queue.threshold.LOWER=50