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

SnmpQuery, respect snmp.max_oid (#14894)

Browse Source 
Previously, the code would query all the oids it received. Now it will split it up into multiple queries if too many are sent.

Prevents some devices snmp service from crashing.
This commit is contained in:
Tony Murray
2023-03-13 10:17:34 -05:00
committed by GitHub
parent 2a4c50ed19
commit d3f02e6bb7
6 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
LibreNMS/Data/Source/NetSnmpQuery.php
View File

@@ -250,11 +250,7 @@ class NetSnmpQuery implements SnmpQueryInterface
*/
public function get($oid): SnmpResponse
{
if (empty($oid)) {
return new SnmpResponse('');
}
return $this->exec('snmpget', $this->parseOid($oid));
return $this->execMultiple('snmpget', $this->limitOids($this->parseOid($oid)));
}
/**
@@ -278,7 +274,7 @@ class NetSnmpQuery implements SnmpQueryInterface
*/
public function next($oid): SnmpResponse
{
return $this->exec('snmpgetnext', $this->parseOid($oid));
return $this->execMultiple('snmpgetnext', $this->limitOids($this->parseOid($oid)));
}
/**
@@ -374,7 +370,7 @@ class NetSnmpQuery implements SnmpQueryInterface
$response = new SnmpResponse('');
foreach ($oids as $oid) {
$response = $response->append($this->exec($command, [$oid]));
$response = $response->append($this->exec($command, Arr::wrap($oid)));
// if abort on failure is set, return after first failure
if ($this->abort && ! $response->isValid()) {
@@ -500,10 +496,20 @@ class NetSnmpQuery implements SnmpQueryInterface
Log::debug($error);
}
/**
* @param array|string $oid
*/
private function parseOid($oid): array
private function limitOids(array $oids): array
{
// get max oids per query device attrib > os setting > global setting
$configured_max = $this->device->getAttrib('snmp_max_oid') ?: Config::getOsSetting($this->device->os, 'snmp_max_oid', Config::get('snmp.max_oid', 10));
$max_oids = max($configured_max, 1); // 0 or less would break things.
if (count($oids) > $max_oids) {
return array_chunk($oids, $max_oids);
}
return $oids;
}
private function parseOid(array|string $oid): array
{
return is_string($oid) ? explode(' ', $oid) : $oid;
}