Lots of nice new things! Yum.

git-svn-id: http://www.observium.org/svn/observer/trunk@220 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2008-04-03 19:04:24 +00:00
parent 77c0647062
commit 4e10de77a7
13 changed files with 281 additions and 35 deletions
+2
View File
@@ -15,6 +15,8 @@ RewriteRule ^devices/alerted/ ?page=devices&status=alerted
RewriteRule ^devices/alerted/ ?page=devices&status=alerted
RewriteRule ^devices/(.+)/ ?page=devices&type=$1
RewriteRule ^interfaces/(.+)/ ?page=interfaces&type=$1
RewriteRule ^bill/([0-9]+) ?page=bills&bill=$1
RewriteRule ^device/([0-9]+) ?page=device&id=$1
+4 -1
View File
@@ -123,7 +123,7 @@ if($_SESSION['userlevel'] >= '5') {
if($config['int_core']) { echo("<li><a href='?page=iftype&type=core'><img src='images/16/brick_link.png' border=0 align=absmiddle> Core</a></li>"); $ifbreak = 1;}
}
if($ifbreak && $interface_alerts) { echo("<li><hr width=140 /></li>"); }
if($ifbreak) { echo("<li><hr width=140 /></li>"); }
if($interface_alerts) {
echo("<li><a href='?page=interfaces&status=0'><img src='images/16/link_error.png' border=0 align=absmiddle> Alerts ($interface_alerts)</a></li>");
@@ -131,6 +131,9 @@ echo("<li><a href='?page=interfaces&status=0'><img src='images/16/link_error.png
?>
<li><a href='interfaces/down/'><img src='images/16/if-disconnect.png' border=0 align=absmiddle> Down Ports</a></li>
<li><a href='interfaces/admindown/'><img src='images/16/if-disable.png' border=0 align=absmiddle> Disabled Ports</a></li>
</ul></td></tr></table>
<!--[if lte IE 6]></a><![endif]-->
+25 -22
View File
@@ -1,23 +1,28 @@
<?php
function generate_front_box ($type, $content) {
echo("<div style='float: left; padding: 5px; width: 135px; margin: 0px;'>
<b class='box-".$type."'>
<b class='box-".$type."1'><b></b></b>
<b class='box-".$type."2'><b></b></b>
<b class='box-".$type."3'></b>
<b class='box-".$type."4'></b>
<b class='box-".$type."5'></b></b>
<div class='box-".$type."fg' style='height: 90px;'>
".$content."
</div>
<b class='box-".$type."'>
<b class='box-".$type."5'></b>
<b class='box-".$type."4'></b>
<b class='box-".$type."3'></b>
<b class='box-".$type."2'><b></b></b>
<b class='box-".$type."1'><b></b></b></b>
</div>");
echo("<div style=' background: transparent url(/images/box-$type.png) no-repeat; display: block; height: 84px; width: 119px; padding: 8px; margin: 5px; float: left;'>
$content
</div>");
# echo("<div style='float: left; padding: 5px; width: 135px; margin: 0px;'>
# <b class='box-".$type."'>
# <b class='box-".$type."1'><b></b></b>
# <b class='box-".$type."2'><b></b></b>
# <b class='box-".$type."3'></b>
# <b class='box-".$type."4'></b>
# <b class='box-".$type."5'></b></b>
# <div class='box-".$type."fg' style='height: 90px;'>
# ".$content."
# </div>
# <b class='box-".$type."'>
# <b class='box-".$type."5'></b>
# <b class='box-".$type."4'></b>
# <b class='box-".$type."3'></b>
# <b class='box-".$type."2'><b></b></b>
# <b class='box-".$type."1'><b></b></b></b>
# </div>");
}
echo("<div style='width: 875px; float: left; padding: 3px 10px; background: #fff;'>");
@@ -25,12 +30,10 @@ echo("<div style='width: 875px; float: left; padding: 3px 10px; background: #fff
$sql = mysql_query("SELECT * FROM `devices` WHERE `status` = '0' AND `ignore` = '0'");
while($device = mysql_fetch_array($sql)){
echo("<div style='border: solid 2px #d0D0D0; float: left; padding: 5px; width: 120px; height: 90px; background: #ffbbbb; margin: 4px;'>
<center><strong>".generatedevicelink($device, shorthost($device['hostname']))."</strong><br />
generate_front_box("alert", "<center><strong>".generatedevicelink($device, shorthost($device['hostname']))."</strong><br />
<span style='font-size: 14px; font-weight: bold; margin: 5px; color: #c00;'>Device Down</span>
<span class=body-date-1>".truncate($device['location'], 20)."</span>
</center></div>");
</center>");
}
@@ -75,7 +78,7 @@ while($device = mysql_fetch_array($sql)){
generate_front_box("info", "<center><strong>".generatedevicelink($device, shorthost($device['hostname']))."</strong><br />
<span style='font-size: 14px; font-weight: bold; margin: 5px; color: #090;'>Device<br />Rebooted</span><br />
<span style='font-size: 14px; font-weight: bold; margin: 5px; color: #009;'>Device<br />Rebooted</span><br />
<span class=body-date-1>".formatUptime($device['attrib_value'])."</span>
</center>");
+16 -4
View File
@@ -1,11 +1,20 @@
<?php
if ($_SESSION['userlevel'] >= '5') {
#if ($_SESSION['userlevel'] >= '5') {
$sql = "SELECT * FROM `interfaces` AS I, `devices` AS D WHERE I.device_id = D.device_id ORDER BY D.hostname, I.ifDescr";
} else {
$sql = "SELECT * FROM `interfaces` AS I, `devices` AS D, `devices_perms` AS P WHERE I.device_id = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, I.ifDescr";
#} else {
# $sql = "SELECT * FROM `interfaces` AS I, `devices` AS D, `devices_perms` AS P WHERE I.device_id = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, I.ifDescr";
#}
if($_GET['type'] == "down") {
$where = "AND I.ifAdminStatus = 'up' AND I.ifOperStatus = 'down'";
} elseif ($_GET['type'] == "admindown") {
$where = "AND I.ifAdminStatus = 'down'";
}
$sql = "SELECT * FROM `interfaces` AS I, `devices` AS D WHERE I.device_id = D.device_id $where ORDER BY D.hostname, I.ifDescr";
$query = mysql_query($sql);
echo("<table cellspacing=0 cellpadding=2 width=100%>");
@@ -25,7 +34,8 @@ while($interface = mysql_fetch_array($query)) {
$error_img = generateiflink($interface,"<img src='images/16/chart_curve_error.png' alt='Interface Errors' border=0>",errors);
} else { $error_img = ""; }
if( interfacepermitted($interface['interface_id']) ) {
echo("<tr bgcolor=$row_colour>
<td class=list-bold>" . generatedevicelink($interface) . "</td>
<td class=list-bold>" . generateiflink($interface, makeshortif(fixifname($interface['ifDescr']))) . " $error_img</td>
@@ -36,6 +46,8 @@ while($interface = mysql_fetch_array($query)) {
$row++;
}
}
echo("</table>");