refactor: move more os discovery to yaml files (#5367)

* refactor: move more os discovery to yaml files

* added missing i

* small updates

includes/definitions/asa.yaml

@@ -39,3 +39,6 @@ discovery_modules:
     cisco-pw: 1
     cisco-vrf: 1
     cisco-vrf-lite: 1
+discovery:
+    - sysDescr_regex:
+        - '/^Cisco Adaptive Security Appliance/'

includes/definitions/avocent.yaml

@@ -2,3 +2,7 @@ os: avocent
 text: Avocent
 type: network
 icon: avocent
+discovery:
+    - sysDescr_regex:
+        - '/^Avocent/'
+        - '/^AlterPath/'

includes/definitions/bnt.yaml

@@ -2,3 +2,7 @@ os: bnt
 text: 'Blade Network Technologies'
 type: network
 icon: bnt
+discovery:
+    - sysDescr_regex:
+        - '/Blade Network Technologies/i'
+        - '/^BNT /'

includes/definitions/brother.yaml

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

includes/definitions/canopy.yaml

@@ -5,3 +5,7 @@ icon: cambium
 over:
     - { graph: device_bits, text: 'Device Traffic' }
 group: cambium
+discovery:
+    - sysDescr_regex:
+        - '/^CANOPY/'
+        - '/^CMM/'

includes/definitions/cips.yaml

@@ -26,3 +26,6 @@ discovery_modules:
     cisco-vrf-lite: 1
 mib_dir:
     - cisco
+discovery:
+    - sysDescr_regex:
+        - '/^Cisco Intrusion Prevention System/'

includes/definitions/dlink.yaml

@@ -3,3 +3,10 @@ text: 'D-Link Switch'
 type: network
 icon: dlink
 ifname: 1
+discovery:
+    - sysDescr:
+        - 'D-Link DES-'
+        - 'Dlink DES-'
+    - sysDescr_regex:
+        - '/^DES-/'
+        - '/^DGS-/'

includes/definitions/edgeos.yaml

@@ -6,3 +6,7 @@ over:
     - { graph: device_bits, text: 'Device Traffic' }
     - { graph: device_processor, text: 'Processor Usage' }
     - { graph: device_ucd_memory, text: 'Memory Usage' }
+discovery:
+    - sysDescr_regex:
+        - '/^EdgeOS/'
+        - '/^EdgeRouter/'

includes/definitions/infinity.yaml

@@ -7,3 +7,6 @@ over:
     - { graph: device_bits, text: 'Device Traffic' }
     - { graph: device_processor, text: 'Processor Usage' }
     - { graph: device_mempool, text: 'Memory Usage' }
+discovery:
+    - sysDescr_regex:
+        - '/^NFT 2N/'

includes/definitions/ligoos.yaml

@@ -4,3 +4,6 @@ type: wireless
 icon: ligowave
 over:
     - { graph: device_bits, text: Traffic }
+discovery:
+    - sysDescr_regex:
+        - '/^LigoPTP/'

includes/definitions/merakimr.yaml

@@ -6,3 +6,6 @@ ifname: 1
 over:
     - { graph: device_bits, text: 'Device Traffic' }
 bad_uptime: true
+discovery:
+    - sysDescr_regex:
+        - '/^Meraki MR/'

includes/definitions/merakims.yaml

@@ -5,3 +5,6 @@ icon: meraki
 ifname: 1
 over:
     - { graph: device_bits, text: 'Device Traffic' }
+discovery:
+    - sysDescr_regex:
+        - '/^Meraki MS/'

includes/definitions/merakimx.yaml

@@ -5,3 +5,6 @@ icon: meraki
 ifname: 1
 over:
     - { graph: device_bits, text: 'Device Traffic' }
+discovery:
+    - sysDescr_regex:
+        - '/^Meraki MX/'

includes/definitions/mgeups.yaml

@@ -7,3 +7,11 @@ mib_dir:
     - mge
 over:
     - { graph: device_current, text: Current }
+discovery:
+    - sysDescr:
+        - 'Pulsar M'
+        - 'MGE UPS SYSTEMS - Network Management Proxy'
+    - sysDescr_regex:
+        - '/^Galaxy/'
+        - '/^Evolution/'
+        - '/^Comet/'

includes/definitions/mrvld.yaml

@@ -3,3 +3,6 @@ group: mrv
 text: 'MRV LambdaDriver'
 type: network
 icon: mrv
+discovery:
+    - sysDescr_regex:
+        - '/^LambdaDriver/'

includes/definitions/netagent2.yaml

@@ -4,3 +4,6 @@ group: ups
 type: power
 over:
     - { graph: device_load, text: Load }
+discovery:
+    - sysDescr_regex:
+        - '/^NET Agent II/'

includes/definitions/netbsd.yaml

@@ -6,3 +6,6 @@ processor_stacked: 1
 over:
     - { graph: device_processor, text: 'Processor Usage' }
     - { graph: device_ucd_memory, text: 'Memory Usage' }
+discovery:
+    - sysDescr_regex:
+        - '/^NetBSD/'

includes/definitions/netmanplus.yaml

@@ -7,4 +7,4 @@ over:
     - { graph: device_current, text: Current }
 discovery:
     - sysObjectId: .1.3.6.1.4.1.5491.6
-    - sysDescr_regex: '/^NetMan.*plus/'
+    - sysDescr_regex: '/^NetMan.*plus/'

includes/definitions/netopia.yaml

@@ -1,3 +1,6 @@
 os: netopia
 text: 'Motorola Netopia'
 type: network
+discovery:
+    - sysDescr_regex:
+        - '/^Netopia/'

includes/definitions/poweralert.yaml

@@ -4,3 +4,6 @@ type: power
 over:
     - { graph: device_current, text: Current }
 icon: tripplite
+discovery:
+    - sysDescr_regex:
+        - '/POWERALERT/i'

includes/definitions/prestige.yaml

@@ -3,3 +3,7 @@ text: 'ZyXEL Prestige'
 group: zyxel
 type: network
 icon: zyxel
+discovery:
+    - sysDescr_regex:
+        - '/^Prestige/'
+        - '/P-.*-/'

includes/definitions/sinetica.yaml

@@ -4,3 +4,6 @@ group: ups
 type: power
 over:
     - { graph: device_current, text: Current }
+discovery:
+    - sysDescr_regex:
+        - '/^Sinetica UPSController./'

includes/definitions/supermicro-switch.yaml

@@ -6,3 +6,8 @@ icon: supermicro
 ifname: 1
 mib_dir:
     - supermicro
+discovery:
+    - sysDescr_regex:
+        - '/^Supermicro Switch/'
+        - '/^SSE-/'
+        - '/^SBM-/'

includes/definitions/tranzeo.yaml

@@ -3,3 +3,6 @@ text: Tranzeo
 type: network
 over:
     - { graph: device_bits, text: 'Device Traffic' }
+discovery:
+    - sysDescr_regex:
+        - '/^Tranzeo/'

includes/definitions/vmware.yaml

@@ -6,3 +6,7 @@ over:
     - { graph: device_bits, text: 'Device Traffic' }
 discovery_modules:
     vmware-vminfo: 1
+discovery:
+    - sysDescr_regex:
+        - '/^VMware ESX/'
+        - '/^VMware-vCenter-Server-Appliance/'

includes/definitions/waas.yaml

@@ -25,3 +25,6 @@ discovery_modules:
     cisco-pw: 1
     cisco-vrf: 1
     cisco-vrf-lite: 1
+discovery:
+    - sysDescr_regex:
+        - '/^Cisco Wide Area Application Services/'

includes/definitions/zynos.yaml

@@ -3,3 +3,10 @@ text: 'ZyXEL Ethernet Switch'
 group: zyxel
 type: network
 icon: zyxel
+discovery:
+    - sysObjectId:
+        - .1.3.6.1.4.1.890
+    - sysDescr_regex:
+        - '^ES'
+        - '^GS'
+        - '^MES'

includes/definitions/zyxelnwa.yaml

@@ -3,3 +3,6 @@ text: 'ZyXEL NWA'
 group: zyxel
 type: network
 icon: zyxel
+discovery:
+    - sysDescr_regex:
+        - '/^NWA-/'

includes/discovery/os/asa.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, 'Cisco Adaptive Security Appliance')) {
-    $os = 'asa';
-}

