refactor: move more discovery into yaml files including compound discovery and regex

includes/definitions/acano.yaml

@@ -6,6 +6,8 @@ over:
     - { graph: device_bits }
     - { graph: device_processor, text: 'CPU Usage' }
 icon: cisco
+discovery:
+    - { sysObjectId: .1.3.6.1.4.1.8072.3.2.10, sysDescr: 'Acano' }
 poller_modules:
     cisco-cbqos: 1
     cisco-cef: 1

includes/definitions/acsw.yaml

@@ -28,3 +28,8 @@ discovery_modules:
     cisco-pw: 1
     cisco-vrf: 1
     cisco-vrf-lite: 1
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.9.1.1291
+    - sysDescr:
+        - 'Application Control Engine'
+        - 'Cisco Application Control Software'

includes/definitions/adtran-aos.yaml

@@ -8,3 +8,6 @@ over:
     - { graph: device_bits, text: 'Device Traffic' }
     - { graph: device_processor, text: 'CPU Usage' }
     - { graph: device_mempool, text: 'Memory Usage' }
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.664
+    - sysDescr: 'NetVanta'

includes/definitions/axiscam.yaml

@@ -2,3 +2,5 @@ os: axiscam
 text: 'AXIS Network Camera'
 type: network
 icon: axis
+discovery:
+    - sysDescr_regex: '/AXIS .* (Network Camera|Video Server|Network Video Encoder)/'

includes/definitions/axisdocserver.yaml

@@ -2,3 +2,5 @@ os: axisdocserver
 text: 'AXIS Network Document Server'
 type: network
 icon: axis
+discovery:
+    - sysDescr_regex: '/^AXIS .* Network Document Server/'

includes/definitions/barracudaloadbalancer.yaml

@@ -4,3 +4,5 @@ type: loadbalancer
 icon: barracuda
 over:
     - { graph: device_bits, text: Traffic }
+discovery:
+    - sysDescr: 'Barracuda Load Balancer'

includes/definitions/brother.yaml

@@ -4,3 +4,5 @@ text: 'Brother Printer'
 type: printer
 over:
     - { graph: device_toner, text: Toner }
+discovery:
+    - sysDescr_regex: /Brother NC-.*(h|w),/

includes/definitions/comware.yaml

@@ -4,3 +4,7 @@ type: network
 icon: hp
 over:
     - { graph: device_bits, text: Traffic }
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.25506.11.1
+    - sysDescr: Comware
+    - sysDescr_regex: '/HP [a-zA-Z0-9- ]+ Switch Software Version/'

includes/definitions/dell-laser.yaml

@@ -8,3 +8,8 @@ over:
     - { graph: device_toner, text: Toner }
 mib_dir:
     - dell
+discovery:
+    - sysDescr:
+        - 'Dell Color Laser'
+        - 'Dell Laser Printer'
+    - sysDescr_regex: '/^Dell.*MFP/'

includes/definitions/dell-rcs.yaml

@@ -6,3 +6,5 @@ over:
     - { graph: device_bits, text: 'Device Traffic' }
 mib_dir:
     - dell
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.10418.18.21.17

includes/definitions/dlinkap.yaml

@@ -2,3 +2,8 @@ os: dlinkap
 text: 'D-Link Access Point'
 type: wireless
 icon: dlink
+discovery:
+    - sysDescr:
+        - 'D-Link DAP-'
+        - 'D-Link Access Point'
+    - sysDescr_regex: '/D-Link .* AP/'

includes/definitions/drac.yaml

@@ -4,3 +4,8 @@ icon: dell
 type: server
 mib_dir:
     - dell
+discovery:
+    - sysObjectId:
+        - .1.3.6.1.4.1.674.10892.2
+        - .1.3.6.1.4.1.674.10892.5
+    - sysDescr: 'Dell Out-of-band SNMP Agent for Remote Access Controller'

includes/definitions/eatonpdu.yaml

@@ -6,3 +6,5 @@ mib_dir:
     - eaton
 over:
     - { graph: device_current, text: Current }
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.534.6.6.7

includes/definitions/eatonups.yaml

@@ -8,3 +8,6 @@ over:
     - { graph: device_frequency, text: Frequencies }
 mib_dir:
     - ups
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.534.
+    - sysDescr: 'Eaton 5P'

includes/definitions/enterasys.yaml

@@ -5,3 +5,6 @@ over:
     - { graph: device_bits, text: 'Device Traffic' }
 icon: enterasys
 ifname: 1
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.5624.2.1
+    - sysDescr: 'Enterasys Networks'

includes/definitions/fiberhome.yaml

@@ -2,3 +2,5 @@ os: fiberhome
 text: Fiberhome
 type: network
 icon: fiberhome
+discovery:
+    - sysDescr_regex: '/^AN5516-0[16]$/'

includes/definitions/generex-ups.yaml

@@ -2,6 +2,8 @@ os: generex-ups
 text: 'Generex UPS SNMP adapter'
 type: power
 icon: generex-ups
+discovery:
+    - { sysObjectId: .1.3.6.1.2.1.33, sysDescr: [CS121, CS141]}
 discovery_modules:
     storage: 0
     bgp-peers: 0

includes/definitions/hpmsm.yaml

@@ -4,3 +4,25 @@ type: wireless
 icon: hp
 over:
     - { graph: device_bits, text: Traffic }
+discovery:
+    - sysObjectId:
+        - .1.3.6.1.4.1.8744.1.40
+        - .1.3.6.1.4.1.8744.1.41
+        - .1.3.6.1.4.1.8744.1.42
+        - .1.3.6.1.4.1.8744.1.43
+        - .1.3.6.1.4.1.8744.1.44
+        - .1.3.6.1.4.1.8744.1.45
+        - .1.3.6.1.4.1.8744.1.46
+        - .1.3.6.1.4.1.8744.1.47
+        - .1.3.6.1.4.1.8744.1.48
+        - .1.3.6.1.4.1.8744.1.49
+        - .1.3.6.1.4.1.8744.1.50
+        - .1.3.6.1.4.1.8744.1.51
+        - .1.3.6.1.4.1.8744.1.52
+        - .1.3.6.1.4.1.8744.1.53
+        - .1.3.6.1.4.1.8744.1.54
+        - .1.3.6.1.4.1.8744.1.55
+        - .1.3.6.1.4.1.8744.1.56
+        - .1.3.6.1.4.1.8744.1.57
+        - .1.3.6.1.4.1.8744.1.59
+        - .1.3.6.1.4.1.8744.1.67

includes/definitions/junos.yaml

@@ -5,6 +5,11 @@ over:
     - { graph: device_bits, text: 'Device Traffic' }
     - { graph: device_processor, text: 'CPU Usage' }
     - { graph: device_mempool, text: 'Memory Usage' }
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.2636
+    - sysDescr:
+        - 'kernel JUNOS'
+        - 'kernel Junos'
 poller_modules:
     wifi: 0
     toner: 0

includes/definitions/macosx.yaml

@@ -4,3 +4,8 @@ type: server
 icon: apple
 over:
     - { graph: device_bits, text: Traffic }
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.8072.3.2.16
+    - sysDescr:
+        - 'Darwin Kernel Version 15'
+        - 'Darwin Kernel Version 16'

includes/definitions/netgear.yaml

@@ -6,3 +6,6 @@ bad_if:
     - cpu
 over:
     - { graph: device_bits, text: 'Device Traffic' }
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.4526
+    - sysDescr: ProSafe

includes/definitions/netmanplus.yaml

@@ -5,3 +5,6 @@ nobulk: 1
 type: power
 over:
     - { graph: device_current, text: Current }
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.5491.6
+    - sysDescr_regex: '/^NetMan.*plus/'

includes/definitions/nos.yaml

@@ -7,3 +7,9 @@ over:
     - { graph: device_processor, text: 'CPU Usage' }
     - { graph: device_mempool, text: 'Memory Usage' }
 icon: brocade
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.1588.2.2.1.1
+    - sysDescr:
+        - 'Brocade VDX'
+        - 'BR-VDX'
+        - 'VDX67'

includes/definitions/openbsd.yaml

@@ -7,3 +7,6 @@ processor_stacked: 1
 over:
     - { graph: device_processor, text: 'Processor Usage' }
     - { graph: device_ucd_memory, text: 'Memory Usage' }
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.30155.23.1
+    - sysDescr: OpenBSD

