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

Improve processors and mempools support for VRP (#9300)

Browse Source 
* VRP: Improve mempools and processors stats for CE family

* VRP: upgrade testdata with uptodate data

* Codeclimate corrects
This commit is contained in:
PipoCanaja
2018-10-17 18:00:30 +02:00
committed by Neil Lathwood
parent 10432b1764
commit 33ba53ad6e
6 changed files with 8577 additions and 42755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
includes/definitions/discovery/vrp.yaml
View File

@@ -1,5 +1,21 @@
mib: HUAWEI-ENTITY-EXTENT-MIB
modules:
processors:
data:
-
oid: hwEntityStateEntry
value: hwEntityCpuUsage
num_oid: '.1.3.6.1.4.1.2011.5.25.31.1.1.1.1.5.{{ $index }}'
descr: '{{ $entPhysicalName }} Processor'
skip_values:
-
oid: hwEntityOperStatus
op: '!='
value: 3
-
oid: hwEntityCpuUsageThreshold
op: '='
value: 0
sensors:
pre-cache:
data:

10
includes/discovery/mempools/vrp.inc.php
View File

@@ -6,15 +6,23 @@ if ($device['os'] == 'vrp') {
$mempools_array = snmpwalk_cache_multi_oid($device, 'hwEntityMemUsage', $mempools_array, 'HUAWEI-ENTITY-EXTENT-MIB', 'huawei');
$mempools_array = snmpwalk_cache_multi_oid($device, 'hwEntityMemSize', $mempools_array, 'HUAWEI-ENTITY-EXTENT-MIB', 'huawei');
$mempools_array = snmpwalk_cache_multi_oid($device, 'hwEntityBomEnDesc', $mempools_array, 'HUAWEI-ENTITY-EXTENT-MIB', 'huawei');
$mempools_array = snmpwalk_cache_multi_oid($device, 'hwEntityMemSizeMega', $mempools_array, 'HUAWEI-ENTITY-EXTENT-MIB', 'huawei');
$mempools_array = snmpwalk_cache_multi_oid($device, 'hwEntityBoardType', $mempools_array, 'HUAWEI-ENTITY-EXTENT-MIB', 'huawei');
$mempools_array = snmpwalk_cache_multi_oid($device, 'entPhysicalName', $mempools_array, 'HUAWEI-ENTITY-EXTENT-MIB', 'huawei');
d_echo($mempools_array);
if (is_array($mempools_array)) {
foreach ($mempools_array as $index => $entry) {
if ($entry['hwEntityMemSize'] != 0) {
if ($entry['hwEntityMemSize'] != 0 || $entry['hwEntityMemSizeMega'] != 0) {
d_echo($index.' '.$entry['hwEntityBomEnDesc'].' -> '.$entry['hwEntityMemUsage'].' -> '.$entry['hwEntityMemSize']."\n");
$usage_oid = '.1.3.6.1.4.1.2011.5.25.31.1.1.1.1.7.'.$index;
$descr = $entry['entPhysicalName'];
if (empty($descr)) {
$descr = $entry['hwEntityBomEnDesc'];
}
$descr .= " Memory";
$usage = $entry['hwEntityMemUsage'];
if (!strstr($descr, 'No') && !strstr($usage, 'No') && $descr != '') {
discover_mempool($valid_mempool, $device, $index, 'vrp', $descr, '1', null, null);

7
includes/polling/mempools/vrp.inc.php
View File

@@ -9,6 +9,7 @@ if (!is_array($mempool_cache['vrp'])) {
$mempool_cache['vrp'] = array();
$mempool_cache['vrp'] = snmpwalk_cache_multi_oid($device, 'hwEntityMemSize', $mempool_cache['vrp'], 'HUAWEI-ENTITY-EXTENT-MIB', 'huawei');
$mempool_cache['vrp'] = snmpwalk_cache_multi_oid($device, 'hwEntityMemSizeMega', $mempool_cache['vrp'], 'HUAWEI-ENTITY-EXTENT-MIB', 'huawei');
$mempool_cache['vrp'] = snmpwalk_cache_multi_oid($device, 'hwEntityMemUsage', $mempool_cache['vrp'], 'HUAWEI-ENTITY-EXTENT-MIB', 'huawei');
d_echo($mempool_cache);
}
@@ -20,6 +21,6 @@ if ($entry['hwEntityMemSize'] < 0) {
}
$perc = $entry['hwEntityMemUsage'];
$mempool['total'] = $entry['hwEntityMemSize'];
$mempool['used'] = ($entry['hwEntityMemSize'] / 100 * $perc);
$mempool['free'] = ($entry['hwEntityMemSize'] - $mempool['used']);
$mempool['total'] = max($entry['hwEntityMemSize'], $entry['hwEntityMemSizeMega'] * 1024 * 1024);
$mempool['used'] = ($mempool['total'] / 100 * $perc);
$mempool['free'] = ($mempool['total'] - $mempool['used']);

12
tests/data/vrp_5720-vrf.json
View File

@@ -34287,7 +34287,7 @@
"processor_index": "67108873",
"processor_type": "vrp",
"processor_usage": 18,
"processor_descr": "Assembling Components,S5720-56C-PWR-EI-AC,S5720-56C-PWR-EI-AC,S5",
"processor_descr": "MPU Board 0 Processor",
"processor_precision": 1,
"processor_perc_warn": 75
},
@@ -34298,7 +34298,7 @@
"processor_index": "68157449",
"processor_type": "vrp",
"processor_usage": 28,
"processor_descr": "Assembling Components,S5720-56C-PWR-EI-AC,S5720-56C-PWR-EI-AC,S5",
"processor_descr": "MPU Board 1 Processor",
"processor_precision": 1,
"processor_perc_warn": 75
},
@@ -34309,7 +34309,7 @@
"processor_index": "69206025",
"processor_type": "vrp",
"processor_usage": 53,
"processor_descr": "Assembling Components,S5720-56C-PWR-EI-AC,S5720-56C-PWR-EI-AC,S5",
"processor_descr": "MPU Board 2 Processor",
"processor_precision": 1,
"processor_perc_warn": 75
}
@@ -34326,7 +34326,7 @@
"hrDeviceIndex": null,
"mempool_type": "vrp",
"mempool_precision": 1,
"mempool_descr": "Assembling Components,S5720-56C-PWR-EI-AC,S5720-56C-PWR-EI-AC,S5",
"mempool_descr": "MPU Board 0 Memory",
"mempool_perc": 0,
"mempool_used": 0,
"mempool_free": 0,
@@ -34342,7 +34342,7 @@
"hrDeviceIndex": null,
"mempool_type": "vrp",
"mempool_precision": 1,
"mempool_descr": "Assembling Components,S5720-56C-PWR-EI-AC,S5720-56C-PWR-EI-AC,S5",
"mempool_descr": "MPU Board 1 Memory",
"mempool_perc": 0,
"mempool_used": 0,
"mempool_free": 0,
@@ -34358,7 +34358,7 @@
"hrDeviceIndex": null,
"mempool_type": "vrp",
"mempool_precision": 1,
"mempool_descr": "Assembling Components,S5720-56C-PWR-EI-AC,S5720-56C-PWR-EI-AC,S5",
"mempool_descr": "MPU Board 2 Memory",
"mempool_perc": 0,
"mempool_used": 0,
"mempool_free": 0,

29770
tests/data/vrp_5720.json
View File

File diff suppressed because it is too large Load Diff

21515
tests/snmpsim/vrp_5720.snmprec
View File

File diff suppressed because it is too large Load Diff