# | 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 | < | $alertLevel = getValue("alertLevel", $alert); |
31 | > | $alertLevelNum = getValue("alertLevel", $alert); |
32 | $lastAlert = getValue("lastAlert", $alert); | |
33 | $thresholdLevel = getValue("thresholdLevel", $alert); | |
34 | $source = getValue("source", $alert); | |
# | Line 36 | Line 38 | function printAlert($machine, $alert, $small="") { | |
38 | $timeTillNextAlert = getValue("timeTillNextAlert", $alert); | |
39 | $initialAlertTime = getValue("initialAlertTime", $alert); | |
40 | ||
41 | < | $alertColour = $alertLevelColours[$alertLevel]; |
42 | < | $alertLevel = $alertLevelNames[$alertLevel]; |
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"> |
62 | + | <img src="level$alertLevelNum.gif" width="41" height="9" border="0" alt="$alertLevel"> |
63 | + | </td> |
64 | + | <td align="left"> |
65 | + | <font size="$fontsize" color="$alertColour"><b>$alertLevel</b></font> |
66 | + | </td> |
67 | + | <td align="left"> |
68 | + | <font size="$fontsize">$attributeName</font> |
69 | + | </td> |
70 | <td> | |
71 | < | <font size="2">$attributeName <font color="$alertColour"><b>$alertLevel</b></font></font> |
71 | > | |
72 | </td> | |
73 | </tr> | |
74 | EOT; | |
# | Line 52 | 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> |
82 | < | <td> </td> |
83 | < | <td><font color="$alertColour" size="2"><b>$alertLevel</b></font></td> |
84 | < | <td> </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 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> |
65 | < | <td><font size="2">Initially raised:</font></td> |
66 | < | <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> |
71 | < | <td><!--Next alert time:--> </td> |
72 | < | <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 80 | 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" bgcolor="#ffffff" width="100%"> |
118 | > | <table border="0" cellpadding="2" cellspacing="0"> |
119 | <tr> | |
120 | < | <td bgcolor="#000066"> |
121 | < | <font color="white"><b>$machine</b></font> |
120 | > | <td colspan="5"> |
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 102 | Line 131 | EOT; | |
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 131 | Line 160 | EOT; | |
160 | } | |
161 | } | |
162 | else { | |
163 | < | echo "There are currently no alerts held about <b>$machine</b>"; |
164 | < | printLine(""); |
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") { |
169 | > | if ($small == "on") { |
170 | echo "</table>"; | |
171 | } | |
172 | else { | |
# | Line 152 | Line 183 | EOT; | |
183 | ||
184 | <? include($titleHTML); ?> | |
185 | ||
186 | < | <? printLine("Latest alerts for hosts"); ?> |
186 | > | <? if ($hideform != "on") { ?> |
187 | ||
188 | < | <? if (!$hideform) { ?> |
188 | > | <? printLine("Latest alerts for hosts"); ?> |
189 | ||
190 | <form method="<? echo $formMethod ?>" action="<? echo $thisPage ?>"> | |
191 | <? |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |