git-svn-id: http://www.observium.org/svn/observer/trunk@2346 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-17 22:42:37 +00:00
parent 20814329ac
commit a1348cb7bb

View File

@@ -138,8 +138,8 @@ foreach ($ports as $port)
if ($this_port['ifHCInOctets'] > 0 && is_numeric($this_port['ifHCInOctets']) && $this_port['ifHCOutOctets'] > 0 && is_numeric($this_port['ifHCOutOctets']))
{
echo("HC ");
$this_port['ifInOctets'] = $this_port['ifHCInOctets'];
$this_port['ifOutOctets'] = $this_port['ifHCOutOctets'];
$this_port['ifInOctets'] = $this_port['ifHCInOctets'];
$this_port['ifOutOctets'] = $this_port['ifHCOutOctets'];
}
### rewrite the ifPhysAddress
@@ -196,7 +196,6 @@ foreach ($ports as $port)
}
/// Parse description (usually ifAlias) if config option set
if (isset($config['port_descr_parser']) && is_file($config['install_dir'] . "/" . $config['port_descr_parser']))
{
$port_attribs = array('type','descr','circuit','speed','notes');
@@ -212,8 +211,7 @@ foreach ($ports as $port)
}
}
}
/// Ende parse ifAlias
/// End parse ifAlias
/// Update IF-MIB metrics
foreach ($stat_oids_db as $oid)
@@ -225,7 +223,7 @@ foreach ($ports as $port)
{
$oid_diff = $this_port[$oid] - $port[$oid];
$oid_rate = $oid_diff / $polled_period;
if ($oid_rate < 0) { $oid_rate = "0"; }
if ($oid_rate < 0) { $oid_rate = "0"; echo("negative $oid"); }
$port['update'][$oid.'_rate'] = $oid_rate;
$port['update'][$oid.'_delta'] = $oid_diff;
if ($debug) {echo("\n $oid ($oid_diff B) $oid_rate Bps $polled_period secs\n"); }