recognise some new OSes, add an image for dlink, move sysObjectId polling to be global for os detection

git-svn-id: http://www.observium.org/svn/observer/trunk@1345 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-11 20:12:24 +00:00
parent 6a673c1cce
commit 2e581828b6
10 changed files with 51 additions and 12 deletions

View File

@@ -99,8 +99,10 @@ function getHostOS($device)
{
global $config;
$sysDescr_cmd = $config['snmpget']." -m SNMPv2-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " sysDescr.0";
$sysDescr = str_replace("\"", "", trim(shell_exec($sysDescr_cmd)));
$sysDescr = snmp_get ($device, "sysDescr.0", "-Ovq");
$sysObjectId = snmp_get ($device, "sysObjectID.0", "-Ovqn");
$dir_handle = @opendir($config['install_dir'] . "/includes/osdiscovery") or die("Unable to open $path");
while ($file = readdir($dir_handle))
{