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

Fix for lnms snmp:translate (#16159)

Browse Source 
Wasn't handling things correctly
Disable numeric if the oid is already numeric and add ALL mibs
This commit is contained in:
Tony Murray
2024-06-27 13:04:06 -05:00
committed by GitHub
parent 6474e1e0b8
commit afba58cb29
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Console/Commands/SnmpTranslate.php
View File

@@ -6,6 +6,7 @@ use App\Models\Device;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use LibreNMS\Data\Source\SnmpResponse; use LibreNMS\Data\Source\SnmpResponse;
use LibreNMS\Util\Oid;
use SnmpQuery; use SnmpQuery;
class SnmpTranslate extends SnmpFetch class SnmpTranslate extends SnmpFetch
@@ -37,6 +38,14 @@ class SnmpTranslate extends SnmpFetch
$res = new SnmpResponse(''); $res = new SnmpResponse('');
// translate does not support multiple oids (should it?) // translate does not support multiple oids (should it?)
foreach ($this->oids as $oid) { foreach ($this->oids as $oid) {
if (Oid::isNumeric($oid)) {
$translated = SnmpQuery::numeric(false)->mibs(['ALL'])->translate($oid);
$response = new SnmpResponse($translated . PHP_EOL);
$res = $res->append($response);
continue;
}
$translated = SnmpQuery::numeric($this->numeric)->translate($oid); $translated = SnmpQuery::numeric($this->numeric)->translate($oid);
// if we got the same back (ignoring . prefix) swap numeric // if we got the same back (ignoring . prefix) swap numeric
@@ -44,7 +53,7 @@ class SnmpTranslate extends SnmpFetch
$translated = SnmpQuery::numeric(! $this->numeric)->translate($oid); $translated = SnmpQuery::numeric(! $this->numeric)->translate($oid);
} }
$res->append(new SnmpResponse($translated . PHP_EOL)); $res = $res->append(new SnmpResponse($translated . PHP_EOL));
} }
return $res; return $res;