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

Update use of max repeaters to save mysql queries

Browse Source
This commit is contained in:
laf
2016-07-30 15:11:29 +01:00
parent 9e305241fd
commit d722bb6943
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
includes/discovery/functions.inc.php
View File

@@ -89,6 +89,7 @@ function discover_device($device, $options = null) {
$valid = array();
// Reset $valid array
$attribs = get_dev_attribs($device['device_id']);
$device['snmp_max_repeaters'] = $attribs['snmp_max_repeaters'];
$device_start = microtime(true);
// Start counting device poll time

1
includes/polling/functions.inc.php
View File

@@ -152,6 +152,7 @@ function poll_device($device, $options) {
global $config, $device, $polled_devices, $db_stats, $memcache;
$attribs = get_dev_attribs($device['device_id']);
$device['snmp_max_repeaters'] = $attribs['snmp_max_repeaters'];
$status = 0;
unset($array);

12
includes/snmp.inc.php
View File

@@ -167,7 +167,7 @@ function snmp_walk($device, $oid, $options=null, $mib=null, $mibdir=null) {
}
else {
$snmpcommand = $config['snmpbulkwalk'];
$max_repeaters = get_dev_attrib($device, 'snmp_max_repeaters');
$max_repeaters = $device['snmp_max_repeaters'];
if ($max_repeaters > 0) {
$snmpcommand .= " -Cr$max_repeaters ";
}
@@ -234,7 +234,7 @@ function snmpwalk_cache_cip($device, $oid, $array=array(), $mib=0) {
}
else {
$snmpcommand = $config['snmpbulkwalk'];
$max_repeaters = get_dev_attrib($device, 'snmp_max_repeaters');
$max_repeaters = $device['snmp_max_repeaters'];
if ($max_repeaters > 0) {
$snmpcommand .= " -Cr$max_repeaters ";
}
@@ -309,7 +309,7 @@ function snmp_cache_ifIndex($device) {
}
else {
$snmpcommand = $config['snmpbulkwalk'];
$max_repeaters = get_dev_attrib($device, 'snmp_max_repeaters');
$max_repeaters = $device['snmp_max_repeaters'];
if ($max_repeaters > 0) {
$snmpcommand .= " -Cr$max_repeaters ";
}
@@ -473,7 +473,7 @@ function snmpwalk_cache_twopart_oid($device, $oid, $array, $mib=0) {
}
else {
$snmpcommand = $config['snmpbulkwalk'];
$max_repeaters = get_dev_attrib($device, 'snmp_max_repeaters');
$max_repeaters = $device['snmp_max_repeaters'];
if ($max_repeaters > 0) {
$snmpcommand .= " -Cr$max_repeaters ";
}
@@ -531,7 +531,7 @@ function snmpwalk_cache_threepart_oid($device, $oid, $array, $mib=0) {
}
else {
$snmpcommand = $config['snmpbulkwalk'];
$max_repeaters = get_dev_attrib($device, 'snmp_max_repeaters');
$max_repeaters = $device['snmp_max_repeaters'];
if ($max_repeaters > 0) {
$snmpcommand .= " -Cr$max_repeaters ";
}
@@ -593,7 +593,7 @@ function snmp_cache_slotport_oid($oid, $device, $array, $mib=0) {
}
else {
$snmpcommand = $config['snmpbulkwalk'];
$max_repeaters = get_dev_attrib($device, 'snmp_max_repeaters');
$max_repeaters = $device['snmp_max_repeaters'];
if ($max_repeaters > 0) {
$snmpcommand .= " -Cr$max_repeaters ";
}