Revert "newdevice: improve IOS-XE detection" (#6436)

* Revert "improve callback serial number regex (#6435)"

This reverts commit 2f881e3d80.

* Revert "fix: vlan port mappings not removed (#6423)"

This reverts commit 924b751be4.

* Revert "missed file deletion (#6430)"

This reverts commit 801a563c10.

* Revert "refactor: move Engenius discovery to yaml (#6428)"

This reverts commit fa731f3826.

* Revert "refactor: move cometsystem-p85xx (#6427)"

This reverts commit 01477a15f4.

* Revert "refactor: move the rest of avaya os detection to yaml (#6426)"

This reverts commit 8a8edb7d6d.

* Revert "refactor: move aos discovery to yaml (#6425)"

This reverts commit 54975f64d4.

* Revert "newdevice: improve IOS-XE detection (#6429)"

This reverts commit 9c44b1a809.

includes/definitions/ios.yaml

@@ -8,14 +8,6 @@ over:
     - { graph: device_processor, text: 'CPU Usage' }
     - { graph: device_mempool, text: 'Memory Usage' }
 icon: cisco
-discovery:
-    -
-      sysDescr:
-          - 'Cisco Internetwork Operating System Software'
-          - 'IOS (tm)'
-          - 'Cisco IOS Software'
-          - 'Global Site Selector'
-      sysDescr_regex: '/^((?!LINUX_IOSD).)*$/' #IOS-XE adding more regex will break detection, modify instead
 bad_ifXEntry:
     - cisco1941
     - cisco886Va

includes/definitions/iosxe.yaml

@@ -34,4 +34,5 @@ register_mibs:
     ciscoAAASessionMIB: CISCO-AAA-SESSION-MIB
 discovery:
     - sysDescr:
-        - LINUX_IOSD
+        - IOS-XE
+        - X86_64_LINUX_IOSD

includes/discovery/os/ios.inc.php

@@ -0,0 +1,5 @@
+<?php
+
+if (str_contains($sysDescr, array('Cisco Internetwork Operating System Software', 'IOS (tm)', 'Cisco IOS Software', 'Global Site Selector')) && !str_contains($sysDescr, array('IOS-XE', 'X86_64_LINUX_IOSD'))) {
+    $os = 'ios';
+}