ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/client/monitors/Disk__Monitor.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/client/monitors/Disk__Monitor.java (file contents):
Revision 1.8 by tdb, Fri Mar 23 02:32:49 2001 UTC vs.
Revision 1.11 by tdb, Wed Nov 7 16:44:11 2001 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 < package uk.org.iscream.client.monitors;
2 > package uk.org.iscream.cms.server.client.monitors;
3  
4   //---IMPORTS---
5   import java.util.HashMap;
# Line 7 | Line 7 | import java.util.ArrayList;
7   import java.util.Set;
8   import java.util.Iterator;
9   import java.text.NumberFormat;
10 < import uk.org.iscream.client.*;
11 < import uk.org.iscream.core.*;
12 < import uk.org.iscream.util.*;
13 < import uk.org.iscream.componentmanager.*;
10 > import uk.org.iscream.cms.server.client.*;
11 > import uk.org.iscream.cms.server.core.*;
12 > import uk.org.iscream.cms.server.util.*;
13 > import uk.org.iscream.cms.server.componentmanager.*;
14  
15   /**
16   * This Monitor watches the Disks for all machines
# Line 55 | Line 55 | public class Disk__Monitor extends MonitorSkeleton {
55          // key prefix
56          String keyPrefix = "packet.disk.p";
57          
58 <        // a tempory holder for all the disk attributes we find
58 >        // a temporary holder for all the disk attributes we find
59          ArrayList disks = new ArrayList();
60  
61          // unfortunatly we need to check the whole packet
# Line 133 | Line 133 | public class Disk__Monitor extends MonitorSkeleton {
133  
134                      // this  bit determines if the disk check is a % check
135                      // or a kb check
136                    double diskInUse;
136                      String type;
137 +                    double curValue;
138 +                    int newThreshold;
139                      if(useValue) {
140 <                        // kb disk in use
141 <                        diskInUse = diskTotal - diskAvail;
140 >                        // kb disk available
141 >                        curValue = diskAvail;
142 >                        // negate check
143 >                        newThreshold = checkAttributeThreshold(curValue, reg, true);
144                          type = "kb";
145                      } else {
146                          // % disk in use
147 <                        diskInUse = (1 - (diskAvail / diskTotal)) * 100;
147 >                        curValue = (1 - (diskAvail / diskTotal)) * 100;
148 >                        // normal check
149 >                        newThreshold = checkAttributeThreshold(curValue, reg, false);
150                          type = "%";
151                      }
152  
148
149
150                    int newThreshold = checkAttributeThreshold(diskInUse, reg);
151
153                      // format the diskInUse to a String
154                      NumberFormat nf = NumberFormat.getInstance();
155                      nf.setMaximumFractionDigits(2);
156                      nf.setMinimumFractionDigits(2);
157 <                    String strDiskInUse = nf.format(diskInUse);
157 >                    String strCurValue = nf.format(curValue);
158  
159                      // say which disk had the problem
160                      String attributeName = "Disk in use " + type + " on " + mount + " (" + device + ")";
161  
162 <                    processAlert(newThreshold, attributeName, reg, source, strDiskInUse);
162 >                    processAlert(newThreshold, attributeName, reg, source, strCurValue);
163                  }
164              }
165          }
# Line 168 | Line 169 | public class Disk__Monitor extends MonitorSkeleton {
169       * Overrides the {@link java.lang.Object#toString() Object.toString()}
170       * method to provide clean logging (every class should have this).
171       *
172 <     * This uses the uk.org.iscream.util.NameFormat class
172 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
173       * to format the toString()
174       *
175       * @return the name of this class and its CVS revision
# Line 193 | Line 194 | public class Disk__Monitor extends MonitorSkeleton {
194       * Checks a piece of current data, and returns the
195       * threshold it breaches, if any.
196       *
197 <     * @param diskInUse the amount of space in use
197 >     * The option to negate the check can be used in
198 >     * situations where being *below* the threshold
199 >     * is an 'alertable' situation. In this specific
200 >     * case, we'd do this with kb disk checks.
201 >     *
202 >     * @param value the current value
203       * @param reg the Register for the host
204 +     * @param negateCheck whether to negate the check
205       * @return the threshold level breached, if any
206       */
207 <    private int checkAttributeThreshold(double diskInUse, Register reg) {
207 >    private int checkAttributeThreshold(double diskInUse, Register reg, boolean negateCheck) {
208          for(int thresholdLevel = Alert.thresholdLevels.length - 1; thresholdLevel >= 0; thresholdLevel--) {
209              if (reg.getThreshold(thresholdLevel) != -1.0) {
210 <                if(((double) reg.getThreshold(thresholdLevel)) < diskInUse) {
211 <                    return thresholdLevel;
210 >                if(!negateCheck) {
211 >                    // normal check - has the value gone *over* the threshold
212 >                    if(((double) reg.getThreshold(thresholdLevel)) < diskInUse) {
213 >                        return thresholdLevel;
214 >                    }
215 >                }
216 >                else {
217 >                    // negated check - has the value gone *under* the threshold
218 >                    if(((double) reg.getThreshold(thresholdLevel)) > diskInUse) {
219 >                        return thresholdLevel;
220 >                    }
221                  }
222              }
223          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines