From f12224f78af6566783272bdccd0123b58f7715b3 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Mon, 9 Apr 2007 01:58:25 +0000 Subject: [PATCH] updates. git-svn-id: http://www.observium.org/svn/observer/trunk@81 61d68cd4-352d-0410-923a-c4978735b2b8 --- cleanup.php | 14 +++++++++----- html/includes/device-header.inc | 4 ++-- html/includes/hostbox.inc | 1 + html/pages/device/dev-overview.inc | 2 +- html/pages/devices.php | 3 ++- html/pages/interface.php | 4 ++-- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/cleanup.php b/cleanup.php index 045fb9c97..53c4223dd 100755 --- a/cleanup.php +++ b/cleanup.php @@ -7,7 +7,7 @@ include("config.php"); include("includes/functions.php"); $query = "SELECT *,A.id as id FROM ipaddr AS A, interfaces as I, devices as D - WHERE A.interface_id = I.interface_id AND I.device_id = D.id AND D.status = '1'"; + WHERE A.interface_id = I.interface_id AND I.device_id = D.device_id AND D.status = '1'"; $data = mysql_query($query); while($row = mysql_fetch_array($data)) { @@ -23,7 +23,7 @@ while($row = mysql_fetch_array($data)) { } $query = "SELECT * FROM interfaces AS I, devices as D - WHERE I.host = D.id AND D.status = '1'"; + WHERE I.device_id = D.device_id AND D.status = '1'"; $data = mysql_query($query); while($row = mysql_fetch_array($data)) { $index = $row[ifIndex]; @@ -31,8 +31,12 @@ while($row = mysql_fetch_array($data)) { $community = $row['community']; $response = trim(`snmpget -v2c -Osq -c $community $hostname ifIndex.$index | cut -d " " -f 2`); if($response != $index) { - mysql_query("delete from interfaces where id = '" . $row['interface_id'] . "'"); - echo("Deleted $row[ifDescr] from $hostname\n"); + mysql_query("DELETE from interfaces where interface_id = '" . $row['interface_id'] . "'"); + mysql_query("DELETE from `adjacencies` WHERE `interface_id` = '" . $row['interface_id'] . "'"); + mysql_query("DELETE from `links` WHERE `src_if` = '" . $row['interface_id'] . "'"); + mysql_query("DELETE from `links` WHERE `dst_if` = '" . $row['interface_id'] . "'"); + mysql_query("DELETE from `ipaddr` WHERE `interface_id` = '" . $row['interface_id'] . "'"); + echo("Removed interface " . $row['ifDescr'] . " from " . $row['hostname'] . "
"); } } @@ -41,7 +45,7 @@ $interface_query = mysql_query("SELECT interface_id,device_id FROM `interfaces`" while ($interface = mysql_fetch_array($interface_query)) { $device_id = $interface['device_id']; $interface_id = $interface['interface_id']; - if(mysql_result(mysql_query("SELECT COUNT(*) FROM `devices` WHERE `id` = '$device_id'"), 0) == '0') { + if(mysql_result(mysql_query("SELECT COUNT(*) FROM `devices` WHERE `device_id` = '$device_id'"), 0) == '0') { mysql_query("delete from interfaces where `interface_id` = '$interface_id'"); echo("Deleting if $interface_id \n"); } diff --git a/html/includes/device-header.inc b/html/includes/device-header.inc index e7f627ca3..8f161c714 100644 --- a/html/includes/device-header.inc +++ b/html/includes/device-header.inc @@ -8,13 +8,13 @@ $type = strtolower($device['os']); unset($image); - $image = getImage($device[id]); + $image = getImage($device['device_id']); echo(" $image " . generatedevicelink($device) . " -
$device[purpose] +
" . $device['purpose'] . " "); diff --git a/html/includes/hostbox.inc b/html/includes/hostbox.inc index 08a9eef10..6a752843a 100644 --- a/html/includes/hostbox.inc +++ b/html/includes/hostbox.inc @@ -6,6 +6,7 @@ $class = "list-device-ignored"; if ($device['status'] == '1') { $class = "list-device-ignored-up"; } } + $type = strtolower($device['os']); unset($image); diff --git a/html/pages/device/dev-overview.inc b/html/pages/device/dev-overview.inc index c2af5c3d1..afd4ecaf6 100644 --- a/html/pages/device/dev-overview.inc +++ b/html/pages/device/dev-overview.inc @@ -72,7 +72,7 @@ echo(" $sql = "SELECT * FROM interfaces WHERE `device_id` = '$id'"; $query = mysql_query($sql); while($data = mysql_fetch_array($query)) { - echo("$ifsep" . generateiflink($data, makeshortif(strtolower($data['if'])))); + echo("$ifsep" . generateiflink($data, makeshortif(strtolower($data['ifDescr'])))); $ifsep = ", "; } unset($ifsep); diff --git a/html/pages/devices.php b/html/pages/devices.php index 75f98eff8..9cee2dba9 100644 --- a/html/pages/devices.php +++ b/html/pages/devices.php @@ -13,7 +13,8 @@ $device_query = mysql_query($sql); echo(""); while($device = mysql_fetch_array($device_query)) { - $device[uptime] = @mysql_result(mysql_query("SELECT device_uptime FROM device_uptime WHERE device_id = '" . $device[id] ."'" ), 0); + $device['uptime'] = mysql_result(mysql_query("SELECT `attrib_value` FROM `devices_attribs` WHERE `device_id` = '" . $device['device_id'] ."' AND `attrib_type` = 'uptime'"), 0); + include("includes/hostbox.inc"); } diff --git a/html/pages/interface.php b/html/pages/interface.php index 06efcc9b7..98104273e 100644 --- a/html/pages/interface.php +++ b/html/pages/interface.php @@ -3,7 +3,7 @@ $interface_query = mysql_query("select * from interfaces WHERE interface_id = '$_GET[id]'"); $interface = mysql_fetch_array($interface_query); - $device_query = mysql_query("select * from devices where id = '$interface[host]'"); + $device_query = mysql_query("SELECT * FROM `devices` WHERE `device_id` = '" . $interface['device_id'] . "'"); $device = mysql_fetch_array($device_query); $hostname = $device['hostname']; @@ -24,7 +24,7 @@ $interface = mysql_fetch_array($interface_query); $i = 1; $inf = fixifName($ifname); -# $bg="#ffffff"; + $bg="#ffffff"; echo("
"); include("includes/device-header.inc"); echo("
");