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

add raisecom os version, hardware and serial data (#10336)

Browse Source
This commit is contained in:
Vitali Kari
2019-06-15 14:49:03 +02:00
committed by Tony Murray
parent d4017c1428
commit 19914adc55
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/polling/os/raisecom.inc.php
View File

@@ -1,6 +1,10 @@
<?php
if (preg_match('/^ROAP Version ([^,]+)/', $device['sysDescr'], $regexp_result)) {
$r_temp = snmp_get_multi_oid($device, ['.1.3.6.1.4.1.8886.6.1.1.1.1.0', '.1.3.6.1.4.1.8886.6.1.1.1.2.0', '.1.3.6.1.4.1.8886.6.1.1.1.14.0'], '-OQUn');
$version = $r_temp['.1.3.6.1.4.1.8886.6.1.1.1.1.0'];
$hardware = $r_temp['.1.3.6.1.4.1.8886.6.1.1.1.2.0'];
$serial = $r_temp['.1.3.6.1.4.1.8886.6.1.1.1.14.0'];
if (empty($version) && (preg_match('/^ROAP Version ([^,]+)/', $device['sysDescr'], $regexp_result))) {
$version = $regexp_result[1];
#$serial = $regexp_result[2];
}

24
tests/data/raisecom.json
View File

@@ -25,12 +25,12 @@
"sysObjectID": ".1.3.6.1.4.1.8886.18.4.10",
"sysDescr": "ROAP Version ISCOM5508-EPSC_ROAP_2.61.3(a)_20161019.(Compiled Oct 19 2016, 19:12:24)",
"sysContact": "<private>",
"version": "ISCOM5508-EPSC_ROAP_2.61.3(a)_20161019.(Compiled Oct 19 2016",
"hardware": null,
"version": "8.2.29_20180611",
"hardware": "RAX711-C-DC/D-02 version A.02",
"features": null,
"os": "raisecom",
"type": "network",
"serial": null,
"serial": "123002030702S18B08S0001G",
"icon": "raisecom.png",
"location": "<private>"
}
@@ -300,9 +300,9 @@
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": 0.998,
"sensor_limit": 1.1476999999999999,
"sensor_limit": 1.1477,
"sensor_limit_warn": null,
"sensor_limit_low": 0.84830000000000005,
"sensor_limit_low": 0.8483,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -323,10 +323,10 @@
"group": "",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": 0.98399999999999999,
"sensor_limit": 1.1315999999999999,
"sensor_current": 0.984,
"sensor_limit": 1.1316,
"sensor_limit_warn": null,
"sensor_limit_low": 0.83640000000000003,
"sensor_limit_low": 0.8364,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -350,7 +350,7 @@
"sensor_current": 1.107,
"sensor_limit": 1.27305,
"sensor_limit_warn": null,
"sensor_limit_low": 0.94094999999999995,
"sensor_limit_low": 0.94095,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -372,9 +372,9 @@
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": 1.51,
"sensor_limit": 1.7364999999999999,
"sensor_limit": 1.7365,
"sensor_limit_warn": null,
"sensor_limit_low": 1.2835000000000001,
"sensor_limit_low": 1.2835,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -396,7 +396,7 @@
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": 1.75,
"sensor_limit": 2.0125000000000002,
"sensor_limit": 2.0125,
"sensor_limit_warn": null,
"sensor_limit_low": 1.4875,
"sensor_limit_low_warn": null,

3
tests/snmpsim/raisecom.snmprec
View File

@@ -37,4 +37,7 @@
1.3.6.1.4.1.8886.1.24.2.1.1.5.2|2|0
1.3.6.1.4.1.8886.1.24.2.1.1.6.1|2|2
1.3.6.1.4.1.8886.1.24.2.1.1.6.2|2|2
1.3.6.1.4.1.8886.6.1.1.1.1.0|4|8.2.29_20180611
1.3.6.1.4.1.8886.6.1.1.1.2.0|4|RAX711-C-DC/D-02 version A.02
1.3.6.1.4.1.8886.6.1.1.1.14.0|4|123002030702S18B08S0001G
1.3.6.1.6.3.10.2.1.3.0|2|1548438243