os discovery debug forced (for now) and extra fortigate detection

git-svn-id: http://www.observium.org/svn/observer/trunk@1662 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-08-11 00:40:07 +00:00
parent 41bde06192
commit 2926267e5d
2 changed files with 6 additions and 3 deletions
+2 -1
View File
@@ -2,7 +2,8 @@
if(!$os) {
if (strstr($sysObjectId, "1.3.6.1.4.1.12356.15")) { $os = "fortigate"; }
if (strstr($sysObjectId, ".1.3.6.1.4.1.12356.15")) { $os = "fortigate"; }
if (strstr($sysObjectId, ".1.3.6.1.4.1.12356.101.1")) { $os = "fortigate"; }
}
+4 -2
View File
@@ -93,8 +93,10 @@ function getHostOS($device)
{
global $config;
$sysDescr = snmp_get ($device, "sysDescr.0", "-Ovq");
$sysObjectId = snmp_get ($device, "sysObjectID.0", "-Ovqn");
$sysDescr = snmp_get ($device, "SNMPv2-MIB::sysDescr.0", "-Ovq");
$sysObjectId = snmp_get ($device, "SNMPv2-MIB::sysObjectID.0", "-Ovqn");
echo("| $sysDescr | $sysObjectId | ");
$dir_handle = @opendir($config['install_dir'] . "/includes/discovery/os") or die("Unable to open $path");
while ($file = readdir($dir_handle))