--- projects/cms/source/server/build/etc/system.conf	2003/02/28 15:19:09	1.73
+++ projects/cms/source/server/build/etc/system.conf	2003/05/05 22:04:59	1.75
@@ -10,7 +10,7 @@
 # setup, aswell as a some example configuration.
 #
 # $Author: tdb $
-# $Id: system.conf,v 1.73 2003/02/28 15:19:09 tdb Exp $
+# $Id: system.conf,v 1.75 2003/05/05 22:04:59 tdb Exp $
 #
 # http://www.i-scream.org.uk/
 #
@@ -53,13 +53,7 @@ config.workstations=workstations.conf
 # Any hosts not specified by now have the default
 # config as given in this file.
 
-# Another component of the system is the mySQL
-# database part of the server call the DBInterface.
-# This has it's own config so the passwords for the
-# mySQL database can be kept seperate.
-#config.mySQL=mySQL.conf
 
-
 ############################################################
 #### Misc system-wide configuration
 ############################################################
@@ -126,10 +120,6 @@ Filter.PluginsPackage=uk.org.iscream.cms.server.filter
 # And the names of the plugins to be loaded.
 Filter.Plugins=TypeChecker;EnforceEssentialData;SourceChecker
 
-# The special filter known as the "Root Filter" needs
-# a name within the system.
-RootFilter.name=root
-
 # Every Filter, except the root, needs a parent to
 # send their data to. This is usually the root filter,
 # although in more complex setups it might be another
@@ -161,16 +151,12 @@ Filter.SourceCheckerPluginACL=DEFAULT:ALLOW
 
 
 ############################################################
-#### Root filter interfaces configuration
+#### Root filter configuration
 ############################################################
 
-# The Root FIlter can send data to various upstream
-# data processors. There are two of these at present
-# in the server - the DBInterface and the ClientInterface.
-# Their component names are given here as defined below.
-# (the DBInterface is switched off - commented - by default)
-#RootFilter.dbInterfaceName=database
-RootFilter.realtimeInterfaceName=realtimeclients
+# The special filter known as the "Root Filter" needs
+# a name within the system.
+RootFilter.name=root
 
 
 ############################################################
@@ -180,10 +166,12 @@ RootFilter.realtimeInterfaceName=realtimeclients
 # The client interface listens for connections from clients
 # on a TCP port. It is specified here.
 ClientInterface.listenPort=4510
-# The component name for the Client Interface. This should
-# match the name specified to the Root Filter above.
-ClientInterface.name=realtimeclients
 
+# The client interface needs to connect to another one to
+# receive data. There is a special client interface in the
+# root filter which is the top of the tree.
+ClientInterface.parent=root
+
 # The Client Interface has two channels, control and data.
 # Each of these can have an ACL for allowing connections.
 # As per previous examples in this configuration file they
@@ -194,12 +182,11 @@ ClientInterface.TCPDataChannelACL=DEFAULT:ALLOW
 
 
 ############################################################
-#### Database interface configuration
+#### LocalClient Configuration
 ############################################################
 
-# The name for the Database Interface. This should match
-# the name given to the Root Filter.
-DBInterface.name=database
+# The parent for the Local Client
+Client.parent=clientinterface1
 
 
 ############################################################
@@ -233,7 +220,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
@@ -259,6 +247,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
@@ -281,10 +273,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