From 12f421772a26c55e9c0a9d2a87dc56cc12230fc4 Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 23 Apr 2015 22:35:23 +0100 Subject: [PATCH 1/2] allow detecting OpenBSD's own snmpd by sysObjectId --- includes/discovery/os/openbsd.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/discovery/os/openbsd.inc.php b/includes/discovery/os/openbsd.inc.php index 52bbf7177..22e97e5cb 100755 --- a/includes/discovery/os/openbsd.inc.php +++ b/includes/discovery/os/openbsd.inc.php @@ -2,7 +2,8 @@ if (!$os) { - if (preg_match("/OpenBSD/", $sysDescr)) { $os = "openbsd"; } + if (strstr($sysObjectId, ".1.3.6.1.4.1.30155.23.1")) { $os = "openbsd"; } # snmpd + if (preg_match("/OpenBSD/", $sysDescr)) { $os = "openbsd"; } # Net-SNMP } ?> From 31e5bf9d0435feb9483da661d8b0df42a9f994e7 Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 23 Apr 2015 23:14:29 +0100 Subject: [PATCH 2/2] I agree to the conditions of the Contributor Agreement --- AUTHORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.md b/AUTHORS.md index ad60a7f79..313bbfccd 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -20,6 +20,7 @@ Contributors to LibreNMS: - Joubert RedRat (joubertredrat) - Len Lin (Ultra2D) - Christopher Freas (nwautomator) +- Stuart Henderson (sthen) [1]: http://observium.org/ "Observium web site"