add some ipv6 niceness

git-svn-id: http://www.observium.org/svn/observer/trunk@228 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2008-04-10 14:52:51 +00:00
parent 844268c1ad
commit b40c2b4cf9
16 changed files with 1004 additions and 448 deletions
+6 -5
View File
@@ -2,6 +2,8 @@
include("common.php");
include("ipv6.php");
include("generic.php");
include("ios.php");
include("unix.php");
@@ -15,7 +17,6 @@ include("cisco-entities.php");
include("syslog.php");
function write_dev_attrib($device_id, $attrib_type, $attrib_value) {
$count_sql = "SELECT COUNT(*) FROM devices_attribs WHERE `device_id` = '" . $device_id . "' AND `attrib_type` = '$attrib_type'";
@@ -53,8 +54,8 @@ function shorthost($hostname, $len=16) {
}
function rrdtool_update($rrdfile, $rrdupdate) {
global $rrdtool;
return `$rrdtool update $rrdfile $rrdupdate`;
global $config;
return shell_exec($config['rrdtool'] . " update $rrdfile $rrdupdate");
}
function getHostOS($hostname, $community, $snmpver) {
@@ -460,8 +461,8 @@ function isSNMPable($hostname, $community, $snmpver) {
}
function isPingable($hostname) {
global $fping;
$status = `$fping $hostname`;
global $config;
$status = shell_exec($config['fping'] . " $hostname");
if(strstr($status, "alive")) {
return TRUE;
} else {