refactor: some more os definition changes (#5527)

includes/definitions/arubaos.yaml

@@ -7,3 +7,10 @@ over:
     - { graph: device_arubacontroller_numclients, text: 'Number of Clients' }
 poller_modules:
     aruba-controller: 1
+discovery:
+    - sysDescr:
+        - 'ArubaOS'
+    - 
+      sysDescr: 'AOS-W'
+      sysObjectId: '.1.3.6.1.4.1.6486.800'
+

includes/definitions/ies.yaml

@@ -3,3 +3,7 @@ text: 'ZyXEL DSLAM'
 group: zyxel
 type: network
 icon: zyxel
+discovery:
+    - sysDescr_regex:
+        - '/IES-((?!Cisco Systems).)*$/' # = str_contains($sysDescr, 'IES-') && !str_contains($sysDescr, 'Cisco Systems')
+

includes/definitions/vyatta.yaml

@@ -6,3 +6,6 @@ over:
     - { graph: device_bits, text: 'Device Traffic' }
     - { graph: device_processor, text: 'Processor Usage' }
     - { graph: device_ucd_memory, text: 'Memory Usage' }
+discovery:
+    - sysDescr_regex:
+        - '/^Vyatta((?!VyOS).)*$/' # = starts_with($sysDescr, 'Vyatta') && !str_contains($sysDescr, 'VyOS')

includes/definitions/vyos.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:
+        - '/^Vyatta VyOS/'
+        - '/^VyOS/i'

includes/discovery/os/arubaos.inc.php

@@ -1,8 +0,0 @@
-<?php
-
-// | Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010. | .1.3.6.1.4.1.6486.800.1.1.2.1.7.1.10 |
-if (str_contains($sysDescr, 'ArubaOS')) {
-    $os = 'arubaos';
-} elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.6486.800') && str_contains($sysDescr, 'AOS-W')) {
-    $os = 'arubaos';
-}

includes/discovery/os/canopy.inc.php

@@ -1,14 +0,0 @@
-<?php
-/*
- * LibreNMS
- *
- * 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, array('CANOPY', 'CMM'))) {
-    $os = 'canopy';
-}

includes/discovery/os/ies.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, 'IES-') && !str_contains($sysDescr, 'Cisco Systems')) {
-    $os = 'ies';
-}

includes/discovery/os/kti.inc.php

@@ -1,7 +0,0 @@
-<?php
-
-echo "KGS SWITCH $sysDescr\n";
-
-if (starts_with($sysDescr, 'KGS-')) {
-    $os = 'kti';
-}

includes/discovery/os/vyatta.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, 'Vyatta') && !str_contains($sysDescr, 'VyOS')) {
-    $os = 'vyatta';
-}

includes/discovery/os/vyos.inc.php

@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysDescr, 'Vyatta VyOS') || starts_with($sysDescr, 'VyOS', true)) {
-    $os = 'vyos';
-}