mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix duplication of processor entries & limit length of type (#16075)

Browse Source 
* 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
This commit is contained in:
Nicolas
2024-05-29 21:42:05 +02:00
committed by GitHub
parent eed83061e6
commit c777d5429e
4 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LibreNMS/Device/Processor.php
View File

@@ -147,7 +147,7 @@ class Processor extends Model implements DiscoveryModule, PollerModule, Discover
foreach ($processors as $processor) { foreach ($processors as $processor) {
$processor->processor_descr = substr($processor->processor_descr, 0, 64); $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)) { if (isset($processors) && is_array($processors)) {

2
includes/definitions/discovery/fortiauthenticator.yaml
View File

@@ -9,4 +9,4 @@ modules:
- -
oid: facSysCpuUsage oid: facSysCpuUsage
num_oid: '.1.3.6.1.4.1.12356.113.1.4.{{ $index }}' num_oid: '.1.3.6.1.4.1.12356.113.1.4.{{ $index }}'
type: fortiauthenticator type: fortiauth

3
misc/discovery_schema.json
View File

@@ -157,7 +157,8 @@
}, },
"value": {"$ref": "#/definitions/oid"}, "value": {"$ref": "#/definitions/oid"},
"type": { "type": {
"type": "string" "type": "string",
"maxLength": 16
}, },
"skip_values": { "skip_values": {
"$ref": "#/definitions/skip_values" "$ref": "#/definitions/skip_values"

13
tests/data/fortiauthenticator.json
View File

@@ -838,18 +838,7 @@
"hrDeviceIndex": 0, "hrDeviceIndex": 0,
"processor_oid": ".1.3.6.1.4.1.12356.113.1.4.0", "processor_oid": ".1.3.6.1.4.1.12356.113.1.4.0",
"processor_index": "0", "processor_index": "0",
"processor_type": "fortiauthenticat", "processor_type": "fortiauth",
"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_usage": 52, "processor_usage": 52,
"processor_descr": "Processor", "processor_descr": "Processor",
"processor_precision": 1, "processor_precision": 1,