diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index 3a12acafdc..043f50b11d 100644 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -209,7 +209,7 @@ echo 'Caching Oids: '; $port_stats = []; if ($device['os'] === 'f5' && (version_compare($device['version'], '11.2.0', '>=') && version_compare($device['version'], '11.7', '<'))) { - require_once 'ports/f5.inc.php'; + require 'ports/f5.inc.php'; } else { if (Config::getOsSetting($device['os'], 'polling.selected_ports') || $device['attribs']['selected_ports'] == 'true') { echo 'Selected ports polling '; @@ -307,36 +307,9 @@ if ($device['os'] === 'f5' && (version_compare($device['version'], '11.2.0', '>= } } -if ($device['os'] == 'fabos') { - require_once 'ports/brocade.inc.php'; -} - -if ($device['os'] == 'procera') { - require_once 'ports/procera.inc.php'; -} - -if ($device['os'] == 'cxr-ts') { - require_once 'ports/cxr-ts.inc.php'; -} - -if ($device['os'] == 'cmm') { - require_once 'ports/cmm.inc.php'; -} - -if ($device['os'] == 'nokia-isam') { - require_once 'ports/nokia-isam.inc.php'; -} - -if ($device['os'] == 'timos') { - require_once 'ports/timos.inc.php'; -} - -if ($device['os'] == 'infinera-groove') { - require_once 'ports/infinera-groove.inc.php'; -} - -if ($device['os'] == 'junos') { - require_once 'ports/junos-vcp.inc.php'; +$os_file = base_path("includes/polling/ports/os/{$device['os']}.inc.php"); +if (file_exists($os_file)) { + require $os_file; } if (Config::get('enable_ports_adsl')) { @@ -574,30 +547,6 @@ foreach ($ports as $port) { $port['update']['ifIndex'] = $ifIndex; } - if ($device['os'] === 'airos-af' && $port['ifAlias'] === 'eth0') { - $airos_stats = snmpwalk_cache_oid($device, '.1.3.6.1.4.1.41112.1.3.3.1', array(), 'UBNT-AirFIBER-MIB'); - $this_port['ifInOctets'] = $airos_stats[1]['rxOctetsOK']; - $this_port['ifOutOctets'] = $airos_stats[1]['txOctetsOK']; - $this_port['ifInErrors'] = $airos_stats[1]['rxErroredFrames']; - $this_port['ifOutErrors'] = $airos_stats[1]['txErroredFrames']; - $this_port['ifInBroadcastPkts'] = $airos_stats[1]['rxValidBroadcastFrames']; - $this_port['ifOutBroadcastPkts'] = $airos_stats[1]['txValidBroadcastFrames']; - $this_port['ifInMulticastPkts'] = $airos_stats[1]['rxValidMulticastFrames']; - $this_port['ifOutMulticastPkts'] = $airos_stats[1]['txValidMulticastFrames']; - $this_port['ifInUcastPkts'] = $airos_stats[1]['rxValidUnicastFrames']; - $this_port['ifOutUcastPkts'] = $airos_stats[1]['txValidUnicastFrames']; - $ports['update']['ifInOctets'] = $airos_stats[1]['rxOctetsOK']; - $ports['update']['ifOutOctets'] = $airos_stats[1]['txOctetsOK']; - $ports['update']['ifInErrors'] = $airos_stats[1]['rxErroredFrames']; - $ports['update']['ifOutErrors'] = $airos_stats[1]['txErroredFrames']; - $ports['update']['ifInBroadcastPkts'] = $airos_stats[1]['rxValidBroadcastFrames']; - $ports['update']['ifOutBroadcastPkts'] = $airos_stats[1]['txValidBroadcastFrames']; - $ports['update']['ifInMulticastPkts'] = $airos_stats[1]['rxValidMulticastFrames']; - $ports['update']['ifOutMulticastPkts'] = $airos_stats[1]['txValidMulticastFrames']; - $ports['update']['ifInUcastPkts'] = $airos_stats[1]['rxValidUnicastFrames']; - $ports['update']['ifOutUcastPkts'] = $airos_stats[1]['txValidUnicastFrames']; - } - // rewrite the ifPhysAddress if (strpos($this_port['ifPhysAddress'], ':')) { list($a_a, $a_b, $a_c, $a_d, $a_e, $a_f) = explode(':', $this_port['ifPhysAddress']); diff --git a/includes/polling/ports/os/airos-af.inc.php b/includes/polling/ports/os/airos-af.inc.php new file mode 100644 index 0000000000..fcbdb1564b --- /dev/null +++ b/includes/polling/ports/os/airos-af.inc.php @@ -0,0 +1,23 @@ + $afport_stats) { + if ($afport_stats['ifDescr'] == 'eth0') { + $port_stats[$index]['ifOperStatus'] = 'up'; // if may be marked as down + $port_stats[$index]['ifInOctets'] = $airos_stats[1]['rxOctetsOK']; + $port_stats[$index]['ifOutOctets'] = $airos_stats[1]['txOctetsOK']; + $port_stats[$index]['ifInErrors'] = $airos_stats[1]['rxErroredFrames']; + $port_stats[$index]['ifOutErrors'] = $airos_stats[1]['txErroredFrames']; + $port_stats[$index]['ifInBroadcastPkts'] = $airos_stats[1]['rxValidBroadcastFrames']; + $port_stats[$index]['ifOutBroadcastPkts'] = $airos_stats[1]['txValidBroadcastFrames']; + $port_stats[$index]['ifInMulticastPkts'] = $airos_stats[1]['rxValidMulticastFrames']; + $port_stats[$index]['ifOutMulticastPkts'] = $airos_stats[1]['txValidMulticastFrames']; + $port_stats[$index]['ifInUcastPkts'] = $airos_stats[1]['rxValidUnicastFrames']; + $port_stats[$index]['ifOutUcastPkts'] = $airos_stats[1]['txValidUnicastFrames']; + + break; + } + } +} diff --git a/includes/polling/ports/cmm.inc.php b/includes/polling/ports/os/cmm.inc.php similarity index 100% rename from includes/polling/ports/cmm.inc.php rename to includes/polling/ports/os/cmm.inc.php diff --git a/includes/polling/ports/cxr-ts.inc.php b/includes/polling/ports/os/cxr-ts.inc.php similarity index 100% rename from includes/polling/ports/cxr-ts.inc.php rename to includes/polling/ports/os/cxr-ts.inc.php diff --git a/includes/polling/ports/brocade.inc.php b/includes/polling/ports/os/fabos.inc.php similarity index 100% rename from includes/polling/ports/brocade.inc.php rename to includes/polling/ports/os/fabos.inc.php diff --git a/includes/polling/ports/infinera-groove.inc.php b/includes/polling/ports/os/infinera-groove.inc.php similarity index 100% rename from includes/polling/ports/infinera-groove.inc.php rename to includes/polling/ports/os/infinera-groove.inc.php diff --git a/includes/polling/ports/junos-vcp.inc.php b/includes/polling/ports/os/junos.inc.php similarity index 99% rename from includes/polling/ports/junos-vcp.inc.php rename to includes/polling/ports/os/junos.inc.php index 8f938c4789..dd8b42da69 100644 --- a/includes/polling/ports/junos-vcp.inc.php +++ b/includes/polling/ports/os/junos.inc.php @@ -1,6 +1,6 @@