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

RouterOS wireless sensors update (#9401)

Browse Source 
* bug-fix and new features

Fixed incorrect OID for rate, renamed rate to TX-Rate as per update from mikrotik.

Added support for link distance

* Fixed indent issue
This commit is contained in:
Evan Dent
2018-11-05 18:21:32 +10:30
committed by Neil Lathwood
parent eea8ced6e0
commit 356357ad8d
3 changed files with 334 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
LibreNMS/OS/Routeros.php
View File

@@ -32,6 +32,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessFrequencyDiscovery;
use LibreNMS\Interfaces\Discovery\Sensors\WirelessNoiseFloorDiscovery;
use LibreNMS\Interfaces\Discovery\Sensors\WirelessRateDiscovery;
use LibreNMS\Interfaces\Discovery\Sensors\WirelessRssiDiscovery;
use LibreNMS\Interfaces\Discovery\Sensors\WirelessDistanceDiscovery;
use LibreNMS\OS;
class Routeros extends OS implements
@@ -40,7 +41,8 @@ class Routeros extends OS implements
WirelessFrequencyDiscovery,
WirelessNoiseFloorDiscovery,
WirelessRateDiscovery,
WirelessRssiDiscovery
WirelessRssiDiscovery,
WirelessDistanceDiscovery
{
private $data;
@@ -170,10 +172,10 @@ class Routeros extends OS implements
$sensors[] = new WirelessSensor(
'rate',
$this->getDeviceId(),
'.1.3.6.1.4.1.14988.1.1.1.8.1.13.' . $index,
'mikrotik-rate',
'.1.3.6.1.4.1.14988.1.1.1.9.1.8.' . $index,
'mikrotik-60g-tx',
$index,
'SSID: ' . $entry['mtxrWl60GSsid'],
'Tx Rate',
$entry['mtxrWl60G'],
$multiplier = 1000000
);
@@ -185,10 +187,31 @@ class Routeros extends OS implements
if (is_null($this->data)) {
$wl60 = snmpwalk_cache_oid($this->getDevice(), 'mtxrWl60GTable', array(), 'MIKROTIK-MIB');
$wlap = snmpwalk_cache_oid($this->getDevice(), 'mtxrWlApTable', array(), 'MIKROTIK-MIB');
$wl60sta = snmpwalk_cache_oid($this->getDevice(), 'mtxrWl60GStaTable', array(), 'MIKROTIK-MIB');
$this->data = $wl60+$wlap;
$this->data = $this->data+$wl60sta;
}
return $this->data;
}
public function discoverWirelessDistance()
{
$data = $this->fetchData();
$sensors = array();
foreach ($data as $index => $entry) {
$sensors[] = new WirelessSensor(
'distance',
$this->getDeviceId(),
'.1.3.6.1.4.1.14988.1.1.1.8.1.13.' . $index,
'mikrotik',
$index,
'SSID: ' . $entry['mtxrWl60GSsid'],
$entry['mtxrWl60G'],
null,
100000
);
}
return $sensors;
}
private function discoverSensor($type, $oid, $num_oid_base)
{
$data = $this->fetchData();