includes/discovery/os/avocent.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, array('Avocent', 'AlterPath'))) {
-    $os = 'avocent';
-}

includes/discovery/os/bnt.inc.php

@@ -1,7 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, 'Blade Network Technologies', true)) {
-    $os = 'bnt';
-} elseif (starts_with($sysDescr, 'BNT ')) {
-    $os = 'bnt';
-}

includes/discovery/os/cips.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($sysDescr, 'Cisco Intrusion Prevention System')) {
-    $os = 'cips';
-}

includes/discovery/os/dlink.inc.php

@@ -1,7 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, array('D-Link DES-', 'Dlink DES-'))) {
-    $os = 'dlink';
-} elseif (starts_with($sysDescr, array('DES-', 'DGS-'))) {
-    $os = 'dlink';
-}

includes/discovery/os/edgeos.inc.php

@@ -1,10 +0,0 @@
-<?php
-
-$items = array(
-    'EdgeOS',
-    'EdgeRouter',
-);
-
-if (starts_with($sysDescr, $items)) {
-    $os = 'edgeos';
-}

includes/discovery/os/infinity.inc.php

@@ -1,15 +0,0 @@
-<?php
-/*
- * LibreNMS LigoWave os detection module
- *
- * Copyright (c) 2015 Mike Rostermund <mike@kollegienet.dk>
- * 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($sysDescr, 'NFT 2N')) {
-    $os = 'infinity';
-}

includes/discovery/os/ligoos.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($sysDescr, 'LigoPTP')) {
-    $os = 'ligoos';
-}

includes/discovery/os/merakimr.inc.php

@@ -1,15 +0,0 @@
-<?php
-/*
- * LibreNMS Meraki MR detection module
- *
- * Copyright (c) 2015 Will Jones <email@willjones.eu>
- * 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($sysDescr, 'Meraki MR')) {
-    $os = 'merakimr';
-}

includes/discovery/os/merakims.inc.php

@@ -1,15 +0,0 @@
-<?php
-/*
- * LibreNMS Meraki MS detection module
- *
- * Copyright (c) 2015 Will Jones <email@willjones.eu>
- * 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($sysDescr, 'Meraki MS')) {
-    $os = 'merakims';
-}

includes/discovery/os/merakimx.inc.php

@@ -1,15 +0,0 @@
-<?php
-/*
- * LibreNMS Meraki MX detection module
- *
- * Copyright (c) 2015 Will Jones <email@willjones.eu>
- * 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($sysDescr, 'Meraki MX')) {
-    $os = 'merakimx';
-}

includes/discovery/os/mgeups.inc.php

@@ -1,9 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, array('Pulsar M', 'MGE UPS SYSTEMS - Network Management Proxy'))) {
-    $os = 'mgeups';
-}
-
-if (starts_with($sysDescr, array('Galaxy ', 'Evolution ', 'Comet'))) {
-    $os = 'mgeups';
-}

includes/discovery/os/mrvld.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, 'LambdaDriver')) {
-    $os = 'mrvld';
-}

includes/discovery/os/netagent2.inc.php

@@ -1,28 +0,0 @@
-<?php
-/**
- * netagent2.inc.php
- *
- * LibreNMS os discovery module for Megatec Net Agent II
- *
- * 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($sysDescr, 'NET Agent II')) {
-    $os = 'netagent2';
-}

includes/discovery/os/netbsd.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, 'NetBSD')) {
-    $os = 'netbsd';
-}

includes/discovery/os/netopia.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, 'Netopia')) {
-    $os = 'netopia';
-}

includes/discovery/os/poweralert.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, 'POWERALERT', true)) {
-    $os = 'poweralert';
-}

includes/discovery/os/prestige.inc.php

@@ -1,7 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, array('Prestige '))) {
-    $os = 'prestige';
-} elseif (preg_match('/^P-.*-/', $sysDescr)) {
-    $os = 'prestige';
-}

includes/discovery/os/sinetica.inc.php

@@ -1,28 +0,0 @@
-<?php
-/**
- * sinetica.inc.php
- *
- * LibreNMS os discovery module for Sinetica
- *
- * 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($sysDescr, 'Sinetica UPSController.')) {
-    $os = 'sinetica';
-}

includes/discovery/os/supermicro-switch.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, array('Supermicro Switch', 'SSE-', 'SBM-'))) {
-    $os = 'supermicro-switch';
-}

includes/discovery/os/tranzeo.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, 'Tranzeo')) {
-    $os = 'tranzeo';
-}

includes/discovery/os/vmware.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, array('VMware ESX', 'VMware-vCenter-Server-Appliance'))) {
-    $os = 'vmware';
-}

includes/discovery/os/waas.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($sysDescr, 'Cisco Wide Area Application Services')) {
-    $os = 'waas';
-}

includes/discovery/os/zynos.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.890') && starts_with($sysDescr, array('ES', 'GS', 'MES'))) {
-    $os = 'zynos';
-}

includes/discovery/os/zyxelnwa.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, 'NWA-')) {
-    $os = 'zyxelnwa';
-}