135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bugs to allow bulkwalk_no snapshot, and index with trailing zeros

Browse Source
This commit is contained in:
Oliver Gorwits
2021-11-25 11:37:28 +00:00
parent 7707a87476
commit 2e8384df5a
3 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/App/Netdisco/Worker/Plugin/LoadMIBs.pm
View File

@@ -39,9 +39,9 @@ register_worker({ phase => 'main' }, sub {
schema('netdisco')->txn_do(sub { schema('netdisco')->txn_do(sub {
my $gone = schema('netdisco')->resultset('SNMPObject')->delete; my $gone = schema('netdisco')->resultset('SNMPObject')->delete;
debug sprintf ' loadmibs - removed %d oids', $gone; debug sprintf 'loadmibs - removed %d oids', $gone;
schema('netdisco')->resultset('SNMPObject')->populate(\@browser); schema('netdisco')->resultset('SNMPObject')->populate(\@browser);
debug sprintf ' loadmibs - added %d new oids', scalar @browser; debug sprintf 'loadmibs - added %d new oids', scalar @browser;
}); });
return Status->done('Loaded MIBs'); return Status->done('Loaded MIBs');

30
lib/App/Netdisco/Worker/Plugin/Snapshot.pm
View File

@@ -151,7 +151,7 @@ sub walk_and_store {
while (length($oid) and !exists $oidmap{$oid}) { while (length($oid) and !exists $oidmap{$oid}) {
$oid =~ s/\.(\d+)$//; $oid =~ s/\.(\d+)$//;
$idx = ($idx ? "${1}.${idx}" : $1); $idx = ((defined $idx and length $idx) ? "${1}.${idx}" : $1);
} }
if (exists $oidmap{$oid}) { if (exists $oidmap{$oid}) {
@@ -167,7 +167,7 @@ sub walk_and_store {
$tables{ $leaf }->{$idx} = $walk{$orig_oid}; $tables{ $leaf }->{$idx} = $walk{$orig_oid};
} }
# debug "snapshot $device - cached $oidmap{$oid}($idx)"; # debug "snapshot $device - cached $oidmap{$oid}($idx) from $orig_oid";
next OID; next OID;
} }
@@ -230,26 +230,8 @@ sub walker {
my $REPEATERS = 20; my $REPEATERS = 20;
my $ver = $snmp->snmp_ver(); my $ver = $snmp->snmp_ver();
# We want the qualified leaf name so that we can
# specify the Module (MIB) in the case of private leaf naming
# conflicts. Example: ALTEON-TIGON-SWITCH-MIB::agSoftwareVersion
# and ALTEON-CHEETAH-SWITCH-MIB::agSoftwareVersion
# Third argument to translateObj specifies the Module prefix
my $qual_leaf = SNMP::translateObj($base,0,1) || '';
# We still want just the leaf since a SNMP get in the case of a
# partial fetch may strip the Module portion upon return. We need
# the match to make sure we didn't leave the table during getnext
# requests
my ($leaf) = $qual_leaf =~ /::(.+)$/;
# If we weren't able to translate, we'll only have an OID
$leaf = $base unless defined $leaf;
# debug "snapshot $device - $base translated as $qual_leaf"; # debug "snapshot $device - $base translated as $qual_leaf";
my $var = SNMP::Varbind->new( [$qual_leaf] ); my $var = SNMP::Varbind->new( [$base] );
# So devices speaking SNMP v.1 are not supposed to give out # So devices speaking SNMP v.1 are not supposed to give out
# data from SNMP2, but most do. Net-SNMP, being very precise # data from SNMP2, but most do. Net-SNMP, being very precise
@@ -290,7 +272,7 @@ sub walker {
else { else {
# GETNEXT instead of BULKWALK # GETNEXT instead of BULKWALK
# debug "snapshot $device GETNEXT $var"; # debug "snapshot $device GETNEXT $var";
$sess->getnext($var); my @x = $sess->getnext($var);
$errornum = $sess->{ErrorNum}; $errornum = $sess->{ErrorNum};
} }
@@ -299,7 +281,7 @@ sub walker {
my $oid = $var->[0] . (defined $iid ? ".${iid}" : ''); my $oid = $var->[0] . (defined $iid ? ".${iid}" : '');
# debug "snapshot $device reading $oid"; # debug "snapshot $device reading $oid";
# p $var; # use DDP; p $var;
unless ( defined $iid ) { unless ( defined $iid ) {
error "snapshot $device not here"; error "snapshot $device not here";
@@ -331,7 +313,7 @@ sub walker {
if ($loopdetect) { if ($loopdetect) {
# Check to see if we've already seen this IID (looping) # Check to see if we've already seen this IID (looping)
if ( defined $seen{$oid} and $seen{$oid} ) { if ( defined $seen{$oid} and $seen{$oid} ) {
error "Looping on: oid:$oid. "; error "Looping on: oid: $oid";
last; last;
} }
else { else {

3
share/config.yml
View File

@@ -343,6 +343,9 @@ workers:
retry_after: '7 days' retry_after: '7 days'
queue: PostgreSQL queue: PostgreSQL
# this one takes ages
snapshot_timeout: 1200
# 50 minutes # 50 minutes
jobs_stale_after: 3000 jobs_stale_after: 3000
jobs_qdepth: 50 jobs_qdepth: 50