add a distinction between ignore and disable for ports, like for devices - patch by Paul Gear

git-svn-id: http://www.observium.org/svn/observer/trunk@1942 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-21 10:39:54 +00:00
parent 664b2f551f
commit 4a323d81b3
4 changed files with 64 additions and 20 deletions

View File

@@ -102,7 +102,7 @@ $port_query = mysql_query("SELECT * FROM `ports` WHERE `device_id` = '".$device[
while ($port = mysql_fetch_array($port_query))
{
echo("Port " . $port['ifDescr'] . " ");
if ($port_stats[$port['ifIndex']] && $port['ignore'] == "0")
if ($port_stats[$port['ifIndex']] && $port['disabled'] == "0")
{ // Check to make sure Port data is cached.
$this_port = &$port_stats[$port['ifIndex']];
@@ -282,7 +282,7 @@ while ($port = mysql_fetch_array($port_query))
unset($update_query); unset($update);
// Send alerts for interface flaps.
if ($config['warn']['ifdown'] && ($port['ifOperStatus'] != $this_port['ifOperStatus']))
if ($config['warn']['ifdown'] && ($port['ifOperStatus'] != $this_port['ifOperStatus']) && $port['ignore'] == 0)
{
if ($this_port['ifAlias'])
{
@@ -301,12 +301,12 @@ while ($port = mysql_fetch_array($port_query))
}
}
}
elseif ($port['ignore'] == "0")
elseif ($port['disabled'] == "0")
{
echo("Port Deleted"); // Port missing from SNMP cache.
mysql_query("UPDATE `ports` SET `deleted` = '1' WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '".$this_port['ifIndex']."'");
} else {
echo("Port Ignored.");
echo("Port Disabled.");
}
echo("\n");
@@ -319,4 +319,4 @@ while ($port = mysql_fetch_array($port_query))
#### Clear Variables Here
unset($port_stats);
?>
?>