From 227b612e650ae77280b8a7f0e2a2a5ec29647e50 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Wed, 5 Nov 2008 15:24:44 +0000 Subject: [PATCH] cleanups git-svn-id: http://www.observium.org/svn/observer/trunk@291 61d68cd4-352d-0410-923a-c4978735b2b8 --- README | 7 +++++++ html/includes/print-interface.inc | 17 +++++++++-------- html/pages/device.php | 4 ++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/README b/README index 6f850eeee..aa2475904 100644 --- a/README +++ b/README @@ -34,6 +34,13 @@ Pre-Release 0.3.3 Much prettier front page Tidied up service checking layout +Added MPLS VRF tracking +Added Pseudowire/X-Connect tracking +Basic front page customisation +Fixed aggregate graphs +IPv6 address tracking +View for ports with errors +Added some JunOS support Release 0.3.2.1 ( 27th March 2008 ) diff --git a/html/includes/print-interface.inc b/html/includes/print-interface.inc index 67b84e350..af2394dea 100644 --- a/html/includes/print-interface.inc +++ b/html/includes/print-interface.inc @@ -8,6 +8,8 @@ if(!$_GET['type']) { $_GET['type'] = "bits"; } $if_id = $interface['interface_id']; + + $ifDescr = fixifName($interface['ifDescr']); $ifIndex = $interface['ifIndex']; $ifAlias = $interface['ifAlias']; @@ -23,7 +25,7 @@ $error_img = generateiflink($interface,"Interface Errors",errors); } else { $error_img = ""; } - $graph_url = "graph.php?if=$if_id&from=$twoday&to=$now&width=400&height=120&type=bits"; +# $graph_url = "graph.php?if=$if_id&from=$twoday&to=$now&width=400&height=120&type=bits"; echo(" @@ -31,7 +33,8 @@ echo(" " . generateiflink($interface, "$i. $ifDescr") . " $error_img -
$ifAlias"); + +
$ifAlias"); if($ifAlias) { echo("
"); } @@ -93,7 +96,7 @@ echo(""); if ( strpos($ifDescr, "oopback") === false && !$dographs) { $link_query = mysql_query("select * from links AS L, interfaces AS I, devices AS D WHERE L.src_if = '$if_id' AND L.dst_if = I.interface_id AND I.device_id = D.device_id"); while($link = mysql_fetch_array($link_query)) { -# echo("Directly Connected " . generateiflink($link, makeshortif($link['ifDescr'])) . " on " . generatedevicelink($link) . "
"); +# echo("Directly Connected " . generateiflink($link, makeshortif($link['ifDescr'])) . " on " . generatedevicelink($link, shorthost($link['hostname'])) . "
"); # $br = "
"; $int_links[$link['interface_id']] = $link['interface_id']; $int_links_phys[$link['interface_id']] = 1; @@ -165,14 +168,14 @@ echo(""); foreach($int_links as $int_link) { - $interface = mysql_fetch_array(mysql_query("SELECT * from interfaces AS I, devices AS D WHERE I.device_id = D.device_id and I.interface_id = '".$int_link."'")); + $link_if = mysql_fetch_array(mysql_query("SELECT * from interfaces AS I, devices AS D WHERE I.device_id = D.device_id and I.interface_id = '".$int_link."'")); echo("$br"); if($int_links_phys[$int_link]) { echo(" "); } else { echo(" "); } - echo("" . generateiflink($interface, makeshortif($interface['ifDescr'])) . " on " . generatedevicelink($interface) ); + echo("" . generateiflink($link_if, makeshortif($link_if['ifDescr'])) . " on " . generatedevicelink($link_if, shorthost($link_if['hostname'])) ); if($int_links_v6[$int_link]) { echo(" v6"); } if($int_links_v4[$int_link]) { echo(" v4"); } @@ -190,7 +193,7 @@ echo(""); $pw_peer_int = mysql_fetch_array(mysql_query("SELECT * from `interfaces` AS I, pseudowires AS P WHERE I.device_id = '".$pseudowire['peer_device_id']."' AND P.cpwVcID = '".$pseudowire['cpwVcID']."' AND P.interface_id = I.interface_id")); - echo(" " . generateiflink($pw_peer_int, makeshortif($pw_peer_int['ifDescr'])) ." on ". generatedevicelink($pw_peer_dev) . ""); + echo(" " . generateiflink($pw_peer_int, makeshortif($pw_peer_int['ifDescr'])) ." on ". generatedevicelink($pw_peer_dev, shorthost($pw_peer_dev['hostname'])) . ""); } @@ -224,8 +227,6 @@ echo(""); echo("', LEFT, WIDTH, 350".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> "); - - echo(""); } diff --git a/html/pages/device.php b/html/pages/device.php index 567a07589..d9c260e59 100644 --- a/html/pages/device.php +++ b/html/pages/device.php @@ -62,7 +62,7 @@ if(@mysql_result(mysql_query("select count(interface_id) from interfaces WHERE d echo("
  • - Port Details + Ports
  • @@ -125,7 +125,7 @@ if(mysql_result(mysql_query("select count(service_id) from services WHERE servic echo("
  • - Eventlog + Events
    • ");