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

Restore OpenBSD version/features/hardware (#8673)

Browse Source 
* Restore OpenBSD version/features/hardware

* Add os test data

* Update openbsd.inc.php
This commit is contained in:
Tony Murray
2018-05-08 20:05:09 -05:00
committed by GitHub
parent 8ce423dd2d
commit b94ad929b8
3 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
includes/polling/os/openbsd.inc.php
View File

@@ -2,6 +2,9 @@
use LibreNMS\RRD\RrdDefinition; use LibreNMS\RRD\RrdDefinition;
list(,,$version,$features,$hardware) = explode(" ", $device['sysDescr']);
$features = str_replace(['(', ')'], '', $features);
$oids = snmp_get_multi($device, 'pfStateCount.0 pfStateSearches.0 pfStateInserts.0 pfStateRemovals.0', '-OQUs', 'OPENBSD-PF-MIB'); $oids = snmp_get_multi($device, 'pfStateCount.0 pfStateSearches.0 pfStateInserts.0 pfStateRemovals.0', '-OQUs', 'OPENBSD-PF-MIB');
$states = $oids[0]['pfStateCount']; $states = $oids[0]['pfStateCount'];

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

@@ -125,7 +125,7 @@ if ($device['os'] == "linux" || $device['os'] == "endian" || $device['os'] == "p
$features = str_replace("(", "", $features); $features = str_replace("(", "", $features);
$features = str_replace(")", "", $features); $features = str_replace(")", "", $features);
list(,,$hardware) = explode("$features", $device['sysDescr']); list(,,$hardware) = explode("$features", $device['sysDescr']);
} elseif ($device['os'] == "openbsd" || $device['os'] == "solaris" || $device['os'] == "opensolaris") { } elseif ($device['os'] == "solaris" || $device['os'] == "opensolaris") {
list(,,$version,$features,$hardware) = explode(" ", $device['sysDescr']); list(,,$version,$features,$hardware) = explode(" ", $device['sysDescr']);
$features = str_replace("(", "", $features); $features = str_replace("(", "", $features);
$features = str_replace(")", "", $features); $features = str_replace(")", "", $features);

40
tests/data/openbsd_1.json Normal file
View File

@@ -0,0 +1,40 @@
{
"os": {
"discovery": {
"devices": [
{
"sysName": "",
"sysObjectID": ".1.3.6.1.4.1.8072.3.2.12",
"sysDescr": "OpenBSD hostname 5.3 GENERIC.MP#58 i386",
"sysContact": null,
"version": null,
"hardware": "",
"features": null,
"location": null,
"os": "openbsd",
"type": "server",
"serial": null,
"icon": "openbsd.svg"
}
]
},
"poller": {
"devices": [
{
"sysName": "",
"sysObjectID": ".1.3.6.1.4.1.8072.3.2.12",
"sysDescr": "OpenBSD hostname 5.3 GENERIC.MP#58 i386",
"sysContact": null,
"version": "5.3",
"hardware": "i386",
"features": "GENERIC.MP#58",
"location": null,
"os": "openbsd",
"type": "server",
"serial": null,
"icon": "openbsd.svg"
}
]
}
}
}