From 35bc68a0d93687abeb2843acbd20ff014a8a415f Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sat, 18 Apr 2009 21:57:32 +0000 Subject: [PATCH] moving things around, making things tidier git-svn-id: http://www.observium.org/svn/observer/trunk@406 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/pages/device/bgp.inc.php | 2 +- html/pages/device/graphs.inc.php | 24 +++++------ .../{blocks => graphs}/netstats.inc.php | 0 .../device/{blocks => graphs}/uptime.inc.php | 0 html/pages/device/overview.inc.php | 42 ++++++++++++++++++- html/pages/device/ports.inc.php | 8 +++- 6 files changed, 61 insertions(+), 15 deletions(-) rename html/pages/device/{blocks => graphs}/netstats.inc.php (100%) rename html/pages/device/{blocks => graphs}/uptime.inc.php (100%) diff --git a/html/pages/device/bgp.inc.php b/html/pages/device/bgp.inc.php index 59801ca32d..37ef6852d2 100644 --- a/html/pages/device/bgp.inc.php +++ b/html/pages/device/bgp.inc.php @@ -27,7 +27,7 @@ echo(" if($peer['bgpPeerRemoteAs'] == $device['bgpLocalAs']) { $peer_type = "iBGP"; } else { $peer_type = "eBGP"; } - $peerhost = mysql_fetch_array(mysql_query("SELECT * FROM ipaddr AS A, interfaces AS I, devices AS D WHERE A.addr = '".$peer['bgpPeerIdentifier']."' AND I.interface_id = A.interface_id AND D.device_id = I.device_id")); + $peerhost = mysql_fetch_array(mysql_query("SELECT * FROM ipv4_addresses AS A, interfaces AS I, devices AS D WHERE A.ipv4_address = '".$peer['bgpPeerIdentifier']."' AND I.interface_id = A.interface_id AND D.device_id = I.device_id")); if($peerhost) { $peername = generatedevicelink($peerhost); } else { unset($peername); } diff --git a/html/pages/device/graphs.inc.php b/html/pages/device/graphs.inc.php index 3d0817c6d3..9d15f281a3 100644 --- a/html/pages/device/graphs.inc.php +++ b/html/pages/device/graphs.inc.php @@ -17,8 +17,8 @@ while($device = mysql_fetch_array($device_query)) { echo("
"); } - include("blocks/netstats.inc.php"); - include("blocks/uptime.inc.php"); + include("graphs/netstats.inc.php"); + include("graphs/uptime.inc.php"); break; @@ -31,8 +31,8 @@ while($device = mysql_fetch_array($device_query)) { echo("
Firewall Sessions
"); $graph_type = "fortigate_sessions"; include ("includes/print-device-graph.php"); - include("blocks/netstats.inc.php"); - include("blocks/uptime.inc.php"); + include("graphs/netstats.inc.php"); + include("graphs/uptime.inc.php"); break; @@ -47,8 +47,8 @@ while($device = mysql_fetch_array($device_query)) { $graph_type = "adsl_atn"; include ("includes/print-device-graph.php"); echo("
"); - include("blocks/netstats.inc.php"); - include("blocks/uptime.inc.php"); + include("graphs/netstats.inc.php"); + include("graphs/uptime.inc.php"); break; @@ -61,8 +61,8 @@ while($device = mysql_fetch_array($device_query)) { $graph_type = "netscreen_sessions"; include ("includes/print-device-graph.php"); - include("blocks/netstats.inc.php"); - include("blocks/uptime.inc.php"); + include("graphs/netstats.inc.php"); + include("graphs/uptime.inc.php"); break; @@ -129,8 +129,8 @@ while($device = mysql_fetch_array($device_query)) { echo("
"); } - include("blocks/netstats.inc.php"); - include("blocks/uptime.inc.php"); + include("graphs/netstats.inc.php"); + include("graphs/uptime.inc.php"); echo("
System Load
"); $graph_type = "load"; include ("includes/print-device-graph.php"); @@ -177,8 +177,8 @@ while($device = mysql_fetch_array($device_query)) { echo("
"); } - include("blocks/netstats.inc.php"); - include("blocks/uptime.inc.php"); + include("graphs/netstats.inc.php"); + include("graphs/uptime.inc.php"); break; case "Snom": echo("
Calls
"); diff --git a/html/pages/device/blocks/netstats.inc.php b/html/pages/device/graphs/netstats.inc.php similarity index 100% rename from html/pages/device/blocks/netstats.inc.php rename to html/pages/device/graphs/netstats.inc.php diff --git a/html/pages/device/blocks/uptime.inc.php b/html/pages/device/graphs/uptime.inc.php similarity index 100% rename from html/pages/device/blocks/uptime.inc.php rename to html/pages/device/graphs/uptime.inc.php diff --git a/html/pages/device/overview.inc.php b/html/pages/device/overview.inc.php index 222ebfe29a..e839d09aa4 100644 --- a/html/pages/device/overview.inc.php +++ b/html/pages/device/overview.inc.php @@ -39,9 +39,16 @@ if(mysql_result(mysql_query("SELECT count(*) from cpmCPU WHERE device_id = '" . $i = '1'; $procs = mysql_query("SELECT * FROM `cpmCPU` WHERE device_id = '" . $device['device_id'] . "'"); while($proc = mysql_fetch_array($procs)) { + + $proc_url = "?page=device/".$device['device_id']."/sensors/processors/"; + + $proc_popup = "onmouseover=\"return overlib('
".$device['hostname']." - ".$proc['entPhysicalDescr']; + $proc_popup .= "
"; + $proc_popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\""; + if($proc['cpuCPMTotal5minRev'] > '60') { $proc_colour='#cc0000'; } else { $proc_colour='#0000cc'; } echo("" . $proc['entPhysicalDescr'] . " - + " . $proc['cpmCPUTotal5minRev'] . "% "); $i++; @@ -50,6 +57,39 @@ if(mysql_result(mysql_query("SELECT count(*) from cpmCPU WHERE device_id = '" . echo(""); } +if(mysql_result(mysql_query("SELECT count(*) from cempMemPool WHERE device_id = '" . $device['device_id'] . "'"),0)) { + echo("
"); + echo("

Memory Pools

"); + echo(""); + $i = '1'; + $mempools = mysql_query("SELECT * FROM `cempMemPool` WHERE device_id = '" . $device['device_id'] . "'"); + while($mempool = mysql_fetch_array($mempools)) { + $entPhysicalName = mysql_result(mysql_query("SELECT entPhysicalName from entPhysical WHERE device_id = '".$device['device_id']."' + AND entPhysicalIndex = '".$mempool['entPhysicalIndex']."'"),0); + $perc = round($mempool['cempMemPoolUsed'] / ($mempool['cempMemPoolUsed'] + $mempool['cempMemPoolFree']) * 100,2); + $mempool['descr_fixed'] = $entPhysicalName . " ". $mempool['cempMemPoolName']; + $mempool['descr_fixed'] = str_replace("Routing Processor", "RP", $mempool['descr_fixed']); + $mempool['descr_fixed'] = str_replace("Switching Processor", "SP", $mempool['descr_fixed']); + $mempool['descr_fixed'] = str_replace("Processor", "Proc", $mempool['descr_fixed']); + + $proc_url = "?page=device/".$device['device_id']."/sensors/mempools/"; + + $mempool_popup = "onmouseover=\"return overlib('
".$device['hostname']." - ".$mempool['descr_fixed']; + $mempool_popup .= "
"; + $mempool_popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\""; + + + if($mempool['cpuCPMTotal5minRev'] > '60') { $mempool_colour='#cc0000'; } else { $mempool_colour='#0000cc'; } + echo(" + + + + "); + $i++; + } + echo("
" . $mempool['descr_fixed'] ."$perc%" . formatstorage($mempool['cempMemPoolFree'], 0) . "/" . formatstorage($mempool['cempMemPoolUsed'] + $mempool['cempMemPoolFree'], 0) . "
"); + echo("
"); +} if(mysql_result(mysql_query("SELECT count(storage_id) from storage WHERE host_id = '" . $device['device_id'] . "'"),0)) { echo("
"); diff --git a/html/pages/device/ports.inc.php b/html/pages/device/ports.inc.php index 97ee6342f3..5a8f990599 100644 --- a/html/pages/device/ports.inc.php +++ b/html/pages/device/ports.inc.php @@ -1,7 +1,8 @@ -Details | Graphs: +Basic | +Details | Graphs: Bits | Packets | NU Packets | @@ -17,6 +18,11 @@ if($_GET['opta'] == graphs ) { $dographs = 1; } +if($_GET['opta'] == "details" ) { + $port_details = 1; +} + + $hostname = gethostbyid($device['device_id']); echo("
");