89 |
|
// check if we've seen this disk before on a previous run |
90 |
|
// if not, we need to create a register for it |
91 |
|
if(!diskRegisters.containsKey(diskNumber)) { |
92 |
< |
diskRegisters.put(diskNumber, new Register(source, _name)); |
92 |
> |
diskRegisters.put(diskNumber, new Register(source, _name, mount)); |
93 |
|
} |
94 |
|
|
95 |
|
// get the register for this disk |
109 |
|
// don't try to continue and process, try next disk |
110 |
|
break; |
111 |
|
} |
112 |
< |
|
113 |
< |
// percentage of memory in use |
114 |
< |
double diskInUse = (1 - (diskAvail / diskTotal)) * 100; |
112 |
> |
|
113 |
> |
boolean useValue = false; |
114 |
> |
try { |
115 |
> |
String option = _cp.getProperty("Host." + source, "Monitor." + _name + ".thresholdMeasure"); |
116 |
> |
if (option.equals("VALUE")) { |
117 |
> |
useValue = true; |
118 |
> |
} |
119 |
> |
} catch (PropertyNotFoundException e) { |
120 |
> |
// we default to percentage |
121 |
> |
} |
122 |
> |
|
123 |
> |
// this bit determines if the disk check is a % check |
124 |
> |
// or a kb check |
125 |
> |
double diskInUse; |
126 |
> |
String type; |
127 |
> |
if(useValue) { |
128 |
> |
// kb disk in use |
129 |
> |
diskInUse = diskTotal - diskAvail; |
130 |
> |
type = "kb"; |
131 |
> |
} else { |
132 |
> |
// % disk in use |
133 |
> |
diskInUse = (1 - (diskAvail / diskTotal)) * 100; |
134 |
> |
type = "%"; |
135 |
> |
} |
136 |
> |
|
137 |
> |
|
138 |
> |
|
139 |
|
int newThreshold = checkAttributeThreshold(diskInUse, reg); |
140 |
|
|
141 |
< |
// format the memoryInUse to a String |
141 |
> |
// format the diskInUse to a String |
142 |
|
NumberFormat nf = NumberFormat.getInstance(); |
143 |
|
nf.setMaximumFractionDigits(2); |
144 |
|
nf.setMinimumFractionDigits(2); |
145 |
|
String strDiskInUse = nf.format(diskInUse); |
146 |
|
|
147 |
|
// say which disk had the problem |
148 |
< |
String attributeName = "Disk in use % on " + mount + " (" + device + ")"; |
148 |
> |
String attributeName = "Disk in use " + type + " on " + mount + " (" + device + ")"; |
149 |
|
|
150 |
|
processAlert(newThreshold, attributeName, reg, source, strDiskInUse); |
151 |
|
} |