Update Fortios FAZ (FortiAnalyzer) hardware detection (librenms#18327)

* fortios: enhance regex for support also FAZ

* FortiOS: remove FortiAnalyzer/FortiManager from shared hardware

it is now detected via hardware regex

* Add tests with FortiAnalyzer (FAZ): 7.6.4

* fortios: update replace

fmg -> FortiManager (FMG)
faz -> FortiAnalyzer (FAZ)

* Add tests with FortiManager (FMG): 7.6.4

* fortios(faz): update hardware (after update replace)

* Update fortios.snmprec

* Fix SNMP OID format in fortios.snmprec

* Update fortios.json

---------

Co-authored-by: Neil Lathwood <gh+n@laf.io>

Author: alagoutte

LibreNMS/OS/Fortios.php

@@ -38,7 +38,6 @@ public function discoverOS(Device $device): void
     {
         parent::discoverOS($device); // yaml
 
-        $device->hardware = $device->hardware ?: $this->getHardwareName();
         $device->features = snmp_get($this->getDeviceArray(), 'fmDeviceEntMode.1', '-OQv', 'FORTINET-FORTIMANAGER-FORTIANALYZER-MIB') == 'fmg-faz' ? 'with Analyzer features' : null;
     }
 

LibreNMS/OS/Shared/Fortinet.php

@@ -31,18 +31,6 @@ class Fortinet extends \LibreNMS\OS
     protected function getHardwareName()
     {
         $rewrite_fortinet_hardware = [
-            '.1.3.6.1.4.1.12356.102.1.1000' => 'FortiAnalyzer 100',
-            '.1.3.6.1.4.1.12356.102.1.10002' => 'FortiAnalyzer 1000B',
-            '.1.3.6.1.4.1.12356.102.1.1001' => 'FortiAnalyzer 100A',
-            '.1.3.6.1.4.1.12356.102.1.1002' => 'FortiAnalyzer 100B',
-            '.1.3.6.1.4.1.12356.102.1.20000' => 'FortiAnalyzer 2000',
-            '.1.3.6.1.4.1.12356.102.1.20001' => 'FortiAnalyzer 2000A',
-            '.1.3.6.1.4.1.12356.102.1.4000' => 'FortiAnalyzer 400',
-            '.1.3.6.1.4.1.12356.102.1.40000' => 'FortiAnalyzer 4000',
-            '.1.3.6.1.4.1.12356.102.1.40001' => 'FortiAnalyzer 4000A',
-            '.1.3.6.1.4.1.12356.102.1.4002' => 'FortiAnalyzer 400B',
-            '.1.3.6.1.4.1.12356.102.1.8000' => 'FortiAnalyzer 800',
-            '.1.3.6.1.4.1.12356.102.1.8002' => 'FortiAnalyzer 800B',
             '.1.3.6.1.4.1.12356.101.1.1000' => 'FortiGate 100',
             '.1.3.6.1.4.1.12356.101.1.10000' => 'FortiGate 1000',
             '.1.3.6.1.4.1.12356.101.1.10001' => 'FortiGate 1000A',
@@ -93,30 +81,6 @@ protected function getHardwareName()
             '.1.3.6.1.4.1.12356.101.1.8001' => 'FortiGate 800F',
             '.1.3.6.1.4.1.12356.101.1.800' => 'FortiGate 80C',
             '.1.3.6.1.4.1.12356.1688' => 'FortiMail 2000A',
-            '.1.3.6.1.4.1.12356.103.1.1000' => 'FortiManager 100',
-            '.1.3.6.1.4.1.12356.103.1.1001' => 'FortiManager VM',
-            '.1.3.6.1.4.1.12356.103.1.1003' => 'FortiManager 100C',
-            '.1.3.6.1.4.1.12356.103.1.2004' => 'FortiManager 200D',
-            '.1.3.6.1.4.1.12356.103.1.2005' => 'FortiManager 200E',
-            '.1.3.6.1.4.1.12356.103.1.3004' => 'FortiManager 300D',
-            '.1.3.6.1.4.1.12356.103.1.3005' => 'FortiManager 300E',
-            '.1.3.6.1.4.1.12356.103.1.4000' => 'FortiManager 400',
-            '.1.3.6.1.4.1.12356.103.1.4001' => 'FortiManager 400A',
-            '.1.3.6.1.4.1.12356.103.1.4002' => 'FortiManager 400B',
-            '.1.3.6.1.4.1.12356.103.1.4003' => 'FortiManager 400C',
-            '.1.3.6.1.4.1.12356.103.1.4005' => 'FortiManager 400E',
-            '.1.3.6.1.4.1.12356.103.1.10003' => 'FortiManager 1000C',
-            '.1.3.6.1.4.1.12356.103.1.10004' => 'FortiManager 1000D',
-            '.1.3.6.1.4.1.12356.103.1.20005' => 'FortiManager 2000E',
-            '.1.3.6.1.4.1.12356.103.1.20000' => 'FortiManager 2000XL',
-            '.1.3.6.1.4.1.12356.103.1.30000' => 'FortiManager 3000',
-            '.1.3.6.1.4.1.12356.103.1.30002' => 'FortiManager 3000B',
-            '.1.3.6.1.4.1.12356.103.1.30003' => 'FortiManager 3000C',
-            '.1.3.6.1.4.1.12356.103.1.30006' => 'FortiManager 3000F',
-            '.1.3.6.1.4.1.12356.103.1.39005' => 'FortiManager 3900E',
-            '.1.3.6.1.4.1.12356.103.1.40004' => 'FortiManager 4000D',
-            '.1.3.6.1.4.1.12356.103.1.40005' => 'FortiManager 4000E',
-            '.1.3.6.1.4.1.12356.103.1.50011' => 'FortiManager 5001A',
             '.1.3.6.1.4.1.12356.106.1.50030' => 'FortiSwitch 5003A',
             '.1.3.6.1.4.1.12356.101.1.510' => 'FortiWiFi 50B',
             '.1.3.6.1.4.1.12356.101.1.610' => 'FortiWiFi 60',

resources/definitions/os_discovery/fortios.yaml

@@ -14,7 +14,8 @@ modules:
         hardware:
             - ENTITY-MIB::entPhysicalModelName.1
             - SNMPv2-MIB::sysObjectID.0
-        hardware_regex: '/::(?<hardware>fmg[0-9A-Za-z]+)$/i'
+        hardware_regex: '/::(?<hardware>[fmg|faz][0-9A-Za-z]+)$/i'
         hardware_replace:
-            - ['/^fmg/', 'FMG ']
+            - ['/^fmg/', 'FortiManager (FMG) ']
+            - ['/^faz/', 'FortiAnalyzer (FAZ) ']
             - ['/vm$/', 'VM']

tests/data/fortios.json

@@ -4,11 +4,11 @@
             "devices": [
                 {
                     "sysName": "<private>",
-                    "sysObjectID": ".1.3.6.1.4.1.12356.103",
-                    "sysDescr": "",
+                    "sysObjectID": ".1.3.6.1.4.1.12356.103.1.64",
+                    "sysDescr": "FortiManager",
                     "sysContact": "<private>",
                     "version": "v5.6.0-build1557 170727 (GA)",
-                    "hardware": null,
+                    "hardware": "FortiManager (FMG) VM",
                     "features": "with Analyzer features",
                     "location": "<private>",
                     "os": "fortios",