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 os additional information for some that were broke (#9466)

Browse Source 
* Fix os additional information for several OS.
$poll_device is not available, use $device

* fix draytek test data
This commit is contained in:
Tony Murray
2018-11-27 21:31:26 -06:00
committed by GitHub
parent 9a5ac514a5
commit dc8647697f
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/polling/os/cnpilote.inc.php
View File

@@ -10,7 +10,7 @@
*/
$version = $poll_device['sysDescr'];
$version = $device['sysDescr'];
$cnpilot_data = snmp_get_multi_oid($device, 'cambiumAPSerialNum.0 cambiumAPHWType.0', '-OUQs', 'CAMBIUM-MIB');
$hardware = $cnpilot_data['cambiumAPHWType.0'];

2
includes/polling/os/draytek.inc.php
View File

@@ -3,7 +3,7 @@
* draytek.inc.php
* @author Jason Cheng <sanyu3u@gmail.com>
*/
preg_match('/Router Model: ([\w ]+), Version: ([\w\.]+)/', $poll_device['sysDescr'], $tmp_draytek);
preg_match('/Router Model: ([\w ]+), Version: ([\w\.]+)/', $device['sysDescr'], $tmp_draytek);
$hardware = $tmp_draytek[1];
$version = $tmp_draytek[2];
unset($tmp_draytek);

2
includes/polling/os/ironware.inc.php
View File

@@ -12,7 +12,7 @@ if (strpos($version, '.')) {
} else {
// Brocade NetIron CER, Extended route scalability, IronWare Version V5.6.0fT183 Compiled on Mar 27 2015 at 02:13:25 labeled as V5.6.00fb
// Brocade MLXe (System Mode: XMR), IronWare Version V5.6.0gT163 Compiled on Aug 27 2015 at 23:23:54 labeled as V5.6.00g
preg_match('/IronWare Version (.*) Compiled on/', $poll_device['sysDescr'], $regexp_result);
preg_match('/IronWare Version (.*) Compiled on/', $device['sysDescr'], $regexp_result);
$version = $regexp_result[1];
$version = str_replace('V', '', $version);
}

2
includes/polling/os/ptp500.inc.php
View File

@@ -2,6 +2,6 @@
use LibreNMS\RRD\RrdDefinition;
$version = $poll_device['sysDescr'];
$version = $device['sysDescr'];
$masterSlaveMode = ucfirst(snmp_get($device, 'masterSlaveMode.0', '-Oqv', "CAMBIUM-PTP500-V2-MIB"));
$hardware = 'PTP 500 '. $masterSlaveMode;

2
includes/polling/os/ptp600.inc.php
View File

@@ -24,6 +24,6 @@
*/
use LibreNMS\RRD\RrdDefinition;
$version = $poll_device['sysDescr'];
$version = $device['sysDescr'];
$masterSlaveMode = ucfirst(snmp_get($device, 'masterSlaveMode.0', '-Oqv', "CANOPY-SYS-MIB"));
$hardware = 'PTP 600 '.$masterSlaveMode;

2
includes/polling/os/ptp800.inc.php
View File

@@ -24,5 +24,5 @@
*/
use LibreNMS\RRD\RrdDefinition;
$version = $poll_device['sysDescr'];
$version = $device['sysDescr'];
$hardware = 'PTP 800';

4
tests/data/draytek.json
View File

@@ -25,8 +25,8 @@
"sysObjectID": ".1.3.6.1.4.1.7367",
"sysDescr": "DrayTek Corporation, Router Model: Vigor2920 Series, Version: 3.8.8.2, Build Date/Time:May 21 2018 16:45:55",
"sysContact": "<private>",
"version": null,
"hardware": null,
"version": "3.8.8.2",
"hardware": "Vigor2920 Series",
"features": null,
"location": "<private>",
"os": "draytek",