--- projects/cms/source/server/uk/org/iscream/cms/server/client/monitors/Disk__Monitor.java	2001/03/18 00:54:04	1.4
+++ projects/cms/source/server/uk/org/iscream/cms/server/client/monitors/Disk__Monitor.java	2001/03/22 00:59:13	1.5
@@ -16,7 +16,7 @@ import uk.org.iscream.componentmanager.*;
  * This Monitor watches the Disks for all machines
  *
  * @author  $Author: ajm $
- * @version $Id: Disk__Monitor.java,v 1.4 2001/03/18 00:54:04 ajm Exp $
+ * @version $Id: Disk__Monitor.java,v 1.5 2001/03/22 00:59:13 ajm Exp $
  */
 public class Disk__Monitor extends MonitorSkeleton {
 
@@ -25,7 +25,7 @@ public class Disk__Monitor extends MonitorSkeleton {
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.4 $";
+    public final String REVISION = "$Revision: 1.5 $";
     
     public final String DESC = "Monitors all host disks.";
     
@@ -89,7 +89,7 @@ public class Disk__Monitor extends MonitorSkeleton {
                         // check if we've seen this disk before on a previous run
                         // if not, we need to create a register for it
                         if(!diskRegisters.containsKey(diskNumber)) {
-                            diskRegisters.put(diskNumber, new Register(source, _name));
+                            diskRegisters.put(diskNumber, new Register(source, _name, mount));
                         }
 
                         // get the register for this disk
@@ -123,12 +123,15 @@ public class Disk__Monitor extends MonitorSkeleton {
                         // this  bit determines if the disk check is a % check
                         // or a kb check
                         double diskInUse;
+                        String type;
                         if(useValue) {
                             // kb disk in use
                             diskInUse = diskTotal - diskAvail;
+                            type = "kb";
                         } else {
-                            // kb disk in use
+                            // % disk in use
                             diskInUse = (1 - (diskAvail / diskTotal)) * 100;
+                            type = "%";
                         }
                         
                         
@@ -142,7 +145,7 @@ public class Disk__Monitor extends MonitorSkeleton {
                         String strDiskInUse = nf.format(diskInUse);
   
                         // say which disk had the problem
-                        String attributeName = "Disk in use % on " + mount + " (" + device + ")";
+                        String attributeName = "Disk in use " + type + " on " + mount + " (" + device + ")";
                                                 
                         processAlert(newThreshold, attributeName, reg, source, strDiskInUse);
                     }