-
-
+
Overview
");
-if(@mysql_result(mysql_query("select count(interface_id) from interfaces WHERE device_id = '$device[id]'"), 0) > '0') {
+if(@mysql_result(mysql_query("select count(interface_id) from interfaces WHERE device_id = '" . $device['device_id'] . "'"), 0) > '0') {
echo("
-
-
+
Port Details
-
-
+
Port Graphs
");
}
echo(" -
-
+
Host Graphs
");
-if(mysql_result(mysql_query("select count(service_id) from services WHERE service_host = '$device[id]'"), 0) > '0') {
+if(mysql_result(mysql_query("select count(service_id) from services WHERE service_host = '" . $device['device_id'] . "'"), 0) > '0') {
echo("
-
-
+
Service Details
@@ -59,14 +59,14 @@ if(mysql_result(mysql_query("select count(service_id) from services WHERE servic
echo("
-
-
+
Eventlog
");
echo("
-
-
+
Syslog
@@ -75,7 +75,7 @@ echo("
if($_SESSION[userlevel] > "5") {
echo("
-
-
+
Edit Device
diff --git a/html/pages/device/dev-graphs.inc b/html/pages/device/dev-graphs.inc
index 9a7f7c2df..11893fdb4 100644
--- a/html/pages/device/dev-graphs.inc
+++ b/html/pages/device/dev-graphs.inc
@@ -1,6 +1,6 @@
-
");
+ Total Traffic
" . device_traffic_image($device['id'], 490, 100, $day, $now) . "Total Traffic
" . device_traffic_image($device['device_id'], 490, 100, $day, $now) . ""); } if($interfaces['total']) { diff --git a/html/pages/devices.php b/html/pages/devices.php index 2749e44b8..75f98eff8 100644 --- a/html/pages/devices.php +++ b/html/pages/devices.php @@ -1,15 +1,12 @@ ');\" onmouseout=\"return nd();\">$text"; + $link = "');\" onmouseout=\"return nd();\">$text"; return $link; } function generatedevicelink($device, $text=0) { global $twoday; global $now; - if($device['dev_id']) { $id = $device['dev_id']; } else { $id = $device['id']; } $class = devclass($device); - if(!$text) { $text = $device[hostname]; } - $graph_url = "graph.php?host=$id&from=$twoday&to=$now&width=400&height=120&type=cpu"; - $link = "');\" onmouseout=\"return nd();\">$text"; + if(!$text) { $text = $device['hostname']; } + $graph_url = "graph.php?host=" . $device[device_id] . "&from=$twoday&to=$now&width=400&height=120&type=cpu"; + $link = "');\" onmouseout=\"return nd();\">$text"; return $link; } @@ -85,7 +84,7 @@ function devclass($device) { function getImage($host) { -$sql = "SELECT * FROM `devices` WHERE `id` = '$host'"; +$sql = "SELECT * FROM `devices` WHERE `device_id` = '$host'"; $data = mysql_fetch_array(mysql_query($sql)); $type = strtolower($data['os']); @@ -108,8 +107,8 @@ $type = strtolower($data['os']); function delHost($id) { - $host = mysql_result(mysql_query("SELECT hostname FROM devices WHERE id = '$id'"), 0); - mysql_query("DELETE FROM `devices` WHERE `id` = '$id'"); + $host = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '$id'"), 0); + mysql_query("DELETE FROM `devices` WHERE `device_id` = '$id'"); $int_query = mysql_query("SELECT * FROM `interfaces` WHERE `host` = '$id'"); while($int_data = mysql_fetch_array($int_query)) { $int_if = $int_data['if']; @@ -123,7 +122,7 @@ function delHost($id) { mysql_query("DELETE FROM `storage` WHERE `host_id` = '$id'"); mysql_query("DELETE FROM `alerts` WHERE `device_id` = '$id'"); mysql_query("DELETE FROM `eventlog` WHERE `host` = '$id'"); - mysql_query("DELETE FROM `interfaces` WHERE `host` = '$id'"); + mysql_query("DELETE FROM `interfaces` WHERE `device_id` = '$id'"); mysql_query("DELETE FROM `services` WHERE `service_host` = '$id'"); `rm -f rrd/$host-*.rrd`; echo("Removed device $host"); @@ -282,12 +281,12 @@ function isValidInterface($if) { } else { return 0; } } -function ifclass($up, $up_admin) { +function ifclass($ifOperStatus, $ifAdminStatus) { $ifclass = "interface-upup"; - if ($up_admin == "down") { $ifclass = "interface-admindown"; } - if ($up_admin == "up" && $up == "down") { $ifclass = "interface-updown"; } - if ($up_admin == "up" && $up == "up") { $ifclass = "interface-upup"; } + if ($ifAdminStatus == "down") { $ifclass = "interface-admindown"; } + if ($ifAdminStatus == "up" && $ifOperStatus== "down") { $ifclass = "interface-updown"; } + if ($ifAdminStatus == "up" && $ifOperStatus== "up") { $ifclass = "interface-upup"; } return $ifclass; } @@ -939,37 +938,18 @@ function createHost ($host, $community, $snmpver){ } } -function createInterface ($host, $if, $ifIndex, $up,$up_admin,$speed,$duplex,$mac,$name){ - $sql = "INSERT INTO `interfaces` (`host`,`if`,`ifIndex`, `up`,`up_admin`,`speed`,`duplex`,`mac`,`name`)"; - $sql = $sql . " VALUES ('$host', '$if','$ifIndex','$up','$up_admin','$speed','$duplex','$mac',\"$name\")"; - mysql_query($sql); -} - -function updateInterfaceStatus ($id,$ifOperStatus,$ifAdminStatus,$speed,$duplex,$mac,$ifAlias) { - $sql = "UPDATE `interfaces` SET `up` = '$ifOperStatus', `up_admin` = '$ifAdminStatus', `speed` = '$speed', "; - $sql .= "`duplex` = '$duplex', `mac` = '$mac', `name` = \"$ifAlias\" WHERE `id` = '$id'"; - mysql_query($sql); - echo("$sql\n"); -} - -function updateInterface ($host, $if, $ifIndex, $up, $up_admin, $speed, $duplex, $mac, $name){ - $sql = "UPDATE `interfaces` SET `up` = '$up',`up_admin` = '$up_admin',`speed` = '$speed',`duplex` = '$duplex',`mac` = '$mac',`name` = \"$name\""; - $sql .= " WHERE `host` = '$host' AND `if` = '$if'"; - mysql_query($sql); -} - function isDomainResolves($domain){ return gethostbyname($domain) != $domain; } function hoststatus($id) { - $sql = mysql_query("SELECT `status` FROM `devices` WHERE `id` = '$id'"); + $sql = mysql_query("SELECT `status` FROM `devices` WHERE `device_id` = '$id'"); $result = @mysql_result($sql, 0); return $result; } function gethostbyid($id) { - $sql = mysql_query("SELECT `hostname` FROM `devices` WHERE `id` = '$id'"); + $sql = mysql_query("SELECT `hostname` FROM `devices` WHERE `device_id` = '$id'"); $result = @mysql_result($sql, 0); return $result; } @@ -993,13 +973,13 @@ function getifbyid($id) { } function getidbyname($domain){ - $sql = mysql_query("SELECT `id` FROM `devices` WHERE `hostname` = '$domain'"); + $sql = mysql_query("SELECT `device_id` FROM `devices` WHERE `hostname` = '$domain'"); $result = @mysql_result($sql, 0); return $result; } function gethostosbyid($id) { - $sql = mysql_query("SELECT `os` FROM `devices` WHERE `id` = '$id'"); + $sql = mysql_query("SELECT `os` FROM `devices` WHERE `device_id` = '$id'"); $result = @mysql_result($sql, 0); return $result; } diff --git a/includes/graphing.php b/includes/graphing.php index c96b79e75..55e967005 100644 --- a/includes/graphing.php +++ b/includes/graphing.php @@ -12,18 +12,18 @@ function temp_graph ($device, $graph, $from, $to, $width, $height, $title, $vert $iter = "1"; $sql = mysql_query("SELECT * FROM temperature where temp_host = '$device'"); $optsa[] = "COMMENT: Cur Max"; - while($fs = mysql_fetch_array($sql)) { + while($temperature = mysql_fetch_array($sql)) { if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE"; } elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D"; } elseif($iter=="7") {$colour="FF0084"; unset($iter); } - $fs[temp_descr] = str_pad($fs[temp_descr], 28); - $fs[temp_descr] = substr($fs[temp_descr],0,28); + $temperature['temp_descr'] = str_pad($temperature['temp_descr'], 28); + $temperature['temp_descr'] = substr($temperature['temp_descr'],0,28); - $optsa[] = "DEF:temp$fs[temp_id]=rrd/$hostname-temp$fs[temp_id].rrd:temp:AVERAGE"; - $optsa[] = "LINE1:temp$fs[temp_id]#" . $colour . ":$fs[temp_descr]"; - $optsa[] = "GPRINT:temp$fs[temp_id]:LAST:%3.0lf°C"; - $optsa[] = "GPRINT:temp$fs[temp_id]:MAX:%3.0lf°C\l"; + $optsa[] = "DEF:temp" . $temperature[temp_id] . "=rrd/" . $hostname . "-temp-" . $temperature['temp_id'] . ".rrd:temp:AVERAGE"; + $optsa[] = "LINE1:temp" . $temperature[temp_id] . "#" . $colour . ":" . $temperature[temp_descr]; + $optsa[] = "GPRINT:temp" . $temperature[temp_id] . ":LAST:%3.0lf°C"; + $optsa[] = "GPRINT:temp" . $temperature[temp_id] . ":MAX:%3.0lf°C\l"; $iter++; } if($width <= "300") {$optsb = array("--font", "LEGEND:7:$mono_font", diff --git a/includes/ios.php b/includes/ios.php index 854c5d1ff..5576c66ca 100755 --- a/includes/ios.php +++ b/includes/ios.php @@ -4,7 +4,7 @@ function pollDeviceIOS() { global $device; global $community; - $id = $device['id']; + $id = $device['device_id']; $hostname = $device['hostname']; $hardware = $device['hardware']; $version = $device['version']; diff --git a/includes/polling/device-netstats.inc.php b/includes/polling/device-netstats.inc.php index 67fa7cdeb..d573a18f5 100755 --- a/includes/polling/device-netstats.inc.php +++ b/includes/polling/device-netstats.inc.php @@ -7,7 +7,7 @@ $oids = array ('ipForwDatagrams','ipInDelivers','ipInReceives','ipOutRequests',' 'tcpEstabResets','tcpInSegs','tcpOutSegs','tcpRetransSegs','udpInDatagrams','udpOutDatagrams','udpInErrors', 'udpNoPorts'); -$rrdfile = "rrd/" . $hostname . "-netinfo.rrd"; +$rrdfile = "rrd/" . $device['hostname'] . "-netinfo.rrd"; $rrd_create = "rrdtool create $rrdfile "; $rrd_create .= "RRA:AVERAGE:0.5:1:600 RRA:AVERAGE:0.5:6:700 RRA:AVERAGE:0.5:24:775 RRA:AVERAGE:0.5:288:797 RRA:MAX:0.5:1:600 \ @@ -22,7 +22,8 @@ foreach($oids as $oid){ if(!file_exists($rrdfile)) { `$rrd_create`; } -$snmpdata = trim(`snmpget -O qv -$snmpver -c $community $hostname $snmpstring`); +$snmpdata_cmd = "snmpbulkget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " $snmpstring"; +$snmpdata = trim(`$snmpdata_cmd`); $rrdupdate = "N"; @@ -31,8 +32,6 @@ foreach(explode("\n", $snmpdata) as $data) { $rrdupdate .= ":$data"; } -echo("\n$rrdfile $rrdupdate\n"); - rrd_update($rrdfile, $rrdupdate); rrd_error(); diff --git a/includes/polling/temperatures.inc.php b/includes/polling/temperatures.inc.php index e88a33553..174663612 100755 --- a/includes/polling/temperatures.inc.php +++ b/includes/polling/temperatures.inc.php @@ -1,17 +1,19 @@ $sysDescr')"); } - if ( $newlocation && $location != $newlocation ) { + if ( $newlocation && $device['location'] != $newlocation ) { $update = "`location` = '$newlocation'"; $seperator = ", "; - mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('$id', NULL, NOW(), 'Changed location from $location to $newlocation')"); + mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('" . $device['device_id'] . "', NULL, NOW(), 'Location -> $newlocation')"); } - if ( $newversion && $version != $newversion ) { + if ( $newversion && $device['version'] != $newversion ) { $update .= $seperator . "`version` = '$newversion'"; $seperator = ", "; - mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('$id', NULL, NOW(), 'Changed version from $version to $newversion')"); + mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('" . $device['device_id'] . "', NULL, NOW(), 'OS Version -> $newversion')"); } - if ( $newfeatures && $newfeatures != $features ) { + if ( $newfeatures && $newfeatures != $device['features'] ) { $update .= $seperator . "`features` = '$newfeatures'"; $seperator = ", "; - mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('$id', NULL, NOW(), 'Changed features from $features to $newfeatures')"); + mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('" . $device['device_id'] . "', NULL, NOW(), 'OS Features -> $newfeatures')"); } - if ( $newhardware && $newhardware != $hardware ) { + if ( $newhardware && $newhardware != $device['hardware'] ) { $update .= $seperator . "`hardware` = '$newhardware'"; $seperator = ", "; - mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('$id', NULL, NOW(), 'Changed hardware from $hardware to $newhardware')"); + mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('" . $device['device_id'] . "', NULL, NOW(), 'Hardware -> $newhardware')"); } - if( $status != $newstatus ) { + if( $device['status'] != $newstatus ) { $update .= $seperator . "`status` = '$newstatus'"; $seperator = ", "; if ($newstatus == '1') { $stat = "Up"; - mysql_query("INSERT INTO alerts (importance, device_id, message) VALUES ('0', '$id', 'Device is up\n')"); + mysql_query("INSERT INTO alerts (importance, device_id, message) VALUES ('0', '" . $device['device_id'] . "', 'Device is up\n')"); } else { $stat = "Down"; - mysql_query("INSERT INTO alerts (importance, device_id, message) VALUES ('9', '$id', 'Device is down\n')"); + mysql_query("INSERT INTO alerts (importance, device_id, message) VALUES ('9', '" . $device['device_id'] . "', 'Device is down\n')"); } - mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('$id', NULL, NOW(), 'Device status changed to $stat')"); + mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('" . $device['device_id'] . "', NULL, NOW(), 'Device status changed to $stat')"); } if ($newuptime) { echo("Uptime : $newuptime\n"); - $uptimerrd = "rrd/" . $hostname . "-uptime.rrd"; + $uptimerrd = "rrd/" . $device['hostname'] . "-uptime.rrd"; if(!is_file($uptimerrd)) { $woo = `rrdtool create $uptimerrd \ DS:uptime:GAUGE:600:0:U \ @@ -203,9 +199,9 @@ while ($device = mysql_fetch_array($device_query)) { } rrd_update($uptimerrd, "N:$newuptime"); - $update_uptime_attrib = mysql_query("UPDATE devices_attribs SET attrib_value = '$newuptime' WHERE `device_id` = '$id' AND `attrib_type` = 'uptime'"); + $update_uptime_attrib = mysql_query("UPDATE devices_attribs SET attrib_value = '$newuptime' WHERE `device_id` = '" . $device['device_id'] . "' AND `attrib_type` = 'uptime'"); if(mysql_affected_rows() == '0') { - $insert_uptime_attrib = mysql_query("INSERT INTO devices_attribs (`device_id`, `attrib_type`, `attrib_value`) VALUES ('$id', 'uptime', '$newuptime')"); + $insert_uptime_attrib = mysql_query("INSERT INTO devices_attribs (`device_id`, `attrib_type`, `attrib_value`) VALUES ('" . $device['device_id'] . "', 'uptime', '$newuptime')"); } } @@ -213,11 +209,11 @@ while ($device = mysql_fetch_array($device_query)) { if ($update) { $update_query = "UPDATE `devices` SET "; $update_query .= $update; - $update_query .= " WHERE `id` = '$id'"; - echo("Updating $hostname\n$update_query\n\n"); + $update_query .= " WHERE `id` = '" . $device['device_id'] . "'"; + echo("Updating " . $device['hostname'] . "\n" . $update_query . "\n\n"); $update_result = mysql_query($update_query); } else { - echo("No Changes to $hostname \n\n"); + echo("No Changes to " . $device['hostname'] . "\n\n"); } } diff --git a/poll-interface.php b/poll-interface.php index 0b80ef504..295d09480 100755 --- a/poll-interface.php +++ b/poll-interface.php @@ -7,7 +7,7 @@ include("includes/functions.php"); $interface_query = mysql_query("SELECT * FROM `interfaces`"); while ($interface = mysql_fetch_array($interface_query)) { - $device = mysql_fetch_array(mysql_query("SELECT * FROM `devices` WHERE id = '" . $interface['device_id'] . "'")); + $device = mysql_fetch_array(mysql_query("SELECT * FROM `devices` WHERE device_id = '" . $interface['device_id'] . "'")); if($device['status'] == '1') { $snmp_cmd = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " ifName." . $interface['ifIndex']; @@ -15,8 +15,6 @@ while ($interface = mysql_fetch_array($interface_query)) { $snmp_cmd .= "ifAlias." . $interface['ifIndex'] . " ifSpeed." . $interface['ifIndex'] . " 1.3.6.1.2.1.10.7.2.1." . $interface['ifIndex']; $snmp_cmd .= " ifType." . $interface['ifIndex'] . " ifMtu." . $interface['ifIndex'] . " ifPhysAddress." . $interface['ifIndex']; - echo($snmp_cmd); - $snmp_output = trim(`$snmp_cmd`); $snmp_output = str_replace("No Such Object available on this agent at this OID", "", $snmp_output); $snmp_output = str_replace("No Such Instance currently exists at this OID", "", $snmp_output);