Improved AIX os information collection (#14595)

* Improved AIX os information collection

* Fix-up merged data

* remove baseline

LibreNMS/OS/Aix.php

@@ -1,48 +0,0 @@
-<?php
-/**
- * Aix.php
- *
- * -Description-
- *
- * 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 <https://www.gnu.org/licenses/>.
- *
- * @link       https://www.librenms.org
- *
- * @copyright  2020 Tony Murray
- * @author     Tony Murray <murraytony@gmail.com>
- */
-
-namespace LibreNMS\OS;
-
-use App\Models\Device;
-use LibreNMS\Interfaces\Discovery\OSDiscovery;
-use LibreNMS\OS;
-
-class Aix extends OS implements OSDiscovery
-{
-    public function discoverOS(Device $device): void
-    {
-        $aix_descr = explode("\n", $device->sysDescr);
-        // AIX standard snmp deamon
-        if (! empty($aix_descr[1])) {
-            $device->serial = explode('Processor id: ', $aix_descr[1])[1];
-            $aix_long_version = explode(' version: ', $aix_descr[2])[1];
-            [$device->version, $aix_version_min] = array_map('intval', explode('.', $aix_long_version));
-        // AIX net-snmp
-        } else {
-            [, , $aix_version_min, $device->version, $device->serial] = explode(' ', $aix_descr[0]);
-        }
-        $device->version .= '.' . $aix_version_min;
-    }
-}

includes/definitions/discovery/aix.yaml

@@ -0,0 +1,14 @@
+modules:
+  os:
+    sysDescr_regex:
+      - '/Machine Type: (?<hardware>\w+) Processor id: (?<serial>\w+)[^:]* version: (?<version>[\d.]+)/' # standard snmp daemon
+      - '/^AIX .* (?<version>\d+ \d+) (?<serial>\S+)$/'  # net-snmp daemon
+    serial: IBM-AIX-MIB::aixSeSerialNumber.0
+    serial_replace:
+      - 'IBM,'
+    hardware: IBM-AIX-MIB::aixSeMachineType.0
+    hardware_replace:
+      - 'IBM,'
+    version_replace:
+      - '/(?<=^|\.)0+(?=[^.])/' # standard snmp daemon
+      - ['/(\d+) (\d+)/', '$2.$1'] # net-snmp daemon

phpstan-baseline.neon

@@ -3605,11 +3605,6 @@ parameters:
 			count: 1
 			path: LibreNMS/OS.php
 
-		-
-			message: "#^Property App\\\\Models\\\\Device\\:\\:\\$version \\(string\\|null\\) does not accept int\\.$#"
-			count: 1
-			path: LibreNMS/OS/Aix.php
-
 		-
 			message: "#^Parameter \\#8 \\$multiplier of class LibreNMS\\\\Device\\\\WirelessSensor constructor expects int, null given\\.$#"
 			count: 2

tests/data/aix_net-snmp.json

@@ -8,7 +8,7 @@
                     "sysDescr": "AIX testhost 1 7 <private>",
                     "sysContact": "<private>",
                     "version": "7.1",
-                    "hardware": null,
+                    "hardware": "",
                     "features": null,
                     "location": "<private>",
                     "os": "aix",

tests/data/aix_std.json

@@ -7,8 +7,8 @@
                     "sysObjectID": ".1.3.6.1.4.1.2.3.1.2.1.1.3",
                     "sysDescr": "IBM PowerPC CHRP Computer\nMachine Type: 0x0800004c Processor id: 000000000000\nBase Operating System Runtime AIX version: 05.03.0008.0000\nTCP/IP Client Support version: 05.03.0008.0002",
                     "sysContact": "<private>",
-                    "version": "5.3",
-                    "hardware": null,
+                    "version": "5.3.8.0",
+                    "hardware": "0x0800004c",
                     "features": null,
                     "location": "<private>",
                     "os": "aix",

tests/data/aix_vios.json

@@ -7,8 +7,8 @@
                     "sysObjectID": ".1.3.6.1.4.1.2.3.1.2.1.1.3",
                     "sysDescr": "IBM PowerPC CHRP Computer\nMachine Type: 0x0800004c Processor id: 00FB98004C00\nBase Operating System Runtime VIOS version: 06.01.0009.0100\nTCP/IP Client Support  version: 06.01.0009.0102",
                     "sysContact": "<private>",
-                    "version": "6.1",
-                    "hardware": null,
+                    "version": "6.1.9.100",
+                    "hardware": "0x0800004c",
                     "features": null,
                     "location": "<private>",
                     "os": "aix",