many fixes to ip address polling and displaying

git-svn-id: http://www.observium.org/svn/observer/trunk@403 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-04-13 19:16:22 +00:00
parent 44f3a83038
commit d10c1c26d2
16 changed files with 2485 additions and 95 deletions
+2 -2
View File
@@ -32,7 +32,7 @@ while ($interface = mysql_fetch_array($interface_query)) {
if($device['os'] == "IOS") {
$snmp_cmdb = $config['snmpget'] . " -m +CISCO-VLAN-MEMBERSHIP-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
$snmp_cmdb = $config['snmpget'] . " -m +CISCO-VLAN-MEMBERSHIP-MIB:CISCO-VTP-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
$snmp_cmdb .= " .1.3.6.1.4.1.9.2.2.1.1.1." . $interface['ifIndex'];
$snmp_cmdb .= " .1.3.6.1.4.1.9.9.68.1.2.2.1.2." . $interface['ifIndex'];
$snmp_cmdb .= " .1.3.6.1.4.1.9.9.46.1.6.1.1.16." . $interface['ifIndex'];
@@ -43,7 +43,7 @@ while ($interface = mysql_fetch_array($interface_query)) {
$snmp_outputb = str_replace("\"", "", $snmp_outputb);
list($this['ifHardType'], $this['ifVlan'], $this['ifTrunk']) = explode("\n", $snmp_outputb);
if($this['ifTrunk'] == "notApplicable") { unset($this['ifTrunk']); }
if($this['ifTrunk'] == "notApplicable" || $this['ifTrunk'] == "6") { unset($this['ifTrunk']); }
if($this['ifVlan'] == "") { unset($this['ifVlan']); }
if ( $interface['ifTrunk'] != $this['ifTrunk'] ) {