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 QNAP os polling (#11938)

Browse Source 
* Remove old qnap code.

* Fixed test
This commit is contained in:
TheGreatDoc
2020-07-18 00:14:16 +02:00
committed by GitHub
parent 334d50467c
commit 1a8c4df880
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/polling/os/unix.inc.php
View File

@ -154,10 +154,6 @@ if (in_array($device['os'], array("linux", "endian", "proxmox", "recoveryos")))
list(,,$version,$hardware,$freebsda, $freebsdb, $arch) = explode(" ", $device['sysDescr']);
$features = $freebsda . " " . $freebsdb;
$hardware = "$hardware ($arch)";
} elseif ($device['os'] == "qnap") {
$hardware = snmp_get($device, "ENTITY-MIB::entPhysicalName.1", "-Osqnv");
$version = snmp_get($device, "ENTITY-MIB::entPhysicalFirmwareRev.1", "-Osqnv");
$serial = snmp_get($device, "ENTITY-MIB::entPhysicalSerial.1", "-Osqnv");
} elseif ($device['os'] == "dsm") {
# This only gets us the build, not the actual version number, so won't use this.. yet.
# list(,,,$version,) = explode(" ",$device['sysDescr'],5);

19
tests/data/qnap.json
View File

@ -18,24 +18,7 @@
}
]
},
"poller": {
"devices": [
{
"sysName": "",
"sysObjectID": ".1.3.6.1.4.1.24681",
"sysDescr": "Linux hostname 4.2.2",
"sysContact": null,
"version": "4.3.3",
"hardware": "Turbo NAS TVS-871U-RP",
"features": null,
"os": "qnap",
"type": "storage",
"serial": null,
"icon": "qnap.svg",
"location": null
}
]
}
"poller": "matches discovery"
},
"ports": {
"discovery": {