From ae731091596d04460c7e604a932b86d449950719 Mon Sep 17 00:00:00 2001 From: Neil Lathwood Date: Sat, 1 Apr 2017 22:17:08 +0100 Subject: [PATCH] fix: Fixed CPU/Mem polling for Cyberoam-UTM devices (#6315) --- includes/discovery/processors/cyberoam-utm.inc.php | 2 +- includes/polling/mempools/cyberoam-utm.inc.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/discovery/processors/cyberoam-utm.inc.php b/includes/discovery/processors/cyberoam-utm.inc.php index ddf8277b0b..afef3fe9e6 100644 --- a/includes/discovery/processors/cyberoam-utm.inc.php +++ b/includes/discovery/processors/cyberoam-utm.inc.php @@ -26,7 +26,7 @@ if ($device['os'] === 'cyberoam-utm') { echo 'Cyberoam UTM : '; - $oid = '.1.3.6.1.4.1.21067.2.1.1.3.0'; + $oid = '.1.3.6.1.4.1.21067.2.1.2.2.1.0'; $descr = 'Processor'; $usage = snmp_get($device, $oid, '-Ovqn'); diff --git a/includes/polling/mempools/cyberoam-utm.inc.php b/includes/polling/mempools/cyberoam-utm.inc.php index 049eb9f728..875f038590 100644 --- a/includes/polling/mempools/cyberoam-utm.inc.php +++ b/includes/polling/mempools/cyberoam-utm.inc.php @@ -23,17 +23,19 @@ * @author Neil Lathwood */ -if ($mempool['mempool_index'] === 0) { +if ($mempool['mempool_index'] == 0) { $mem_perc = snmp_get($device, '.1.3.6.1.4.1.21067.2.1.2.4.2.0', '-OvQ'); $mem_capacity = snmp_get($device, '.1.3.6.1.4.1.21067.2.1.2.4.1.0', '-OvQ'); + $mem_capacity = ($mem_capacity*1024*1024); $mempool['total'] = $mem_capacity; $mempool['used'] = ($mem_capacity / 100) * $mem_perc; $mempool['free'] = $mempool['total'] - $mempool['used']; } -if ($mempool['mempool_index'] === 1) { +if ($mempool['mempool_index'] == 1) { $swap_perc = snmp_get($device, '.1.3.6.1.4.1.21067.2.1.2.4.4.0', '-OvQ'); $swap_capacity = snmp_get($device, '.1.3.6.1.4.1.21067.2.1.2.4.3.0', '-OvQ'); + $swap_capacity = ($swap_capacity*1024*1024); $mempool['total'] = $swap_capacity; $mempool['used'] = ($swap_capacity / 100) * $swap_perc; $mempool['free'] = $mempool['total'] - $mempool['used'];