Fix duplication of processor entries & limit length of type (librenms…

…#16075) * Fix duplication of processor entries & limit length of type * delete duplicate processor entry * added maxLength to processor type * shorter processor type * forgot to regen test data
ppasserini · May 29, 2024 · c777d54 · c777d54
1 parent eed8306
commit c777d54
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/LibreNMS/Device/Processor.php b/LibreNMS/Device/Processor.php
@@ -147,7 +147,7 @@ public static function runDiscovery(OS $os)
 
         foreach ($processors as $processor) {
             $processor->processor_descr = substr($processor->processor_descr, 0, 64);
-            $processors[] = $processor;
+            $processor->processor_type = substr($processor->processor_type, 0, 16);
         }
 
         if (isset($processors) && is_array($processors)) {

diff --git a/includes/definitions/discovery/fortiauthenticator.yaml b/includes/definitions/discovery/fortiauthenticator.yaml
@@ -9,4 +9,4 @@ modules:
             -
                 oid: facSysCpuUsage
                 num_oid: '.1.3.6.1.4.1.12356.113.1.4.{{ $index }}'
-                type: fortiauthenticator
+                type: fortiauth
diff --git a/misc/discovery_schema.json b/misc/discovery_schema.json
@@ -157,7 +157,8 @@
                                     },
                                     "value": {"$ref": "#/definitions/oid"},
                                     "type": {
-                                        "type": "string"
+                                        "type": "string",
+                                        "maxLength": 16
                                     },
                                     "skip_values": {
                                         "$ref": "#/definitions/skip_values"

diff --git a/tests/data/fortiauthenticator.json b/tests/data/fortiauthenticator.json
@@ -838,18 +838,7 @@
                     "hrDeviceIndex": 0,
                     "processor_oid": ".1.3.6.1.4.1.12356.113.1.4.0",
                     "processor_index": "0",
-                    "processor_type": "fortiauthenticat",
-                    "processor_usage": 52,
-                    "processor_descr": "Processor",
-                    "processor_precision": 1,
-                    "processor_perc_warn": 75
-                },
-                {
-                    "entPhysicalIndex": 0,
-                    "hrDeviceIndex": 0,
-                    "processor_oid": ".1.3.6.1.4.1.12356.113.1.4.0",
-                    "processor_index": "0",
-                    "processor_type": "fortiauthenticat",
+                    "processor_type": "fortiauth",
                     "processor_usage": 52,
                     "processor_descr": "Processor",
                     "processor_precision": 1,