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

refactor: Remove unecessary OS checks in proc / mem polling (#6414)

Browse Source
This commit is contained in:
Neil Lathwood
2017-04-15 02:01:45 +01:00
committed by Tony Murray
parent 78c77ac637
commit 7f83148e80
27 changed files with 164 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
includes/polling/mempools/avaya-ers.inc.php
View File

@@ -1,15 +1,13 @@
<?php
if ($device['os'] == 'avaya-ers') {
// Memory information only known to work with 5500 and 5600 switches
if (preg_match('/5[56][0-9][0-9]/', $device['sysDescr'])) {
$index = $mempool['mempool_index'];
// Memory information only known to work with 5500 and 5600 switches
if (preg_match('/5[56][0-9][0-9]/', $device['sysDescr'])) {
$index = $mempool['mempool_index'];
$total = (snmp_get($device, ".1.3.6.1.4.1.45.1.6.3.8.1.1.12$index", '-Oqv') * 1048576);
$avail = (snmp_get($device, ".1.3.6.1.4.1.45.1.6.3.8.1.1.13$index", '-Oqv') * 1048576);
$total = (snmp_get($device, ".1.3.6.1.4.1.45.1.6.3.8.1.1.12$index", '-Oqv') * 1048576);
$avail = (snmp_get($device, ".1.3.6.1.4.1.45.1.6.3.8.1.1.13$index", '-Oqv') * 1048576);
$mempool['total'] = $total;
$mempool['free'] = $avail;
$mempool['used'] = ($total - $avail);
}
$mempool['total'] = $total;
$mempool['free'] = $avail;
$mempool['used'] = ($total - $avail);
}

14
includes/polling/mempools/ciscowlc.inc.php
View File

@@ -1,12 +1,10 @@
<?php
if ($device['os'] == 'ciscowlc') {
echo "Cisco WLC";
echo "Cisco WLC";
$total = str_replace('"', "", snmp_get($device, "1.3.6.1.4.1.14179.1.1.5.2.0", '-OvQ'));
$avail = str_replace('"', "", snmp_get($device, "1.3.6.1.4.1.14179.1.1.5.3.0", '-OvQ'));
$total = str_replace('"', "", snmp_get($device, "1.3.6.1.4.1.14179.1.1.5.2.0", '-OvQ'));
$avail = str_replace('"', "", snmp_get($device, "1.3.6.1.4.1.14179.1.1.5.3.0", '-OvQ'));
$mempool['total'] = ($total * 1024);
$mempool['free'] = ($avail * 1024);
$mempool['used'] = (($total - $avail) * 1024);
}
$mempool['total'] = ($total * 1024);
$mempool['free'] = ($avail * 1024);
$mempool['used'] = (($total - $avail) * 1024);

12
includes/polling/mempools/edgeswitch.inc.php
View File

@@ -10,10 +10,8 @@
* the source code distribution for details.
*/
if ($device['os'] == 'edgeswitch') {
$total = snmp_get($device, '.1.3.6.1.4.1.4413.1.1.1.1.4.2.0', '-Oqv');
$free = snmp_get($device, '.1.3.6.1.4.1.4413.1.1.1.1.4.1.0', '-Oqv');
$mempool['total'] = $total;
$mempool['free'] = $free;
$mempool['used'] = $total - $free;
}
$total = snmp_get($device, '.1.3.6.1.4.1.4413.1.1.1.1.4.2.0', '-Oqv');
$free = snmp_get($device, '.1.3.6.1.4.1.4413.1.1.1.1.4.1.0', '-Oqv');
$mempool['total'] = $total;
$mempool['free'] = $free;
$mempool['used'] = $total - $free;

12
includes/polling/mempools/enterasys.inc.php
View File

@@ -10,11 +10,9 @@
* the source code distribution for details.
*/
if ($device['os'] == "enterasys") {
$free = snmp_get($device, 'etsysResourceStorageAvailable.3.ram.0', '-OvQ', 'ENTERASYS-RESOURCE-UTILIZATION-MIB');
$total = snmp_get($device, 'etsysResourceStorageSize.3.ram.0', '-OvQ', 'ENTERASYS-RESOURCE-UTILIZATION-MIB');
$free = snmp_get($device, 'etsysResourceStorageAvailable.3.ram.0', '-OvQ', 'ENTERASYS-RESOURCE-UTILIZATION-MIB');
$total = snmp_get($device, 'etsysResourceStorageSize.3.ram.0', '-OvQ', 'ENTERASYS-RESOURCE-UTILIZATION-MIB');
$mempool['used'] = (($total - $free) * 1024);
$mempool['free'] = ($free * 1024);
$mempool['total'] = ($total * 1024);
}
$mempool['used'] = (($total - $free) * 1024);
$mempool['free'] = ($free * 1024);
$mempool['total'] = ($total * 1024);

14
includes/polling/mempools/extreme-mem.inc.php
View File

@@ -1,12 +1,10 @@
<?php
if ($device['os'] == 'xos') {
echo 'EXTREME-SOFTWARE-MONITOR-MIB';
echo 'EXTREME-SOFTWARE-MONITOR-MIB';
$total = str_replace('"', "", snmp_get($device, "1.3.6.1.4.1.1916.1.32.2.2.1.2.1", '-OvQ'));
$avail = str_replace('"', "", snmp_get($device, "1.3.6.1.4.1.1916.1.32.2.2.1.3.1", '-OvQ'));
$total = str_replace('"', "", snmp_get($device, "1.3.6.1.4.1.1916.1.32.2.2.1.2.1", '-OvQ'));
$avail = str_replace('"', "", snmp_get($device, "1.3.6.1.4.1.1916.1.32.2.2.1.3.1", '-OvQ'));
$mempool['total'] = ($total * 1024);
$mempool['free'] = ($avail * 1024);
$mempool['used'] = (($total - $avail) * 1024);
}
$mempool['total'] = ($total * 1024);
$mempool['free'] = ($avail * 1024);
$mempool['used'] = (($total - $avail) * 1024);

18
includes/polling/mempools/hirschmann.inc.php
View File

@@ -1,14 +1,12 @@
<?php
if ($device['os'] == 'hirschmann') {
$mem_allocated = snmp_get($device, 'HMPRIV-MGMT-SNMP-MIB::hmMemoryAllocated.0', '-OvQU');
$mem_free = snmp_get($device, 'HMPRIV-MGMT-SNMP-MIB::hmMemoryFree.0', '-OvQU');
$perc = $mem_allocated / ($mem_allocated + $mem_free) * 100;
$mem_allocated = snmp_get($device, 'HMPRIV-MGMT-SNMP-MIB::hmMemoryAllocated.0', '-OvQU');
$mem_free = snmp_get($device, 'HMPRIV-MGMT-SNMP-MIB::hmMemoryFree.0', '-OvQU');
$perc = $mem_allocated / ($mem_allocated + $mem_free) * 100;
$mempool['perc'] = $perc;
$mempool['total'] = ($mem_allocated + $mem_free);
$mempool['used'] = $mem_allocated;
$mempool['free'] = $mem_free;
$mempool['perc'] = $perc;
$mempool['total'] = ($mem_allocated + $mem_free);
$mempool['used'] = $mem_allocated;
$mempool['free'] = $mem_free;
echo '(U: '.$mempool['used'].' T: '.$mempool['total'].' F: '.$mempool['free'].') ';
}
echo '(U: '.$mempool['used'].' T: '.$mempool['total'].' F: '.$mempool['free'].') ';

18
includes/polling/mempools/hpblmos.inc.php
View File

@@ -10,13 +10,11 @@
* the source code distribution for details.
*/
if ($device['os'] == "hpblmos") {
//UCD-SNMP-MIB::memAvailReal.0
$free = intval(preg_replace('/[^0-9]+/', '', snmp_get($device, '.1.3.6.1.4.1.2021.4.6.0', '-Oqv')), 10);
//UCD-SNMP-MIB::memTotalReal.0
$total = intval(preg_replace('/[^0-9]+/', '', snmp_get($device, '.1.3.6.1.4.1.2021.4.5.0', '-Oqv')), 10);
$used = $total - $free;
$mempool['total'] = $total;
$mempool['free'] = $free;
$mempool['used'] = $total - $free;
}
//UCD-SNMP-MIB::memAvailReal.0
$free = intval(preg_replace('/[^0-9]+/', '', snmp_get($device, '.1.3.6.1.4.1.2021.4.6.0', '-Oqv')), 10);
//UCD-SNMP-MIB::memTotalReal.0
$total = intval(preg_replace('/[^0-9]+/', '', snmp_get($device, '.1.3.6.1.4.1.2021.4.5.0', '-Oqv')), 10);
$used = $total - $free;
$mempool['total'] = $total;
$mempool['free'] = $free;
$mempool['used'] = $total - $free;

12
includes/polling/mempools/jetstream.inc.php
View File

@@ -23,13 +23,11 @@
* @author Neil Lathwood <neil@lathwood.co.uk>
*/
if ($device['os'] === 'jetstream') {
$oid = '.1.3.6.1.4.1.11863.6.4.1.2.1.1.2.' . $mempool['mempool_index'];
$used = snmp_get($device, $oid, '-OvQ');
$mempool['total'] = 100;
$mempool['free'] = ($mempool['total'] - $used);
$mempool['used'] = $used;
}
$oid = '.1.3.6.1.4.1.11863.6.4.1.2.1.1.2.' . $mempool['mempool_index'];
$used = snmp_get($device, $oid, '-OvQ');
$mempool['total'] = 100;
$mempool['free'] = ($mempool['total'] - $used);
$mempool['used'] = $used;
unset(
$oid,

8
includes/polling/mempools/moxa-etherdevice-mem.inc.php
View File

@@ -20,8 +20,6 @@
"The usage of memory size in %."
*/
if ($device['os'] == 'moxa-etherdevice') {
$mempool['total'] = snmp_get($device, "totalMemory.0", '-OvQ', 'MOXA-IKS6726A-MIB');
$mempool['used'] = snmp_get($device, "usedMemory.0", '-OvQ', 'MOXA-IKS6726A-MIB');
$mempool['free'] = snmp_get($device, "freeMemory.0", '-OvQ', 'MOXA-IKS6726A-MIB');
}
$mempool['total'] = snmp_get($device, "totalMemory.0", '-OvQ', 'MOXA-IKS6726A-MIB');
$mempool['used'] = snmp_get($device, "usedMemory.0", '-OvQ', 'MOXA-IKS6726A-MIB');
$mempool['free'] = snmp_get($device, "freeMemory.0", '-OvQ', 'MOXA-IKS6726A-MIB');

12
includes/polling/mempools/netonix.inc.php
View File

@@ -23,11 +23,9 @@
* @author Tony Murray <murraytony@gmail.com>
*/
if ($device['os'] == 'netonix') {
$total = snmp_get($device, "UCD-SNMP-MIB::memTotalReal.0", "-OvQU") * 1024;
$free = snmp_get($device, "UCD-SNMP-MIB::memAvailReal.0", "-OvQU") * 1024;
$total = snmp_get($device, "UCD-SNMP-MIB::memTotalReal.0", "-OvQU") * 1024;
$free = snmp_get($device, "UCD-SNMP-MIB::memAvailReal.0", "-OvQU") * 1024;
$mempool['total'] = $total;
$mempool['free'] = $free;
$mempool['used'] = $total - $free;
}
$mempool['total'] = $total;
$mempool['free'] = $free;
$mempool['used'] = $total - $free;

14
includes/polling/mempools/nxos.inc.php
View File

@@ -10,12 +10,10 @@
* the source code distribution for details.
*/
if ($device['os'] == "nxos") {
echo "Cisco Nexus";
$used = snmp_get($device, '.1.3.6.1.4.1.9.9.109.1.1.1.1.12.1', '-OvQ');
$free = snmp_get($device, '.1.3.6.1.4.1.9.9.109.1.1.1.1.13.1', '-OvQ');
echo "Cisco Nexus";
$used = snmp_get($device, '.1.3.6.1.4.1.9.9.109.1.1.1.1.12.1', '-OvQ');
$free = snmp_get($device, '.1.3.6.1.4.1.9.9.109.1.1.1.1.13.1', '-OvQ');
$mempool['used'] = ($used * 1024);
$mempool['free'] = ($free * 1024);
$mempool['total'] = (($used + $free) * 1024);
}
$mempool['used'] = ($used * 1024);
$mempool['free'] = ($free * 1024);
$mempool['total'] = (($used + $free) * 1024);

30
includes/polling/mempools/pbn-mem.inc.php
View File

@@ -2,23 +2,21 @@
echo 'PBN MemPool'.'\n';
if ($device['os'] == 'pbn') {
// find out wich build number we have
preg_match('/^.* Build (?<build>\d+)/', $device['version'], $version);
d_echo($version);
// find out wich build number we have
preg_match('/^.* Build (?<build>\d+)/', $device['version'], $version);
d_echo($version);
// specified MIB supported since build 16607
if ($version[build] >= 16607) {
$perc = snmp_get($device, 'nmsMemoryPoolUtilization.0', '-OUvQ', 'NMS-MEMORY-POOL-MIB', 'pbn');
$memory_available = snmp_get($device, 'nmsMemoryPoolTotalMemorySize.0', '-OUvQ', 'NMS-MEMORY-POOL-MIB', 'pbn');
$mempool['total'] = $memory_available;
// specified MIB supported since build 16607
if ($version[build] >= 16607) {
$perc = snmp_get($device, 'nmsMemoryPoolUtilization.0', '-OUvQ', 'NMS-MEMORY-POOL-MIB', 'pbn');
$memory_available = snmp_get($device, 'nmsMemoryPoolTotalMemorySize.0', '-OUvQ', 'NMS-MEMORY-POOL-MIB', 'pbn');
$mempool['total'] = $memory_available;
if (is_numeric($perc)) {
$mempool['used'] = ($memory_available / 100 * $perc);
$mempool['free'] = ($memory_available - $mempool['used']);
}
echo "PERC " .$perc."%\n";
echo "Avail " .$mempool['total']."\n";
if (is_numeric($perc)) {
$mempool['used'] = ($memory_available / 100 * $perc);
$mempool['free'] = ($memory_available - $mempool['used']);
}
echo "PERC " .$perc."%\n";
echo "Avail " .$mempool['total']."\n";
}

20
includes/polling/mempools/pulse-mem.inc.php
View File

@@ -14,16 +14,14 @@
echo 'Pulse Secure MemPool'.'\n';
if ($device['os'] == 'pulse') {
$perc = str_replace('"', "", snmp_get($device, "PULSESECURE-PSG-MIB::iveMemoryUtil.0", '-OvQ'));
$memory_available = str_replace('"', "", snmp_get($device, "UCD-SNMP-MIB::memTotalReal.0", '-OvQ'));
$mempool['total'] = $memory_available;
$perc = str_replace('"', "", snmp_get($device, "PULSESECURE-PSG-MIB::iveMemoryUtil.0", '-OvQ'));
$memory_available = str_replace('"', "", snmp_get($device, "UCD-SNMP-MIB::memTotalReal.0", '-OvQ'));
$mempool['total'] = $memory_available;
if (is_numeric($perc)) {
$mempool['used'] = ($memory_available / 100 * $perc);
$mempool['free'] = ($memory_available - $mempool['used']);
}
echo "PERC " .$perc."%\n";
echo "Avail " .$mempool['total']."\n";
if (is_numeric($perc)) {
$mempool['used'] = ($memory_available / 100 * $perc);
$mempool['free'] = ($memory_available - $mempool['used']);
}
echo "PERC " .$perc."%\n";
echo "Avail " .$mempool['total']."\n";

16
includes/polling/mempools/sgos.inc.php
View File

@@ -4,13 +4,11 @@
echo 'ProxySG MemPool'.'\n';
if ($device['os'] == 'sgos') {
$used = str_replace('"', "", snmp_get($device, "BLUECOAT-SG-PROXY-MIB::sgProxyMemSysUsage.0", '-OUvQ'));
$total = str_replace('"', "", snmp_get($device, "BLUECOAT-SG-PROXY-MIB::sgProxyMemAvailable.0", '-OUvQ'));
$free = ($total - $used);
$percent = ($used / $total * 100);
$used = str_replace('"', "", snmp_get($device, "BLUECOAT-SG-PROXY-MIB::sgProxyMemSysUsage.0", '-OUvQ'));
$total = str_replace('"', "", snmp_get($device, "BLUECOAT-SG-PROXY-MIB::sgProxyMemAvailable.0", '-OUvQ'));
$free = ($total - $used);
$percent = ($used / $total * 100);
$mempool['used'] = ($used);
$mempool['free'] = ($free);
$mempool['total'] = (($used + $free));
}
$mempool['used'] = ($used);
$mempool['free'] = ($free);
$mempool['total'] = (($used + $free));

17
includes/polling/mempools/sonicwall-mem.inc.php
View File

@@ -9,13 +9,12 @@
* option) any later version. Please see LICENSE.txt at the top level of
* the source code distribution for details.
*/
if ($device['os'] == 'sonicwall') {
echo 'SonicWALL-MEMORY-POOL: ';
$perc = str_replace('"', "", snmp_get($device, 'SONICWALL-FIREWALL-IP-STATISTICS-MIB::sonicCurrentRAMUtil.0', '-OvQ'));
if (is_numeric($perc)) {
$mempool['perc'] = $perc;
$mempool['used'] = $perc;
$mempool['total'] = 100;
$mempool['free'] = 100 - $perc;
}
echo 'SonicWALL-MEMORY-POOL: ';
$perc = str_replace('"', "", snmp_get($device, 'SONICWALL-FIREWALL-IP-STATISTICS-MIB::sonicCurrentRAMUtil.0', '-OvQ'));
if (is_numeric($perc)) {
$mempool['perc'] = $perc;
$mempool['used'] = $perc;
$mempool['total'] = 100;
$mempool['free'] = 100 - $perc;
}

16
includes/polling/mempools/zywall.inc.php
View File

@@ -10,13 +10,11 @@
* the source code distribution for details.
*/
if ($device['os'] == 'zywall') {
d_echo('Zywall');
$perc = snmp_get($device, ".1.3.6.1.4.1.890.1.6.22.1.2.0", '-OvQ');
if (is_numeric($perc)) {
$mempool['perc'] = $perc;
$mempool['used'] = $perc;
$mempool['total'] = 100;
$mempool['free'] = 100 - $perc;
}
d_echo('Zywall');
$perc = snmp_get($device, ".1.3.6.1.4.1.890.1.6.22.1.2.0", '-OvQ');
if (is_numeric($perc)) {
$mempool['perc'] = $perc;
$mempool['used'] = $perc;
$mempool['total'] = 100;
$mempool['free'] = 100 - $perc;
}

18
includes/polling/mempools/zyxel.inc.php
View File

@@ -23,16 +23,14 @@
* @author Neil Lathwood <neil@lathwood.co.uk>
*/
if ($device['group'] == 'zyxel') {
echo 'Zyxel: ';
$oid = '.1.3.6.1.4.1.890.1.15.3.2.5.0';
$perc = snmp_get($device, $oid, '-OvQ');
if (is_numeric($perc)) {
$mempool['perc'] = $perc;
$mempool['used'] = $perc;
$mempool['total'] = 100;
$mempool['free'] = 100 - $perc;
}
echo 'Zyxel: ';
$oid = '.1.3.6.1.4.1.890.1.15.3.2.5.0';
$perc = snmp_get($device, $oid, '-OvQ');
if (is_numeric($perc)) {
$mempool['perc'] = $perc;
$mempool['used'] = $perc;
$mempool['total'] = 100;
$mempool['free'] = 100 - $perc;
}
unset(