includes/definitions/procurve.yaml

@@ -8,3 +8,12 @@ over:
     - { graph: device_mempool, text: 'Memory Usage' }
 mib_dir:
     - hp
+discovery:
+    - sysDescr:
+        - 'ProCurve'
+        - 'PROCURVE'
+        - 'HP 1820'
+    - sysDescr_regex:
+        - '/eCos-[0-9.]+/'
+        - '/HP(.+)2530(.+)/'
+        - '/HP(.+)54[0-1][2-6]R(.+)/'

includes/definitions/windows.yaml

@@ -3,3 +3,6 @@ type: server
 text: 'Microsoft Windows'
 ifname: 1
 processor_stacked: 1
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.311.1.1.3
+    - sysDescr: Windows

includes/discovery/os/acano.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.8072.3.2.10') && str_contains($sysDescr, 'Acano')) {
-    $os = 'acano';
-}

includes/discovery/os/acsw.inc.php

@@ -1,7 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, array('Application Control Engine', 'Cisco Application Control Software'))) {
-    $os = 'acsw';
-} elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.9.1.1291')) {
-    $os = 'acsw';
-}

includes/discovery/os/adtran-aos.inc.php

@@ -1,18 +0,0 @@
-<?php
-/*
- * LibreNMS ADTRAN AOS OS Discovery module
- *
- * Copyright (c) 2016 Chris A. Evans <thecityofguanyu@outlook.com>
- *
- * 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.
- */
-
-if (str_contains($sysDescr, 'NetVanta')) {
-    $os = 'adtran-aos';
-} elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.664')) {
-    $os = 'adtran-aos';
-}

includes/discovery/os/axiscam.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (preg_match('/AXIS .* (Network Camera|Video Server|Network Video Encoder)/', $sysDescr)) {
-    $os = 'axiscam';
-}

includes/discovery/os/axisdocserver.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (preg_match('/^AXIS .* Network Document Server/', $sysDescr)) {
-    $os = 'axisdocserver';
-}

includes/discovery/os/barracudaloadbalancer.inc.php

@@ -1,15 +0,0 @@
-<?php
-/*
- * LibreNMS Barracuda OS information module
- *
- * Copyright (c) 2015 Søren Friis Rosiak <sorenrosiak@gmail.com>
- * 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.
- */
-
-if (str_contains($sysDescr, array('Barracuda Load Balancer', 'Barracuda Load Balancer ADC'), true)) {
-    $os = 'barracudaloadbalancer';
-}

includes/discovery/os/brother.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (preg_match('/Brother NC-.*(h|w),/', $sysDescr)) {
-    $os = 'brother';
-}

includes/discovery/os/ciscowlc.inc.php

@@ -1,15 +0,0 @@
-<?php
-/*
- * LibreNMS Cisco wireless controller OS detection module
- *
- * Copyright (c) 2016 Tuomas Riihimäki <tuomari@iudex.fi>
- * 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.
- */
-
-if (str_contains($sysDescr, 'Cisco Controller')) {
-    $os = 'ciscowlc';
-}

includes/discovery/os/comware.inc.php

@@ -1,9 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, 'Comware')) {
-    $os = 'comware';
-} elseif (preg_match('/HP [a-zA-Z0-9- ]+ Switch Software Version/', $sysDescr)) {
-    $os = 'comware';
-} elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.25506.11.1')) {
-    $os = 'comware';
-}

includes/discovery/os/deliberant.inc.php

@@ -1,15 +0,0 @@
-<?php
-/*
- * LibreNMS
- *
- * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com> 
- * 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.
- */
-
-if (str_contains($sysDescr, 'Deliberant')) {
-    $os = 'deliberant';
-}

includes/discovery/os/dell-laser.inc.php

@@ -1,7 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, array('Dell Color Laser', 'Dell Laser Printer'))) {
-        $os = 'dell-laser';
-} elseif (preg_match('/^Dell.*MFP/', $sysDescr)) {
-        $os = 'dell-laser';
-}

includes/discovery/os/dell-rcs.inc.php

