# | Line 24 | Line 24 | function getValue($value, $alert) { | |
---|---|---|
24 | ||
25 | function printAlert($machine, $alert, $small="") { | |
26 | ||
27 | + | global $fontsize; |
28 | + | |
29 | include("alerts_config.inc.php"); | |
30 | ||
31 | $alertLevelNum = getValue("alertLevel", $alert); | |
# | Line 36 | Line 38 | function printAlert($machine, $alert, $small="") { | |
38 | $timeTillNextAlert = getValue("timeTillNextAlert", $alert); | |
39 | $initialAlertTime = getValue("initialAlertTime", $alert); | |
40 | ||
41 | + | if ($thresholdLevel == "1") { |
42 | + | $thresholdLevel = "Lower"; |
43 | + | } |
44 | + | else if ($thresholdLevel == "2") { |
45 | + | $thresholdLevel = "Upper"; |
46 | + | } |
47 | + | else { |
48 | + | $thresholdLevel = "Normal"; |
49 | + | } |
50 | + | |
51 | $alertColour = $alertLevelColours[$alertLevelNum]; | |
52 | $alertLevel = $alertLevelNames[$alertLevelNum]; | |
53 | $initialAlertTime = strftime("%x %X", intval($initialAlertTime / 1000)); | |
54 | ||
55 | < | if ($small == "true") { |
55 | > | if ($small == "on") { |
56 | echo <<<EOT | |
57 | <tr> | |
58 | <td width="50"> | |
59 | | |
60 | </td> | |
61 | < | <td align="left"> |
61 | > | <td> |
62 | <img src="level$alertLevelNum.gif" width="41" height="9" border="0" alt="$alertLevel"> | |
63 | </td> | |
64 | < | <td align="left"> |
65 | < | <font size="3" color="$alertColour"><b>$alertLevel</b></font> |
64 | > | <td> |
65 | > | <font size="$fontsize" color="$alertColour"><b>$alertLevel</b></font> |
66 | </td> | |
67 | < | <td align="left"> |
68 | < | <font size="3">$attributeName</font> |
67 | > | <td> |
68 | > | <font size="$fontsize">$attributeName (c:$value t:$thresholdValue)</font> |
69 | </td> | |
70 | <td> | |
71 | | |
# | Line 64 | Line 76 | EOT; | |
76 | else { | |
77 | echo <<<EOT | |
78 | ||
79 | < | <table border="0" cellspacing="5"> |
79 | > | <table border="0" cellspacing="5" width="100%"> |
80 | <tr> | |
81 | < | <td><b>$attributeName</b></td> |
70 | < | <td> </td> |
71 | < | <td> |
81 | > | <td align="left" width="40%"> |
82 | <img src="level$alertLevelNum.gif" width="41" height="9" border="0" alt="$alertLevel"> | |
83 | <font color="$alertColour" size="2"><b>$alertLevel</b></font> | |
84 | </td> | |
85 | < | <td> </td> |
85 | > | <td align="right" width="60%"> |
86 | > | <b>$attributeName</b> |
87 | > | </td> |
88 | </tr> | |
89 | <tr> | |
90 | < | <td><font size="2">Threshold:</font></td> |
91 | < | <td>$thresholdValue</td> |
80 | < | <td><font size="2">Initially raised:</font></td> |
81 | < | <td>$initialAlertTime</td> |
90 | > | <td align="right"><font size="2">Threshold:</font></td> |
91 | > | <td align="left">$thresholdValue ($thresholdLevel)</td> |
92 | </tr> | |
93 | <tr> | |
94 | < | <td><font size="2">Alert value:</font></td> |
95 | < | <td><b>$value</b></td> |
86 | < | <td><!--Next alert time:--> </td> |
87 | < | <td><!--$timeTillNextAlert--> </td> |
94 | > | <td align="right"><font size="2">Alert value:</font></td> |
95 | > | <td align="left"><b>$value</b></td> |
96 | </tr> | |
97 | + | <tr> |
98 | + | <td align="right"><font size="2">Initially raised:</font></td> |
99 | + | <td align="left">$initialAlertTime</td> |
100 | + | </tr> |
101 | </table> | |
102 | ||
103 | EOT; | |
# | Line 95 | Line 107 | EOT; | |
107 | } | |
108 | ||
109 | function printReports($machine, $small="") { | |
110 | + | global $fontsize; |
111 | + | |
112 | # Get a list of all files in the machine's directory. | |
113 | include("alerts_config.inc.php"); | |
114 | $alertArray = getdirArray("$alertDirectory/$machine", 'rsort'); | |
115 | ||
116 | < | if ($small == "true") { |
116 | > | if ($small == "on") { |
117 | echo <<<EOT | |
118 | < | <table border="0" cellpadding="2" cellspacing="0"> |
118 | > | <table border="0" cellpadding="2" cellspacing="6"> |
119 | <tr> | |
120 | <td colspan="5"> | |
121 | < | <font size="+1"><b>$machine</b></font> |
121 | > | <font size="$fontsize"><b><a href="alerts.php?machine=$machine" style="color: black; text-decoration: none;">$machine</a></b></font> |
122 | </td> | |
123 | </tr> | |
124 | EOT; | |
# | Line 113 | Line 127 | EOT; | |
127 | echo <<<EOT | |
128 | <p> </p> | |
129 | <table border="0" cellpadding="3" cellspacing="2" bgcolor="#000066" width="100%"> | |
130 | < | <tr> |
130 | > | <tr> |
131 | <td> | |
132 | <font color="white"> | |
133 | <b> | |
134 | < | Current alerts for $machine |
134 | > | Current alerts for <a href="latest.php?machine=$machine" style="color: white">$machine</a> |
135 | </b> | |
136 | <font size="2"> | |
137 | <br>Sorted by time, latest first. | |
# | Line 146 | Line 160 | EOT; | |
160 | } | |
161 | } | |
162 | else { | |
163 | < | if ($small != "true") { |
163 | > | if ($small != "on") { |
164 | echo "There are currently no alerts held about <b>$machine</b>"; | |
165 | printLine(""); | |
166 | } | |
167 | } | |
168 | ||
169 | < | if ($small == "true") { |
170 | < | echo "</table>"; |
169 | > | if ($small == "on") { |
170 | > | echo <<<EOT |
171 | > | <tr> |
172 | > | <td colspan="5"> </td> |
173 | > | </tr> |
174 | > | </table> |
175 | > | EOT; |
176 | } | |
177 | else { | |
178 | echo <<<EOT | |
# | Line 169 | Line 188 | EOT; | |
188 | ||
189 | <? include($titleHTML); ?> | |
190 | ||
191 | < | <? if (!$hideform) { ?> |
191 | > | <? if ($hideform != "on") { ?> |
192 | ||
193 | <? printLine("Latest alerts for hosts"); ?> | |
194 | ||
# | Line 200 | Line 219 | EOT; | |
219 | ||
220 | printLine(""); | |
221 | ||
222 | + | $masterwidth = ""; |
223 | + | if ($small != "on") { |
224 | + | $masterwidth = ' width="100%"'; |
225 | + | } |
226 | + | |
227 | + | echo <<<EOT |
228 | + | <table border="0" align="center"$masterwidth> |
229 | + | <tr> |
230 | + | <td> |
231 | + | EOT; |
232 | + | |
233 | if ($machine == "ALL") { | |
234 | $machine_array = getdirArray($alertDirectory, 'asort'); | |
235 | if ($machine_array != FALSE) { | |
# | Line 207 | Line 237 | EOT; | |
237 | printReports($machine, $small); | |
238 | } | |
239 | } | |
240 | + | else { |
241 | + | print "<font size='$fontsize'><b>There are currently no alerts</b></font>"; |
242 | + | } |
243 | } | |
244 | else { | |
245 | printReports($machine, $small); | |
246 | } | |
247 | ||
248 | + | echo <<<EOT |
249 | + | </td> |
250 | + | </tr> |
251 | + | </table> |
252 | + | EOT; |
253 | } | |
254 | else { | |
255 | printLine(""); |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |