mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: don't support unifi clients that don't report data (#5383)

Browse Source
This commit is contained in:
Tony Murray
2017-01-10 13:27:02 -06:00
committed by Neil Lathwood
parent 322bebfd7a
commit 1e131c96c2
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/polling/mib/ubnt-unifi-mib.inc.php
View File

@@ -3,7 +3,7 @@
// based on Airfiber MIB work of Mark Gibbons // based on Airfiber MIB work of Mark Gibbons
// UBNT-UniFi-MIB // UBNT-UniFi-MIB
echo ' UBNT-UniFi-MIB '; echo 'UBNT-UniFi-MIB ';
// $mib_oids (oidindex,dsname,dsdescription,dstype) // $mib_oids (oidindex,dsname,dsdescription,dstype)
$mib_oids = array( $mib_oids = array(

40
includes/polling/wifi.inc.php
View File

@@ -26,9 +26,7 @@ if ($device['type'] == 'network' || $device['type'] == 'firewall' || $device['ty
$wificlients1 = (snmp_get($device, 'wirelessNumber.0', '-OUqnv', 'AIRPORT-BASESTATION-3-MIB') + 0); $wificlients1 = (snmp_get($device, 'wirelessNumber.0', '-OUqnv', 'AIRPORT-BASESTATION-3-MIB') + 0);
echo $wificlients1." clients\n"; echo $wificlients1." clients\n";
} elseif ($device['os'] == 'ios' && (starts_with($device['hardware'], 'AIR-') || str_contains($device['hardware'], 'ciscoAIR'))) {
// FIXME Also interesting to poll? dhcpNumber.0 for number of active dhcp leases
} elseif ($device['os'] == 'ios' and substr($device['hardware'], 0, 4) == 'AIR-' || ($device['os'] == 'ios' && strpos($device['hardware'], 'ciscoAIR') !== false)) {
echo 'Checking Aironet Wireless clients... '; echo 'Checking Aironet Wireless clients... ';
$wificlients1 = snmp_get($device, 'cDot11ActiveWirelessClients.1', '-OUqnv', 'CISCO-DOT11-ASSOCIATION-MIB'); $wificlients1 = snmp_get($device, 'cDot11ActiveWirelessClients.1', '-OUqnv', 'CISCO-DOT11-ASSOCIATION-MIB');
@@ -46,8 +44,9 @@ if ($device['type'] == 'network' || $device['type'] == 'firewall' || $device['ty
'Wireless', 'Wireless',
'Atheros', 'Atheros',
); );
$sql = 'SELECT COUNT(*) FROM `entPhysical` WHERE `device_id` = ? AND `entPhysicalDescr` LIKE ?';
foreach ($wirelesscards as $wirelesscheck) { foreach ($wirelesscards as $wirelesscheck) {
if (dbFetchCell('SELECT COUNT(*) FROM `entPhysical` WHERE `device_id` = ?AND `entPhysicalDescr` LIKE ?', array($device['device_id'], '%'.$wirelesscheck.'%')) >= '1') { if (dbFetchCell($sql, array($device['device_id'], '%'.$wirelesscheck.'%')) >= 1) {
echo 'Checking RouterOS Wireless clients... '; echo 'Checking RouterOS Wireless clients... ';
$wificlients1 = snmp_get($device, 'mtxrWlApClientCount', '-OUqnv', 'MIKROTIK-MIB'); $wificlients1 = snmp_get($device, 'mtxrWlApClientCount', '-OUqnv', 'MIKROTIK-MIB');
@@ -58,7 +57,7 @@ if ($device['type'] == 'network' || $device['type'] == 'firewall' || $device['ty
unset($wirelesscards); unset($wirelesscards);
} }
} elseif ($device['os'] == 'symbol' and (stristr($device['hardware'], 'AP'))) { } elseif ($device['os'] == 'symbol' && str_contains($device['hardware'], 'AP', true)) {
echo 'Checking Symbol Wireless clients... '; echo 'Checking Symbol Wireless clients... ';
$wificlients1 = snmp_get($device, '.1.3.6.1.4.1.388.11.2.4.2.100.10.1.18.1', '-Ovq', '""'); $wificlients1 = snmp_get($device, '.1.3.6.1.4.1.388.11.2.4.2.100.10.1.18.1', '-Ovq', '""');
@@ -66,21 +65,28 @@ if ($device['type'] == 'network' || $device['type'] == 'firewall' || $device['ty
echo (($wificlients1 + 0).' clients on wireless connector, '); echo (($wificlients1 + 0).' clients on wireless connector, ');
} elseif ($device['os'] == 'unifi') { } elseif ($device['os'] == 'unifi') {
echo 'Checking Unifi Wireless clients... '; echo 'Checking Unifi Wireless clients... ';
$wificlients1 = 0;
$wificlients2 = 0;
$clients = explode("\n", snmp_walk($device, 'unifiVapNumStations', '-Oqv', 'UBNT-UniFi-MIB')); $clients = snmpwalk_cache_oid($device, 'UBNT-UniFi-MIB::unifiVapRadio', array());
$bands = explode("\n", snmp_walk($device, 'unifiVapRadio', '-Oqv', 'UBNT-UniFi-MIB')); $clients = snmpwalk_cache_oid($device, 'UBNT-UniFi-MIB::unifiVapNumStations', $clients);
foreach ($bands as $index => $band_index) { if (!empty($clients)) {
if ($band_index == "ng") { $wificlients1 = 0;
$wificlients1 += $clients[$index]; $wificlients2 = 0;
}
foreach ($clients as $entry) {
if ($entry['unifiVapRadio'] == 'ng') {
$wificlients1 += $entry['unifiVapNumStations'];
} else { } else {
$wificlients2 += $clients[$index]; $wificlients2 += $entry['unifiVapNumStations'];
} }
} }
echo $wificlients1 . ' clients on Radio0, ' . $wificlients2 . " clients on Radio1\n"; if (!empty($clients)) {
echo $wificlients1 . ' clients on Radio0, ' . $wificlients2 . " clients on Radio1\n";
} else {
echo "AP does not supply client counts\n";
}
include 'includes/polling/mib/ubnt-unifi-mib.inc.php'; include 'includes/polling/mib/ubnt-unifi-mib.inc.php';
} }
@@ -97,6 +103,6 @@ if ($device['type'] == 'network' || $device['type'] == 'firewall' || $device['ty
unset(${'wificlients'.$i}); unset(${'wificlients'.$i});
$i++; $i++;
} }
}//end if } else {
echo 'Unsupported type: ' . $device['type'] . PHP_EOL;
echo "\n"; }