@@ -1,28 +0,0 @@
-<?php
-/**
- * dell-rcs.inc.php
- *
- * LibreNMS os discovery module for Dell Remote Console
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @package    LibreNMS
- * @link       http://librenms.org
- * @copyright  2016 Neil Lathwood
- * @author     Neil Lathwood <neil@lathwood.co.uk>
- */
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.10418.18.21.17')) {
-    $os = 'dell-rcs';
-}

includes/discovery/os/dlinkap.inc.php

@@ -1,7 +0,0 @@
-<?php
-
-if (preg_match('/D-Link .* AP/', $sysDescr)) {
-    $os = 'dlinkap';
-} elseif (str_contains($sysDescr, array('D-Link DAP-', 'D-Link Access Point'))) {
-    $os = 'dlinkap';
-}

includes/discovery/os/drac.inc.php

@@ -1,8 +0,0 @@
-<?php
-
-// DRAC5, iDRAC6  - 1.3.6.1.4.1.674.10892.2
-// iDRAC7, iDRAC8 - 1.3.6.1.4.1.674.10892.5
-if (str_contains($sysDescr, 'Dell Out-of-band SNMP Agent for Remote Access Controller') ||
-    starts_with($sysObjectId, array('.1.3.6.1.4.1.674.10892.2', '.1.3.6.1.4.1.674.10892.5'))) {
-    $os = 'drac';
-}

includes/discovery/os/eatonpdu.inc.php

@@ -1,15 +0,0 @@
-<?php
-/*
- * LibreNMS
- *
- * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com> 
- * 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.
- */
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.534.6.6.7')) {
-    $os = 'eatonpdu';
-}

includes/discovery/os/eatonups.inc.php

@@ -1,5 +0,0 @@
-<?php
-// Eaton UPS
-if (starts_with($sysDescr, 'Eaton 5P') || starts_with($sysObjectId, '.1.3.6.1.4.1.534.')) {
-    $os = 'eatonups';
-}

includes/discovery/os/enterasys.inc.php

@@ -1,7 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, 'Enterasys Networks')) {
-    $os = 'enterasys';
-} elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.5624.2.1')) {
-    $os = 'enterasys';
-}

includes/discovery/os/fiberhome.inc.php

@@ -1,10 +0,0 @@
-<?php
-
-/**
- * Supported Devides List
- * OLT AN5516-06
- * OLT AN5516-01
- */
-if (preg_match('/^AN5516-0[16]$/', $sysDescr)) {
-        $os = "fiberhome";
-}

includes/discovery/os/generex-ups.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, array('CS121', 'CS141')) && str_contains($sysObjectId, '.1.3.6.1.2.1.33')) {
-    $os = 'generex-ups';
-}

includes/discovery/os/hpmsm.inc.php

@@ -1,19 +0,0 @@
-<?php
-/*
- * LibreNMS
- *
- * Copyright (c) 2015 Søren Friis Rosiak <sorenrosiak@gmail.com>
- * 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.
- */
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.8744.1')) {
-    $split_oid = explode('.', $sysObjectId);
-    $model_oid = $split_oid[count($split_oid)-1];
-    if ($model_oid >= 40 && $model_oid < 60 || $model_oid = 67) {
-        $os = 'hpmsm';
-    }
-}

includes/discovery/os/ironware.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, 'IronWare')) {
-    $os = 'ironware';
-}

includes/discovery/os/junos.inc.php

@@ -1,7 +0,0 @@
-<?php
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.2636')) {
-    $os = 'junos';
-} elseif (str_contains($sysDescr, 'kernel JUNOS', true)) {
-    $os = 'junos';
-}

includes/discovery/os/jwos.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.8239.1.2.9')) {
-    $os = 'jwos';
-}

includes/discovery/os/lcos.inc.php

@@ -1,35 +0,0 @@
-<?php
-/**
- * lcos.inc.php
- *
- * LibreNMS os discovery module for Lancom
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @package    LibreNMS
- * @link       http://librenms.org
- * @copyright  2016 Neil Lathwood
- * @author     Neil Lathwood <neil@lathwood.co.uk>
- */
-
-$lcos_oids = array(
-    '.1.3.6.1.4.1.2356.11.8.103',
-    '.1.3.6.1.4.1.2356.600.6.310',
-);
-
-if (starts_with($sysObjectId, $lcos_oids)) {
-    $os = 'lcos';
-}
-
-unset($lcos_oids);

