Merge pull request #1135 from paulgear/master

Expand Ruckus model support
This commit is contained in:
Daniel Preussker
2015-05-26 14:42:24 +00:00
3 changed files with 21 additions and 4 deletions
+1 -1
View File
@@ -10,7 +10,7 @@
* the source code distribution for details.
*/
if (!$os) {
if (strstr($sysObjectId, ".1.3.6.1.4.1.25053.3.1.4")) {
if (strstr($sysObjectId, ".1.3.6.1.4.1.25053.3.1")) {
$os = "ruckuswireless";
}
}
+9
View File
@@ -1192,3 +1192,12 @@ function id_to_target($id) {
}
return $id;
}
function first_oid_match($device, $list) {
foreach ($list as $item) {
$tmp = trim(snmp_get($device, $item, "-Ovq"), '" ');
if (!empty($tmp)) {
return $tmp;
}
}
}
+11 -3
View File
@@ -3,13 +3,21 @@
* LibreNMS Ruckus Wireless OS information module
*
* Copyright (c) 2015 Søren Friis Rosiak <sorenrosiak@gmail.com>
* Copyright (c) 2015 Gear Consulting Pty Ltd <github@libertysys.com.au>
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version. Please see LICENSE.txt at the top level of
* the source code distribution for details.
*/
$hardware = trim(snmp_get($device, ".1.3.6.1.4.1.25053.1.1.2.1.1.1.1.0", "-Ovq") , '" ');
$version = trim(snmp_get($device, ".1.3.6.1.4.1.25053.1.1.3.1.1.1.1.1.3.1", "-Ovq") , '" ');
$serial = trim(snmp_get($device, ".1.3.6.1.4.1.25053.1.1.2.1.1.1.2.0", "-Ovq") , '" ');
$ruckusmodels = array(
".1.3.6.1.2.1.1.1.0",
".1.3.6.1.4.1.25053.1.2.1.1.1.1.9.0",
".1.3.6.1.4.1.25053.1.1.2.1.1.1.1.0",
);
$hardware = first_oid_match($device, $ruckusmodels);
$productmib = trim(snmp_get($device, ".1.3.6.1.2.1.1.2.0", "-Oqv"), '" ');
$version = first_oid_match($device, array("$productmib.8.0", ".1.3.6.1.4.1.25053.1.1.3.1.1.1.1.1.3.1"));
$serial = first_oid_match($device, array("$productmib.7.0", ".1.3.6.1.4.1.25053.1.1.2.1.1.1.2.0"));
?>