Updated support for AirOS-AF60 and fixed CPU and Version info (libren…

…ms#16678) * Updated support for AirOS-AF60 and fixed CPU and Version info * Included updated files * Update airos-af60.yaml
murrant · Nov 22, 2024 · 20e88e6 · 20e88e6
1 parent 2de1278
commit 20e88e6
Show file tree

Hide file tree

Showing 5 changed files with 1,494 additions and 19 deletions.
diff --git a/includes/definitions/airos-af60.yaml b/includes/definitions/airos-af60.yaml
@@ -12,7 +12,7 @@ discovery:
     -
         sysObjectID:
             - .1.3.6.1.4.1.10002.1
-            - .1.3.6.1.4.1.41112.1.11.1
+            - .1.3.6.1.4.1.41112
         sysDescr: Linux
         snmpget:
             oid: UI-AF60-MIB::af60FirmwareVersion.1

diff --git a/includes/definitions/discovery/airos-af60.yaml b/includes/definitions/discovery/airos-af60.yaml
@@ -3,13 +3,14 @@ modules:
     os:
         hardware: UI-AF60-MIB::af60DevModel.1
         version: UI-AF60-MIB::af60FirmwareVersion.1
+        version_regex: '/(?<version>v[0-9]+\.[0-9]+\.[0-9]+[-RC]*)/'
         lat: UI-AF60-MIB::af60GpsLat.1
         long: UI-AF60-MIB::af60GpsLon.1
     processors:
         data:
             -
                 oid: af60CpuUsage
-                num_oid: '.1.3.6.1.4.1.41112.1.11.2.6'
+                num_oid: '.1.3.6.1.4.1.41112.1.11.1.2.6.1'
     sensors:
         state:
             data:

diff --git a/tests/data/airos-af60_airos-af60.json b/tests/data/airos-af60_airos-af60.json
@@ -7,7 +7,7 @@
                     "sysObjectID": ".1.3.6.1.4.1.10002.1",
                     "sysDescr": "Linux 4.9.241 #2 SMP Thu Dec 30 12:43:55 EET 2021 armv7l",
                     "sysContact": "<private>",
-                    "version": "GP.ipq806x.v2.6.0-RC.46590.211230.1238",
+                    "version": "v2.6.0-RC",
                     "hardware": "AF60-LR",
                     "features": null,
                     "location": "<private>",
@@ -1036,7 +1036,7 @@
                 {
                     "entPhysicalIndex": 0,
                     "hrDeviceIndex": 0,
-                    "processor_oid": ".1.3.6.1.4.1.41112.1.11.2.6",
+                    "processor_oid": ".1.3.6.1.4.1.41112.1.11.1.2.6.1",
                     "processor_index": "1",
                     "processor_type": "airos-af60",
                     "processor_usage": 3,
@@ -1046,21 +1046,7 @@
                 }
             ]
         },
-        "poller": {
-            "processors": [
-                {
-                    "entPhysicalIndex": 0,
-                    "hrDeviceIndex": 0,
-                    "processor_oid": ".1.3.6.1.4.1.41112.1.11.2.6",
-                    "processor_index": "1",
-                    "processor_type": "airos-af60",
-                    "processor_usage": 0,
-                    "processor_descr": "Processor",
-                    "processor_precision": 1,
-                    "processor_perc_warn": 75
-                }
-            ]
-        }
+        "poller": "matches discovery"
     },
     "sensors": {
         "discovery": {