includes/discovery/os/linux.inc.php

@@ -9,6 +9,7 @@ $skip_oids = array(
     '.1.3.6.1.4.1.7779.', // nios
     '.1.3.6.1.4.1.9.1.1348', // Cisco Unified Communications Manager
     '.1.3.6.1.4.1.3375.2.1', // F5
+    '.1.3.6.1.4.1.534.', // Eaton
 );
 
 if (starts_with($sysDescr, 'Linux') && !starts_with($sysObjectId, $skip_oids)) {

includes/discovery/os/macosx.inc.php

@@ -1,15 +0,0 @@
-<?php
-/*
- * LibreNMS
- *
- * Copyright (c) 2015 Søren Friis Rosiak <sorenrosiak@gmail.com>
- * 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.
- */
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.8072.3.2.16') || str_contains($sysDescr, array('Darwin Kernel Version 15', 'Darwin Kernel Version 16'))) {
-    $os = 'macosx';
-}

includes/discovery/os/netgear.inc.php

@@ -1,7 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, 'ProSafe')) {
-    $os = 'netgear';
-} elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.4526')) {
-    $os = 'netgear';
-}

includes/discovery/os/netmanplus.inc.php

@@ -1,7 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, 'NetMan') && str_contains($sysDescr, 'plus')) {
-    $os = 'netmanplus';
-} elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.5491.6')) {
-    $os = 'netmanplus';
-}

includes/discovery/os/nos.inc.php

@@ -1,13 +0,0 @@
-<?php
-
-$nos_objectid = array(
-    '.1.3.6.1.4.1.1588.2.2.1.1',
-);
-
-if (str_contains($sysDescr, array('Brocade VDX', 'BR-VDX', 'VDX67'))) {
-    $os = 'nos';
-} elseif (starts_with($sysObjectId, $nos_objectid)) {
-    $os = 'nos';
-}
-
-unset($nos_objectid);

includes/discovery/os/openbsd.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.30155.23.1') || str_contains($sysDescr, 'OpenBSD')) {
-    $os = 'openbsd';
-}

includes/discovery/os/procurve.inc.php

@@ -1,11 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, array('ProCurve', 'HP 1820'), true)) {
-    $os = 'procurve';
-} elseif (preg_match('/eCos-[0-9.]+/', $sysDescr)) {
-    $os = 'procurve';
-} elseif (preg_match('/HP(.+)2530(.+)/', $sysDescr)) {
-    $os = 'procurve';
-} elseif (preg_match('/HP(.+)54[0-1][2-6]R(.+)/', $sysDescr)) {
-    $os = 'procurve';
-}

includes/discovery/os/raisecom.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.8886')) {
-    $os = 'raisecom';
-}

includes/discovery/os/windows.inc.php

@@ -1,9 +0,0 @@
-<?php
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.311.1.1.3')) {
-    $os = 'windows';
-}
-
-if (str_contains($sysDescr, array('Windows'))) {
-    $os = 'windows';
-}

tests/snmpsim/generex-ups.snmprec

@@ -1,2 +1,2 @@
 1.3.6.1.2.1.1.1.0|4|"CS121 v 5.14.50"
-1.3.6.1.2.1.1.2.0|4|.1.3.6.1.2.1.33
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.2.1.33

tests/snmpsim/generex-ups1.snmprec

@@ -1,3 +1,3 @@
 1.3.6.1.2.1.1.1.0|4|CS121 
-1.3.6.1.2.1.1.2.0|4|.1.3.6.1.2.1.33
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.2.1.33
 1.3.6.1.2.1.33.1.1.1.0|4|Multimatic

tests/snmpsim/generex-ups2.snmprec

@@ -1,3 +1,3 @@
 1.3.6.1.2.1.1.1.0|4|CS121
-1.3.6.1.2.1.1.2.0|4|.1.3.6.1.2.1.33
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.2.1.33
 1.3.6.1.2.1.33.1.1.1.0|4|S2S

tests/snmpsim/hpmsm.snmprec

@@ -1 +1 @@
-1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8744.1
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8744.1.50