diff --git a/LibreNMS/OS/Routeros.php b/LibreNMS/OS/Routeros.php index 90a94b0113..005bd03b8d 100644 --- a/LibreNMS/OS/Routeros.php +++ b/LibreNMS/OS/Routeros.php @@ -55,8 +55,6 @@ class Routeros extends OS implements WirelessSinrDiscovery, WirelessQualityDiscovery { - private $data; - /** * Returns an array of LibreNMS\Device\Sensor objects that have been discovered * @@ -64,13 +62,15 @@ class Routeros extends OS implements */ public function discoverWirelessCcq() { - $data = $this->fetchData(); $sensors = []; + + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlApTable'); foreach ($data as $index => $entry) { // skip sensors with no data (nv2 should report 1 client, but doesn't report ccq) if ($entry['mtxrWlApClientCount'] > 0 && $entry['mtxrWlApOverallTxCCQ'] == 0) { continue; } + $freq = $entry['mtxrWlApFreq'] ? substr($entry['mtxrWlApFreq'], 0, 1) . 'G' : 'SSID'; $sensors[] = new WirelessSensor( 'ccq', @@ -78,7 +78,7 @@ class Routeros extends OS implements '.1.3.6.1.4.1.14988.1.1.1.3.1.10.' . $index, 'mikrotik', $index, - 'SSID: ' . $entry['mtxrWlApSsid'], + "$freq: " . $entry['mtxrWlApSsid'], $entry['mtxrWlApOverallTxCCQ'] ); } @@ -93,11 +93,23 @@ class Routeros extends OS implements */ public function discoverWirelessClients() { - return $this->discoverSensor( - 'clients', - 'mtxrWlApClientCount', - '.1.3.6.1.4.1.14988.1.1.1.3.1.6.' - ); + $sensors = []; + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlApTable'); + foreach ($data as $index => $entry) { + $freq = $entry['mtxrWlApFreq'] ? substr($entry['mtxrWlApFreq'], 0, 1) . 'G' : 'SSID'; + + $sensors[] = new WirelessSensor( + 'clients', + $this->getDeviceId(), + '.1.3.6.1.4.1.14988.1.1.1.3.1.6.' . $index, + 'mikrotik', + $index, + "$freq: " . $entry['mtxrWlApSsid'], + $entry['mtxrWlApClientCount'] + ); + } + + return $sensors; } /** @@ -108,25 +120,39 @@ class Routeros extends OS implements */ public function discoverWirelessFrequency() { - $data = $this->fetchData(); - + $sensors = []; + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlApTable'); foreach ($data as $index => $entry) { - if ($entry['mtxrWlApFreq'] == null) { - return $this->discoverSensor( - 'frequency', - 'mtxrWl60GFreq', - '.1.3.6.1.4.1.14988.1.1.1.8.1.6.' - ); - } else { - return $this->discoverSensor( - 'frequency', - 'mtxrWlApFreq', - '.1.3.6.1.4.1.14988.1.1.1.3.1.7.' - ); + if ($entry['mtxrWlApFreq'] === '0') { + continue; } + $freq = substr($entry['mtxrWlApFreq'], 0, 1) . 'G'; + + $sensors[] = new WirelessSensor( + 'frequency', + $this->getDeviceId(), + '.1.3.6.1.4.1.14988.1.1.1.3.1.7.' . $index, + 'mikrotik', + $index, + "$freq: " . $entry['mtxrWlApSsid'], + $entry['mtxrWlApFreq'] + ); } - return []; + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWl60GTable'); + foreach ($data as $index => $entry) { + $sensors[] = new WirelessSensor( + 'frequency', + $this->getDeviceId(), + '.1.3.6.1.4.1.14988.1.1.1.8.1.6.' . $index, + 'mikrotik-60g', + $index, + '60G: ' . $entry['mtxrWl60GSsid'], + $entry['mtxrWl60GFreq'] + ); + } + + return $sensors; } /** @@ -137,11 +163,22 @@ class Routeros extends OS implements */ public function discoverWirelessRssi() { - return $this->discoverSensor( - 'rssi', - 'mtxrWl60GRssi', - '.1.3.6.1.4.1.14988.1.1.1.8.1.12.' - ); + $sensors = []; + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWl60GTable'); + + foreach ($data as $index => $entry) { + $sensors[] = new WirelessSensor( + 'rssi', + $this->getDeviceId(), + '.1.3.6.1.4.1.14988.1.1.1.8.1.12.' . $index, + 'mikrotik', + $index, + '60G: ' . $entry['mtxrWl60GSsid'], + $entry['mtxrWl60GRssi'] + ); + } + + return $sensors; } /** @@ -152,11 +189,22 @@ class Routeros extends OS implements */ public function discoverWirelessQuality() { - return $this->discoverSensor( - 'quality', - 'mtxrWl60GSignal', - '.1.3.6.1.4.1.14988.1.1.1.8.1.8.' - ); + $sensors = []; + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWl60GTable'); + + foreach ($data as $index => $entry) { + $sensors[] = new WirelessSensor( + 'quality', + $this->getDeviceId(), + '.1.3.6.1.4.1.14988.1.1.1.8.1.8.' . $index, + 'mikrotik', + $index, + '60G: ' . $entry['mtxrWl60GSsid'], + $entry['mtxrWl60GSignal'] + ); + } + + return $sensors; } /** @@ -166,11 +214,24 @@ class Routeros extends OS implements */ public function discoverWirelessNoiseFloor() { - return $this->discoverSensor( - 'noise-floor', - 'mtxrWlApNoiseFloor', - '.1.3.6.1.4.1.14988.1.1.1.3.1.9.' - ); + $sensors = []; + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlApTable'); + + foreach ($data as $index => $entry) { + $freq = $entry['mtxrWlApFreq'] ? substr($entry['mtxrWlApFreq'], 0, 1) . 'G' : 'SSID'; + + $sensors[] = new WirelessSensor( + 'noise-floor', + $this->getDeviceId(), + '.1.3.6.1.4.1.14988.1.1.1.3.1.9.' . $index, + 'mikrotik', + $index, + "$freq: " . $entry['mtxrWlApSsid'], + $entry['mtxrWlApNoiseFloor'] + ); + } + + return $sensors; } /** @@ -181,9 +242,13 @@ class Routeros extends OS implements */ public function discoverWirelessRate() { - $data = $this->fetchData(); $sensors = []; + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlApTable'); foreach ($data as $index => $entry) { + if ($entry['mtxrWlApTxRate'] === '0' && $entry['mtxrWlApRxRate'] === '0') { + continue; // no data + } + $sensors[] = new WirelessSensor( 'rate', $this->getDeviceId(), @@ -202,135 +267,133 @@ class Routeros extends OS implements 'SSID: ' . $entry['mtxrWlApSsid'] . ' Rx', $entry['mtxrWlApRxRate'] ); + } + + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWl60GTable'); + + foreach ($data as $index => $entry) { $sensors[] = new WirelessSensor( 'rate', $this->getDeviceId(), - '.1.3.6.1.4.1.14988.1.1.1.9.1.8.' . $index, + '.1.3.6.1.4.1.14988.1.1.1.8.1.13.' . $index, 'mikrotik-60g-tx', $index, - 'Tx Rate', - $entry['mtxrWl60G'], - $multiplier = 1000000 + '60G: ' . $entry['mtxrWl60GSsid'], + $entry['mtxrWl60GPhyRate'], + 1000000 ); } return $sensors; } - private function fetchData() - { - if (is_null($this->data)) { - $wl60 = snmpwalk_cache_oid($this->getDeviceArray(), 'mtxrWl60GTable', [], 'MIKROTIK-MIB'); - $wlap = snmpwalk_cache_oid($this->getDeviceArray(), 'mtxrWlApTable', [], 'MIKROTIK-MIB'); - $wl60sta = snmpwalk_cache_oid($this->getDeviceArray(), 'mtxrWl60GStaTable', [], 'MIKROTIK-MIB'); - $this->data = $wl60 + $wlap; - $this->data = $this->data + $wl60sta; - } - - return $this->data; - } - + /** + * Discover wireless distance. This is in Kilometers. Type is distance. + * Returns an array of LibreNMS\Device\Sensor objects that have been discovered + * + * @return array Sensors + */ public function discoverWirelessDistance() { - $data = $this->fetchData(); $sensors = []; + + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWl60GStaTable'); 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, + '.1.3.6.1.4.1.14988.1.1.1.9.1.10.' . $index, 'mikrotik', $index, - 'SSID: ' . $entry['mtxrWl60GSsid'], - $entry['mtxrWl60G'], - null, - 100000 + '60G: Sta > ' . $entry['mtxrWl60GStaRemote'], + $entry['mtxrWl60GStaDistance'], + 1, + 1000 ); } return $sensors; } - private function discoverSensor($type, $oid, $num_oid_base): array + /** + * Discover LTE RSRQ. This is in Dbm. Type is Dbm. + * Returns an array of LibreNMS\Device\Sensor objects that have been discovered + * + * @return array Sensors + */ + public function discoverWirelessRsrq() { - $data = $this->fetchData(); + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrLTEModemTable'); + $sensors = []; foreach ($data as $index => $entry) { - if (($entry['mtxrWlApSsid'] !== null)) { - $sensors[] = new WirelessSensor( - $type, - $this->getDeviceId(), - $num_oid_base . $index, - 'mikrotik', - $index, - 'SSID: ' . $entry['mtxrWlApSsid'], - $entry[$oid] - ); - } else { - $sensors[] = new WirelessSensor( - $type, - $this->getDeviceId(), - $num_oid_base . $index, - 'mikrotik', - $index, - 'SSID: ' . $entry['mtxrWl60GSsid'], - $entry[$oid] - ); - } + $name = $this->getCacheByIndex('MIKROTIK-MIB::mtxrInterfaceStatsName'); + $sensors[] = new WirelessSensor( + 'rsrq', + $this->getDeviceId(), + '.1.3.6.1.4.1.14988.1.1.16.1.1.3.' . $index, + 'routeros', + $index, + $name[$index] . ': Signal RSRQ', + $entry['mtxrLTEModemSignalRSRQ'] + ); } return $sensors; } - public function discoverWirelessRsrq() - { - $sinr = '.1.3.6.1.4.1.14988.1.1.16.1.1.3.1'; //MIKROTIK-MIB::mtxrLTEModemSignalRSRQ - - return [ - new WirelessSensor( - 'rsrq', - $this->getDeviceId(), - $sinr, - 'routeros', - 0, - 'Signal RSRQ', - null - ), - ]; - } - + /** + * Discover LTE RSRP. This is in Dbm. Type is Dbm. + * Returns an array of LibreNMS\Device\Sensor objects that have been discovered + * + * @return array Sensors + */ public function discoverWirelessRsrp() { - $sinr = '.1.3.6.1.4.1.14988.1.1.16.1.1.4.1'; //MIKROTIK-MIB::mtxrLTEModemSignalRSRP + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrLTEModemTable'); - return [ - new WirelessSensor( + $sensors = []; + foreach ($data as $index => $entry) { + $name = $this->getCacheByIndex('MIKROTIK-MIB::mtxrInterfaceStatsName'); + $sensors[] = new WirelessSensor( 'rsrp', $this->getDeviceId(), - $sinr, + '.1.3.6.1.4.1.14988.1.1.16.1.1.4.' . $index, 'routeros', - 0, - 'Signal RSRP', - null - ), - ]; + $index, + $name[$index] . ': Signal RSRP', + $entry['mtxrLTEModemSignalRSRP'] + ); + } + + return $sensors; } + /** + * Discover LTE SINR. This is in Dbm. Type is Dbm. + * Returns an array of LibreNMS\Device\Sensor objects that have been discovered + * + * @return array Sensors + */ public function discoverWirelessSinr() { - $sinr = '.1.3.6.1.4.1.14988.1.1.16.1.1.7.1'; //MIKROTIK-MIB::mtxrLTEModemSignalSINR + $data = $this->getCacheTable('MIKROTIK-MIB::mtxrLTEModemTable'); - return [ - new WirelessSensor( + $sensors = []; + foreach ($data as $index => $entry) { + $name = $this->getCacheByIndex('MIKROTIK-MIB::mtxrInterfaceStatsName'); + $sensors[] = new WirelessSensor( 'sinr', $this->getDeviceId(), - $sinr, + '.1.3.6.1.4.1.14988.1.1.16.1.1.7.' . $index, 'routeros', - 0, - 'Signal SINR', - null - ), - ]; + $index, + $name[$index] . ': Signal SINR', + $entry['mtxrLTEModemSignalSINR'] + ); + } + + return $sensors; } public function pollOS() diff --git a/misc/notifications.rss b/misc/notifications.rss index 146a41a880..2229d7c183 100644 --- a/misc/notifications.rss +++ b/misc/notifications.rss @@ -78,5 +78,10 @@ The config option "nobulk" is now called "snmp_bulk" to align better with other options. Update any local configs you might have. See https://github.com/librenms/librenms/pull/13098 for more information Wed, 01 Sep 2021 18:00:00 +0000 + + Mikrotik routeros wireless changes + Improvements to routeros wireless polling will lose historical data for 60GHz rate, frequency, and distance wireless sensors. See https://github.com/librenms/librenms/pull/12976 for more information. + Wed, 19 Oct 2021 18:00:00 +0000 + diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 92964f43a0..c032c83933 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -140,11 +140,6 @@ parameters: count: 1 path: LibreNMS/OS/Ios.php - - - message: "#^Parameter \\#8 \\$multiplier of class LibreNMS\\\\Device\\\\WirelessSensor constructor expects int, null given\\.$#" - count: 1 - path: LibreNMS/OS/Routeros.php - - message: "#^Parameter \\#8 \\$warn_percent of static method LibreNMS\\\\Device\\\\Processor\\:\\:discover\\(\\) expects int, null given\\.$#" count: 3 diff --git a/resources/lang/de/wireless.php b/resources/lang/de/wireless.php index ce7b6c554a..b3f999cef1 100644 --- a/resources/lang/de/wireless.php +++ b/resources/lang/de/wireless.php @@ -54,7 +54,7 @@ return [ 'distance' => [ 'short' => 'Distanz', 'long' => 'Distanz', - 'unit' => 'km', + 'unit' => 'm', ], 'mse' => [ 'short' => 'MSE', diff --git a/resources/lang/en/wireless.php b/resources/lang/en/wireless.php index c5c86fe99b..f5dd25b89f 100644 --- a/resources/lang/en/wireless.php +++ b/resources/lang/en/wireless.php @@ -55,7 +55,7 @@ return [ 'distance' => [ 'short' => 'Distance', 'long' => 'Distance', - 'unit' => 'km', + 'unit' => 'm', ], 'mse' => [ 'short' => 'MSE', diff --git a/resources/lang/fr/wireless.php b/resources/lang/fr/wireless.php index 37595a0db7..6f2020fec5 100644 --- a/resources/lang/fr/wireless.php +++ b/resources/lang/fr/wireless.php @@ -54,7 +54,7 @@ return [ 'distance' => [ 'short' => 'Distance', 'long' => 'Distance', - 'unit' => 'km', + 'unit' => 'm', ], 'mse' => [ 'short' => 'MSE', diff --git a/resources/lang/uk/wireless.php b/resources/lang/uk/wireless.php index 05ccb90149..87dbf0c23f 100644 --- a/resources/lang/uk/wireless.php +++ b/resources/lang/uk/wireless.php @@ -54,7 +54,7 @@ return [ 'distance' => [ 'short' => 'Відстань', 'long' => 'Відстань', - 'unit' => 'km', + 'unit' => 'm', ], 'mse' => [ 'short' => 'MSE', diff --git a/resources/lang/zh-CN/wireless.php b/resources/lang/zh-CN/wireless.php index d82ccf0538..6211abac2b 100644 --- a/resources/lang/zh-CN/wireless.php +++ b/resources/lang/zh-CN/wireless.php @@ -54,7 +54,7 @@ return [ 'distance' => [ 'short' => '距离', 'long' => '距离', - 'unit' => 'km', + 'unit' => 'm', ], 'mse' => [ 'short' => 'MSE', diff --git a/resources/lang/zh-TW/wireless.php b/resources/lang/zh-TW/wireless.php index fdd728d21d..e508768f3a 100644 --- a/resources/lang/zh-TW/wireless.php +++ b/resources/lang/zh-TW/wireless.php @@ -55,7 +55,7 @@ return [ 'distance' => [ 'short' => '距離', 'long' => '距離', - 'unit' => 'km', + 'unit' => 'm', ], 'mse' => [ 'short' => 'MSE', diff --git a/tests/data/routeros.json b/tests/data/routeros.json index 2a785436dd..7195af6ae5 100644 --- a/tests/data/routeros.json +++ b/tests/data/routeros.json @@ -2943,7 +2943,7 @@ "sensor_class": "clients", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-e2f1fc", + "sensor_descr": "2G: WARKOP-KOPIBOSS-B", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -2964,7 +2964,7 @@ "sensor_class": "clients", "sensor_index": "2", "sensor_type": "mikrotik", - "sensor_descr": "SSID: WARKOP-KOPIBOSS-A", + "sensor_descr": "5G: WARKOP-KOPIBOSS-A", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3027,7 +3027,7 @@ "sensor_class": "quality", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-e2f1fc", + "sensor_descr": "60G: MikroTik-e2f1fc", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3047,180 +3047,12 @@ "sensor_deleted": 0, "sensor_class": "rate", "sensor_index": "1", - "sensor_type": "mikrotik-tx", - "sensor_descr": "SSID: Tx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": null, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.2.1\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "1", - "sensor_type": "mikrotik-rx", - "sensor_descr": "SSID: Rx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": null, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.3.1\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "2", - "sensor_type": "mikrotik-tx", - "sensor_descr": "SSID: WARKOP-KOPIBOSS-A Tx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": null, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.2.2\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "2", - "sensor_type": "mikrotik-rx", - "sensor_descr": "SSID: WARKOP-KOPIBOSS-A Rx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": null, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.3.2\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "8", - "sensor_type": "mikrotik-tx", - "sensor_descr": "SSID: WARKOP-KOPIBOSS Tx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": null, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.2.8\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "8", - "sensor_type": "mikrotik-rx", - "sensor_descr": "SSID: WARKOP-KOPIBOSS Rx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": null, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.3.8\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "9", - "sensor_type": "mikrotik-tx", - "sensor_descr": "SSID: WARKOP-KOPIBOSS Tx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": null, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.2.9\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "9", - "sensor_type": "mikrotik-rx", - "sensor_descr": "SSID: WARKOP-KOPIBOSS Rx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": null, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.3.9\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "4", "sensor_type": "mikrotik-60g-tx", - "sensor_descr": "Tx Rate", + "sensor_descr": "60G: MikroTik-e2f1fc", "sensor_divisor": 1, "sensor_multiplier": 1000000, "sensor_aggregator": "sum", - "sensor_current": 2310000000, + "sensor_current": 2310, "sensor_prev": null, "sensor_limit": null, "sensor_limit_warn": null, @@ -3230,14 +3062,14 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.9.1.8.4\"]" + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.8.1.13.1\"]" }, { "sensor_deleted": 0, "sensor_class": "ccq", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: ", + "sensor_descr": "2G: WARKOP-KOPIBOSS-B", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3258,7 +3090,7 @@ "sensor_class": "ccq", "sensor_index": "2", "sensor_type": "mikrotik", - "sensor_descr": "SSID: WARKOP-KOPIBOSS-A", + "sensor_descr": "5G: WARKOP-KOPIBOSS-A", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3300,7 +3132,7 @@ "sensor_class": "rssi", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-e2f1fc", + "sensor_descr": "60G: MikroTik-e2f1fc", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3321,7 +3153,7 @@ "sensor_class": "noise-floor", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-e2f1fc", + "sensor_descr": "2G: WARKOP-KOPIBOSS-B", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3342,7 +3174,7 @@ "sensor_class": "noise-floor", "sensor_index": "2", "sensor_type": "mikrotik", - "sensor_descr": "SSID: WARKOP-KOPIBOSS-A", + "sensor_descr": "5G: WARKOP-KOPIBOSS-A", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3405,7 +3237,49 @@ "sensor_class": "frequency", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-e2f1fc", + "sensor_descr": "2G: WARKOP-KOPIBOSS-B", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": 2412, + "sensor_prev": null, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.7.1\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "frequency", + "sensor_index": "2", + "sensor_type": "mikrotik", + "sensor_descr": "5G: WARKOP-KOPIBOSS-A", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": 5805, + "sensor_prev": null, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.7.2\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "frequency", + "sensor_index": "1", + "sensor_type": "mikrotik-60g", + "sensor_descr": "60G: MikroTik-e2f1fc", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3424,13 +3298,13 @@ { "sensor_deleted": 0, "sensor_class": "distance", - "sensor_index": "1", + "sensor_index": "4", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-e2f1fc", - "sensor_divisor": 100000, - "sensor_multiplier": 0, + "sensor_descr": "60G: Sta > 4:d6:aa:a8:f:89", + "sensor_divisor": 1000, + "sensor_multiplier": 1, "sensor_aggregator": "sum", - "sensor_current": 0.0231, + "sensor_current": 2570, "sensor_prev": null, "sensor_limit": null, "sensor_limit_warn": null, @@ -3440,7 +3314,7 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.8.1.13.1\"]" + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.9.1.10.4\"]" } ] }, @@ -3451,7 +3325,7 @@ "sensor_class": "clients", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-e2f1fc", + "sensor_descr": "2G: WARKOP-KOPIBOSS-B", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3472,7 +3346,7 @@ "sensor_class": "clients", "sensor_index": "2", "sensor_type": "mikrotik", - "sensor_descr": "SSID: WARKOP-KOPIBOSS-A", + "sensor_descr": "5G: WARKOP-KOPIBOSS-A", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3535,7 +3409,7 @@ "sensor_class": "quality", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-e2f1fc", + "sensor_descr": "60G: MikroTik-e2f1fc", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3555,181 +3429,13 @@ "sensor_deleted": 0, "sensor_class": "rate", "sensor_index": "1", - "sensor_type": "mikrotik-tx", - "sensor_descr": "SSID: Tx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": 0, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.2.1\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "1", - "sensor_type": "mikrotik-rx", - "sensor_descr": "SSID: Rx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": 0, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.3.1\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "2", - "sensor_type": "mikrotik-tx", - "sensor_descr": "SSID: WARKOP-KOPIBOSS-A Tx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": 0, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.2.2\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "2", - "sensor_type": "mikrotik-rx", - "sensor_descr": "SSID: WARKOP-KOPIBOSS-A Rx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": 0, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.3.2\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "8", - "sensor_type": "mikrotik-tx", - "sensor_descr": "SSID: WARKOP-KOPIBOSS Tx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": 0, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.2.8\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "8", - "sensor_type": "mikrotik-rx", - "sensor_descr": "SSID: WARKOP-KOPIBOSS Rx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": 0, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.3.8\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "9", - "sensor_type": "mikrotik-tx", - "sensor_descr": "SSID: WARKOP-KOPIBOSS Tx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": 0, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.2.9\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "9", - "sensor_type": "mikrotik-rx", - "sensor_descr": "SSID: WARKOP-KOPIBOSS Rx", - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_aggregator": "sum", - "sensor_current": 0, - "sensor_prev": 0, - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": 1, - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.3.9\"]" - }, - { - "sensor_deleted": 0, - "sensor_class": "rate", - "sensor_index": "4", "sensor_type": "mikrotik-60g-tx", - "sensor_descr": "Tx Rate", + "sensor_descr": "60G: MikroTik-e2f1fc", "sensor_divisor": 1, "sensor_multiplier": 1000000, "sensor_aggregator": "sum", "sensor_current": 2310000000, - "sensor_prev": 2310000000, + "sensor_prev": 2310, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -3738,14 +3444,14 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.9.1.8.4\"]" + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.8.1.13.1\"]" }, { "sensor_deleted": 0, "sensor_class": "ccq", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: ", + "sensor_descr": "2G: WARKOP-KOPIBOSS-B", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3766,7 +3472,7 @@ "sensor_class": "ccq", "sensor_index": "2", "sensor_type": "mikrotik", - "sensor_descr": "SSID: WARKOP-KOPIBOSS-A", + "sensor_descr": "5G: WARKOP-KOPIBOSS-A", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3808,7 +3514,7 @@ "sensor_class": "rssi", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-e2f1fc", + "sensor_descr": "60G: MikroTik-e2f1fc", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3829,7 +3535,7 @@ "sensor_class": "noise-floor", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-e2f1fc", + "sensor_descr": "2G: WARKOP-KOPIBOSS-B", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3850,7 +3556,7 @@ "sensor_class": "noise-floor", "sensor_index": "2", "sensor_type": "mikrotik", - "sensor_descr": "SSID: WARKOP-KOPIBOSS-A", + "sensor_descr": "5G: WARKOP-KOPIBOSS-A", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3913,7 +3619,49 @@ "sensor_class": "frequency", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-e2f1fc", + "sensor_descr": "2G: WARKOP-KOPIBOSS-B", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": 2412, + "sensor_prev": 2412, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.7.1\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "frequency", + "sensor_index": "2", + "sensor_type": "mikrotik", + "sensor_descr": "5G: WARKOP-KOPIBOSS-A", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": 5805, + "sensor_prev": 5805, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.7.2\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "frequency", + "sensor_index": "1", + "sensor_type": "mikrotik-60g", + "sensor_descr": "60G: MikroTik-e2f1fc", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -3932,14 +3680,14 @@ { "sensor_deleted": 0, "sensor_class": "distance", - "sensor_index": "1", + "sensor_index": "4", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-e2f1fc", - "sensor_divisor": 100000, - "sensor_multiplier": 0, + "sensor_descr": "60G: Sta > 4:d6:aa:a8:f:89", + "sensor_divisor": 1000, + "sensor_multiplier": 1, "sensor_aggregator": "sum", - "sensor_current": 0.0231, - "sensor_prev": 0.0231, + "sensor_current": 2.57, + "sensor_prev": 2570, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -3948,7 +3696,7 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.8.1.13.1\"]" + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.9.1.10.4\"]" } ] } diff --git a/tests/data/routeros_ltap-mini.json b/tests/data/routeros_ltap-mini.json new file mode 100644 index 0000000000..7383e2a9fb --- /dev/null +++ b/tests/data/routeros_ltap-mini.json @@ -0,0 +1,327 @@ +{ + "os": { + "discovery": { + "devices": [ + { + "sysName": "", + "sysObjectID": ".1.3.6.1.4.1.14988.1", + "sysDescr": "RouterOS RB912R-2nD", + "sysContact": null, + "version": null, + "hardware": "RB912R-2nD", + "features": null, + "os": "routeros", + "type": "network", + "serial": null, + "icon": "mikrotik.svg", + "location": null + } + ] + }, + "poller": "matches discovery" + }, + "wireless": { + "discovery": { + "wireless_sensors": [ + { + "sensor_deleted": 0, + "sensor_class": "clients", + "sensor_index": "2", + "sensor_type": "mikrotik", + "sensor_descr": "2G: MikroTik-XXXXXX", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": 0, + "sensor_prev": null, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.6.2\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "ccq", + "sensor_index": "2", + "sensor_type": "mikrotik", + "sensor_descr": "2G: MikroTik-XXXXXX", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": 0, + "sensor_prev": null, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.10.2\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "sinr", + "sensor_index": "3", + "sensor_type": "routeros", + "sensor_descr": "lte1: Signal SINR", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": 11, + "sensor_prev": null, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.16.1.1.7.3\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "rsrp", + "sensor_index": "3", + "sensor_type": "routeros", + "sensor_descr": "lte1: Signal RSRP", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": -105, + "sensor_prev": null, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.16.1.1.4.3\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "rsrq", + "sensor_index": "3", + "sensor_type": "routeros", + "sensor_descr": "lte1: Signal RSRQ", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": -10, + "sensor_prev": null, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.16.1.1.3.3\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "noise-floor", + "sensor_index": "2", + "sensor_type": "mikrotik", + "sensor_descr": "2G: MikroTik-XXXXXX", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": -113, + "sensor_prev": null, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.9.2\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "frequency", + "sensor_index": "2", + "sensor_type": "mikrotik", + "sensor_descr": "2G: MikroTik-XXXXXX", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": 2412, + "sensor_prev": null, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.7.2\"]" + } + ] + }, + "poller": { + "wireless_sensors": [ + { + "sensor_deleted": 0, + "sensor_class": "clients", + "sensor_index": "2", + "sensor_type": "mikrotik", + "sensor_descr": "2G: MikroTik-XXXXXX", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": 0, + "sensor_prev": 0, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.6.2\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "ccq", + "sensor_index": "2", + "sensor_type": "mikrotik", + "sensor_descr": "2G: MikroTik-XXXXXX", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": 0, + "sensor_prev": 0, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.10.2\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "sinr", + "sensor_index": "3", + "sensor_type": "routeros", + "sensor_descr": "lte1: Signal SINR", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": 11, + "sensor_prev": 11, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.16.1.1.7.3\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "rsrp", + "sensor_index": "3", + "sensor_type": "routeros", + "sensor_descr": "lte1: Signal RSRP", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": -105, + "sensor_prev": -105, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.16.1.1.4.3\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "rsrq", + "sensor_index": "3", + "sensor_type": "routeros", + "sensor_descr": "lte1: Signal RSRQ", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": -10, + "sensor_prev": -10, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.16.1.1.3.3\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "noise-floor", + "sensor_index": "2", + "sensor_type": "mikrotik", + "sensor_descr": "2G: MikroTik-XXXXXX", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": -113, + "sensor_prev": -113, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.9.2\"]" + }, + { + "sensor_deleted": 0, + "sensor_class": "frequency", + "sensor_index": "2", + "sensor_type": "mikrotik", + "sensor_descr": "2G: MikroTik-XXXXXX", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_aggregator": "sum", + "sensor_current": 2412, + "sensor_prev": 2412, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.3.1.7.2\"]" + } + ] + } + } +} diff --git a/tests/data/routeros_rblhgr.json b/tests/data/routeros_rblhgr.json index 51cdb33662..7b0dae211a 100644 --- a/tests/data/routeros_rblhgr.json +++ b/tests/data/routeros_rblhgr.json @@ -537,9 +537,9 @@ { "sensor_deleted": 0, "sensor_class": "sinr", - "sensor_index": "0", + "sensor_index": "1", "sensor_type": "routeros", - "sensor_descr": "Signal SINR", + "sensor_descr": "lte1: Signal SINR", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -558,9 +558,9 @@ { "sensor_deleted": 0, "sensor_class": "rsrp", - "sensor_index": "0", + "sensor_index": "1", "sensor_type": "routeros", - "sensor_descr": "Signal RSRP", + "sensor_descr": "lte1: Signal RSRP", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -579,9 +579,9 @@ { "sensor_deleted": 0, "sensor_class": "rsrq", - "sensor_index": "0", + "sensor_index": "1", "sensor_type": "routeros", - "sensor_descr": "Signal RSRQ", + "sensor_descr": "lte1: Signal RSRQ", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -604,9 +604,9 @@ { "sensor_deleted": 0, "sensor_class": "sinr", - "sensor_index": "0", + "sensor_index": "1", "sensor_type": "routeros", - "sensor_descr": "Signal SINR", + "sensor_descr": "lte1: Signal SINR", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -625,9 +625,9 @@ { "sensor_deleted": 0, "sensor_class": "rsrp", - "sensor_index": "0", + "sensor_index": "1", "sensor_type": "routeros", - "sensor_descr": "Signal RSRP", + "sensor_descr": "lte1: Signal RSRP", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -646,9 +646,9 @@ { "sensor_deleted": 0, "sensor_class": "rsrq", - "sensor_index": "0", + "sensor_index": "1", "sensor_type": "routeros", - "sensor_descr": "Signal RSRQ", + "sensor_descr": "lte1: Signal RSRQ", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", diff --git a/tests/data/routeros_wifi.json b/tests/data/routeros_wifi.json index 82120b6f52..20a99b79f1 100644 --- a/tests/data/routeros_wifi.json +++ b/tests/data/routeros_wifi.json @@ -1091,7 +1091,7 @@ "sensor_class": "quality", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-802fc1", + "sensor_descr": "60G: MikroTik-802fc1", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -1110,13 +1110,13 @@ { "sensor_deleted": 0, "sensor_class": "rate", - "sensor_index": "4", + "sensor_index": "1", "sensor_type": "mikrotik-60g-tx", - "sensor_descr": "Tx Rate", + "sensor_descr": "60G: MikroTik-802fc1", "sensor_divisor": 1, "sensor_multiplier": 1000000, "sensor_aggregator": "sum", - "sensor_current": 2310000000, + "sensor_current": 2310, "sensor_prev": null, "sensor_limit": null, "sensor_limit_warn": null, @@ -1126,14 +1126,14 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.9.1.8.4\"]" + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.8.1.13.1\"]" }, { "sensor_deleted": 0, "sensor_class": "rssi", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-802fc1", + "sensor_descr": "60G: MikroTik-802fc1", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -1153,8 +1153,8 @@ "sensor_deleted": 0, "sensor_class": "frequency", "sensor_index": "1", - "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-802fc1", + "sensor_type": "mikrotik-60g", + "sensor_descr": "60G: MikroTik-802fc1", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -1173,13 +1173,13 @@ { "sensor_deleted": 0, "sensor_class": "distance", - "sensor_index": "1", + "sensor_index": "4", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-802fc1", - "sensor_divisor": 100000, - "sensor_multiplier": 0, + "sensor_descr": "60G: Sta > b8:69:f4:7f:41:70", + "sensor_divisor": 1000, + "sensor_multiplier": 1, "sensor_aggregator": "sum", - "sensor_current": 0.0231, + "sensor_current": 18545, "sensor_prev": null, "sensor_limit": null, "sensor_limit_warn": null, @@ -1189,7 +1189,7 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.8.1.13.1\"]" + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.9.1.10.4\"]" } ] }, @@ -1200,7 +1200,7 @@ "sensor_class": "quality", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-802fc1", + "sensor_descr": "60G: MikroTik-802fc1", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -1219,14 +1219,14 @@ { "sensor_deleted": 0, "sensor_class": "rate", - "sensor_index": "4", + "sensor_index": "1", "sensor_type": "mikrotik-60g-tx", - "sensor_descr": "Tx Rate", + "sensor_descr": "60G: MikroTik-802fc1", "sensor_divisor": 1, "sensor_multiplier": 1000000, "sensor_aggregator": "sum", "sensor_current": 2310000000, - "sensor_prev": 2310000000, + "sensor_prev": 2310, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1235,14 +1235,14 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.9.1.8.4\"]" + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.8.1.13.1\"]" }, { "sensor_deleted": 0, "sensor_class": "rssi", "sensor_index": "1", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-802fc1", + "sensor_descr": "60G: MikroTik-802fc1", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -1262,8 +1262,8 @@ "sensor_deleted": 0, "sensor_class": "frequency", "sensor_index": "1", - "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-802fc1", + "sensor_type": "mikrotik-60g", + "sensor_descr": "60G: MikroTik-802fc1", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_aggregator": "sum", @@ -1282,14 +1282,14 @@ { "sensor_deleted": 0, "sensor_class": "distance", - "sensor_index": "1", + "sensor_index": "4", "sensor_type": "mikrotik", - "sensor_descr": "SSID: MikroTik-802fc1", - "sensor_divisor": 100000, - "sensor_multiplier": 0, + "sensor_descr": "60G: Sta > b8:69:f4:7f:41:70", + "sensor_divisor": 1000, + "sensor_multiplier": 1, "sensor_aggregator": "sum", - "sensor_current": 0.0231, - "sensor_prev": 0.0231, + "sensor_current": 18.545, + "sensor_prev": 18545, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -1298,7 +1298,7 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.8.1.13.1\"]" + "sensor_oids": "[\".1.3.6.1.4.1.14988.1.1.1.9.1.10.4\"]" } ] } diff --git a/tests/snmpsim/routeros_ltap-mini.snmprec b/tests/snmpsim/routeros_ltap-mini.snmprec new file mode 100644 index 0000000000..61d38b3330 --- /dev/null +++ b/tests/snmpsim/routeros_ltap-mini.snmprec @@ -0,0 +1,30 @@ +1.3.6.1.2.1.1.1.0|4|RouterOS RB912R-2nD +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.14988.1 +1.3.6.1.2.1.1.3.0|67|10395000 +1.3.6.1.2.1.1.5.0|4| +1.3.6.1.2.1.25.1.1.0|67|10395100 +1.3.6.1.4.1.14988.1.1.1.3.1.2.2|66|0 +1.3.6.1.4.1.14988.1.1.1.3.1.3.2|66|0 +1.3.6.1.4.1.14988.1.1.1.3.1.4.2|4|MikroTik-XXXXXX +1.3.6.1.4.1.14988.1.1.1.3.1.5.2|4| +1.3.6.1.4.1.14988.1.1.1.3.1.6.2|65|0 +1.3.6.1.4.1.14988.1.1.1.3.1.7.2|2|2412 +1.3.6.1.4.1.14988.1.1.1.3.1.8.2|4|2412/20-Ce/gn(18dBm) +1.3.6.1.4.1.14988.1.1.1.3.1.9.2|2|-113 +1.3.6.1.4.1.14988.1.1.1.3.1.10.2|65|0 +1.3.6.1.4.1.14988.1.1.1.3.1.11.2|65|0 +1.3.6.1.4.1.14988.1.1.14.1.1.2.2|4|wlan1 +1.3.6.1.4.1.14988.1.1.14.1.1.2.3|4|lte1 +1.3.6.1.4.1.14988.1.1.16.1.1.2.3|2|0 +1.3.6.1.4.1.14988.1.1.16.1.1.3.3|2|-10 +1.3.6.1.4.1.14988.1.1.16.1.1.4.3|2|-105 +1.3.6.1.4.1.14988.1.1.16.1.1.5.3|2|2100006 +1.3.6.1.4.1.14988.1.1.16.1.1.6.3|2|7 +1.3.6.1.4.1.14988.1.1.16.1.1.7.3|2|11 +1.3.6.1.4.1.14988.1.1.16.1.1.8.3|2|8400 +1.3.6.1.4.1.14988.1.1.16.1.1.9.3|2|0 +1.3.6.1.4.1.14988.1.1.16.1.1.10.3|2|2400 +1.3.6.1.4.1.14988.1.1.16.1.1.11.3|4|355654XXXXXXXXX +1.3.6.1.4.1.14988.1.1.16.1.1.12.3|4|234200XXXXXXXXX +1.3.6.1.4.1.14988.1.1.16.1.1.13.3|4|89442001XXXXXXXXXXXX +1.3.6.1.4.1.14988.1.1.16.1.1.14.3|4|Evolved 3G (LTE)