diff --git a/includes/discovery/mempools/dnos.inc.php b/includes/discovery/mempools/dnos.inc.php index 56d3bd2c6c..d9f8dcc6ba 100644 --- a/includes/discovery/mempools/dnos.inc.php +++ b/includes/discovery/mempools/dnos.inc.php @@ -5,9 +5,19 @@ if ($device['os'] == 'dnos') { echo 'DNOS-MEMORY-POOL: '; - $free = snmp_get($device, '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.1.0', '-OvQ'); - - if (is_numeric($free)) { - discover_mempool($valid_mempool, $device, 0, 'dnos-mem', 'Memory Utilization', '1', null, null); + $get_series = explode('.', snmp_get($device, 'mib-2.1.2.0', '-Onvsbq', 'F10-PRODUCTS-MIB', 'dnos'), 2); // Get series From MIB + $series = $get_series[0]; + if ($series == 'f10SSeriesProducts') { + $total = snmp_get($device, 'chSysProcessorMemSize.1', '-OvQU', 'F10-S-SERIES-CHASSIS-MIB'); + $used = $mempool['total'] * (snmp_get($device, 'F10-S-SERIES-CHASSIS-MIB::chStackUnitMemUsageUtil.1', '-OvQU')/ 100); + $free = ($mempool['total'] - $mempool['used']); + if (is_numeric($total) && is_numeric($used)) { + discover_mempool($valid_mempool, $device, 0, 'dnos-mem', 'Memory Utilization', '1', null, null); + } + } else { + $free = snmp_get($device, '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.1.0', '-OvQ'); + if (is_numeric($free)) { + discover_mempool($valid_mempool, $device, 0, 'dnos-mem', 'Memory Utilization', '1', null, null); + } } } diff --git a/includes/discovery/processors/dnos.inc.php b/includes/discovery/processors/dnos.inc.php index bb1eb6d7c3..d47616042b 100644 --- a/includes/discovery/processors/dnos.inc.php +++ b/includes/discovery/processors/dnos.inc.php @@ -1,10 +1,24 @@