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

Updates from og-snmp-replay branch to allow browsing on any device

Browse Source 
commit d495aa6e32373f9c4e1da1afd029ebebfacf414e
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Nov 13 12:58:45 2021 +0000

    improve doc

commit bc0ffeef4a7752f39da77a6a876bb2c434060a0f
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Nov 13 12:42:35 2021 +0000

    scroll to parent node

commit 2b681436a96032532efa39a157d308866fcadad0
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Nov 13 08:00:30 2021 +0000

    fix param for ajax content template

commit 7c79e4c25cf7607194b46822c2b5a0b96607d104
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Nov 13 08:00:08 2021 +0000

    better error on pseudo when datafile missing

commit 005482b53b039bb55eb54d5b150a4be5eeba5262
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Thu Nov 11 20:56:18 2021 +0000

    saving device_browser data can now be done on real device

commit b72a6cd9f5c3f57d4383153f99e05414c99ab89f
Merge: 0b04aba3 6545fff0
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Thu Nov 11 08:24:27 2021 +0000

    Merge branch 'master' into og-snmp-replay

commit 0b04aba33a730dcec6ef1cb2c2034a916a374fda
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Nov 5 08:53:39 2021 +0000

    make sure node search and typeahead are restricted to current device only

commit 64f54866eef278a0a9540163105e7a36edde797a
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Nov 5 08:49:23 2021 +0000

    update manifest

commit 7f3cbee922a56100fcce08ab341eb0502cd984a8
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Nov 5 08:47:58 2021 +0000

    add requirements for this branch

commit 9a89136a19ce13003921a0813257cc3f85ce9d26
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Nov 5 08:45:04 2021 +0000

    make sure device_browser is visited in delete and renumber

commit ee723b6b26f60047082bbdf6ebec535916e06124
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Nov 2 15:11:49 2021 +0000

    limit rows in typeahead

commit d165584c698cec42f915f1fb56c59a9fe2b822e9
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Nov 2 15:08:47 2021 +0000

    implement typeahead for leaf search

commit 8c41d8c8f60021f1a3e7ee087970c3b46c32ec8c
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Nov 2 14:41:14 2021 +0000

    minor ui fixes

commit 97b1cf0212ec8c0c2b178447c9a2071c444f04c9
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Nov 2 14:29:28 2021 +0000

    working search

commit d3201b919fcbc3bd8041d0aab3fd1a304ceff9e9
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Nov 2 09:03:17 2021 +0000

    stub handler for search and add recurse control

commit 07f82717292f07dc17a287a726b8e32ca777974d
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Nov 2 08:31:15 2021 +0000

    add helpful message when no browser rows for the device

commit f88b7a00cc558e9612a38ca0d387f22d7051429c
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Nov 2 08:20:17 2021 +0000

    hide snmp tab if no browser rows in the db

commit cd397e8a50661bc89dce78944de16823d317ad40
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Nov 1 20:15:20 2021 +0000

    change so that saving to database is only at CLI and on request

commit 9b2d821e705a311ff361d59e834bbbba45769d1a
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Nov 1 19:58:43 2021 +0000

    complete custom munge

commit 571b7aa0c0541e2ebcfc51a5062663fd5a8db27e
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Nov 1 17:45:00 2021 +0000

    additional js for munge select

commit 18497018f2ee5d4989231279f61e255f31b1a845
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Nov 1 08:34:47 2021 +0000

    show the munger and option (not working) to change

commit 1d251a73447a9b7d1117072a344b362d4e572cb0
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Nov 1 07:40:22 2021 +0000

    reject unknown mungers

commit 1d5bb9135735732148d3b2b848a30d825f66316c
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sun Oct 31 22:47:54 2021 +0000

    factor out the munge and make safer

commit a654a55b6b250c65f10b2dbb1263038c58e64cfc
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sun Oct 31 20:59:40 2021 +0000

    limit the opening of child nodes to keep response good and unclutter

commit fd92f79cf334a60dfd87ade819c38a2bd9e0fc0f
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sun Oct 31 13:16:42 2021 +0000

    fix sorting on object values

commit 8acf7ebeeaffb9a858aa7750caed08a22ed7b737
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Oct 30 14:18:50 2021 +0100

    make safer the rendering of value data (but need to come back to key ordering)

commit 0ae21ac397f4cf9f1165b15f3e7fd42a048f18f1
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Oct 30 13:33:45 2021 +0100

    make sure to filter by IP on device_browser

commit bd6723992fb6e6cf9b171485519ac99304a53e22
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 29 21:53:33 2021 +0100

    some dubious code to munge the data

commit d84954d18660f888ffc113e5bfed3215a3aa8b1c
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 29 20:53:24 2021 +0100

    store munge hint

commit 794b935d4cdd1419a8e7de2efb506180a882cfad
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 29 16:33:14 2021 +0100

    add node template, make scrollable, pretty print data values (insecure)

commit 5cd6df7fd78964f7a8294ff4bf38f4a3848069ac
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 29 15:41:11 2021 +0100

    render the snmp node detail

commit e189d8cd32926a6f9389824e9cabfd1e98620ae3
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 29 12:50:17 2021 +0100

    fix sql bug, add better index, prettify tree

commit ac56cecf1c6ea7a11789e48cefadd6fc59aa4fb0
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 29 10:09:28 2021 +0100

    simplify SQL to speed up (more complicated perl)

commit 0b013c0f4cf1543547fce10f6b799575b4e3bdf4
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 29 08:49:35 2021 +0100

    store both oid and oid_parts

commit dae70f7898142a8fb888b0448a848f25d318f90e
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Thu Oct 28 23:23:50 2021 +0100

    fix to work when first displaying tree

commit e9d2160db15b16dca991d255c18d45d9dc36c16a
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Thu Oct 28 23:17:42 2021 +0100

    working very slow tree expand

commit 52f705eb229ee236e0db92d3c65f0226f708b199
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Thu Oct 28 18:44:22 2021 +0100

    make jstree start working

commit dae74e19079d71d354bcbacaef90f61f598d5051
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Thu Oct 28 16:44:02 2021 +0100

    fix sql for children

commit f8c15bc8eaf4fd753b6163830e0ad11fbb41dc0e
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Thu Oct 28 16:12:51 2021 +0100

    store oid as int array

commit 140ef93ebbe8eb39c9c54db68e75d3de3855d303
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Thu Oct 28 08:34:21 2021 +0100

    rename table and add relation

commit 0d5e5189ec2899c9c5c39a74f6319ea71bc600e3
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Thu Oct 28 07:27:50 2021 +0100

    have all oid in separte table (60 seconds load on my laptop)

commit 3876cca52e362870bac4461a12d2c38c7b3165e0
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Wed Oct 27 23:37:38 2021 +0100

    add virtual search for oid children

commit f534d7f93e24853df8a6b64928a1645850a9e549
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Wed Oct 27 17:25:37 2021 +0100

    start web plugin for browser

commit 961d5122302c2799242879a720700b514ac176e8
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Wed Oct 27 16:28:01 2021 +0100

    add auto increment col and oid index to browser

commit 2e9bdf3bd8610030614ff7e2732e8db6c11c23ed
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Wed Oct 27 16:21:34 2021 +0100

    store values and meta

commit f95a60f7b8e073013831297ce4b0010d3c5bf7fc
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Wed Oct 27 11:09:38 2021 +0100

    start of work on loading walk into db for browsing

commit 07be9d5dc9be3832754c924604bf95d0b1d51a14
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Wed Oct 27 08:06:45 2021 +0100

    update for new format oids file

commit ebb2a4a34b18cd573ccd71ba349416c797331d21
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Oct 25 22:51:49 2021 +0100

    update to use new netdisco-mibs object cache

commit 06c47566cf8935d2af8eb6240cef707c33a21b5a
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sun Oct 24 22:26:32 2021 +0100

    hide snapshot management for pseudo devices

commit 4618bfcffd2043fa1c1d9c0cacf07de2065e15ea
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sun Oct 24 18:17:53 2021 +0100

    fixes for errors in subnet mask searching

commit 94fa16dbba284cb08239980908bd2463e0adab38
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sun Oct 24 18:07:16 2021 +0100

    small ux improvements on snap download

commit cc01bd06d13fa8488a2a2d409f172b5cc849dec3
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sun Oct 24 14:43:33 2021 +0100

    expose snapshots in device details tab

commit 7d51f8812de2016ad8e6d38711bda606fceddcc9
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sun Oct 24 13:20:11 2021 +0100

    store snapshot to database instead of Job

commit 24748c19d06b85aac7a2ae1661207c7833518f7e
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sun Oct 24 09:27:24 2021 +0100

    tweaked uptime check

commit 9df8f9ccb292d3148b2d9cb49778e95fc46ee035
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sun Oct 24 09:19:32 2021 +0100

    no need to b64 encode binary data in scalars as we b64 whole thing after

commit ea9310161e11eb9ed7128eea369ed5027f899154
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Oct 23 23:58:32 2021 +0100

    color all cells for layers for pseudo

commit 1252534849fd48f6eb47787147f24188c99a9942
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Oct 23 23:36:22 2021 +0100

    display pseudo devices with yellow pill for name

commit 9b889ba07ab3162363c2cec69a42b3aff0dc5d4e
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Oct 23 23:29:20 2021 +0100

    check for hrSystemUptime as well as sysUpTime for snmp connect

commit 8ba525f3b904a903fb6088e433c10c26c2f8f1a9
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Oct 23 23:07:06 2021 +0100

    support for loading cache for pseudo devices

commit 9516558e83a24a3b7630b9fb7ad12fe911754a3d
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Oct 23 22:40:06 2021 +0100

    add is_pseudo column to device table

commit bef72a22df8daaff9b4572661dd6d8dd9dccea5f
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Oct 23 21:55:11 2021 +0100

    add doc for netdisco-do

commit 57fdae492f9541ee0b7f6f1b187c6be1a33d97f0
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Oct 23 21:50:46 2021 +0100

    also save to logs/snapshots/IP

commit 25981cadb22b14a92eb1a64fa241fc3d78db75a3
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Oct 23 19:54:51 2021 +0100

    fake cache entry for all ND2 methods called, add comments

commit 5d61fcfd2439aa4c6baf51f72b6c80315dbdef09
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Oct 23 19:36:50 2021 +0100

    fix regexp for matching netdisco-mibs report

commit 18f8714b23f4c14ffe96489e76e1a4c85670ffc6
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Oct 23 18:55:19 2021 +0100

    implement aliasing from globals and funcs

commit 282558a43479ab6c977177ef1102b8a71e8a848e
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 22 22:00:25 2021 +0100

    better aliasing

commit 20e0b2221e390192ff0216d20739f0a15075cb66
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 22 19:31:21 2021 +0100

    add func/glob aliasing broken

commit 643b9aff0a8490010ba2911f84775b9b4f1b4b3d
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 22 19:24:52 2021 +0100

    can now bulkwalk and parse mibs report and store resolved walk in cache

commit efaeb8e2816cdebe5d7a7a85bca598c961d5f993
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 22 12:58:42 2021 +0100

    implement walk code copied from SNMP::Info

commit bacbadf680026a5cca240ca43a110ee489d8adb7
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 22 07:31:44 2021 +0100

    rename gather to snapshot

commit c8b6bdb3153809744c92ffd214b279225b0b16a2
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Fri Oct 22 07:27:21 2021 +0100

    fix the broken report parser

commit a513d55fd261c4ebfb923d7b43ac10ce8c68cb6a
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Thu Oct 21 23:27:52 2021 +0100

    now parsing mbis report to translate

commit 3e4a0be44dabc131032a1887244bb1fbb3b6ae9d
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Oct 19 20:15:36 2021 +0100

    store results back to job

commit e7e71f5ec98d4218ea77dbdfaef63f11415f36c5
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Oct 19 20:00:36 2021 +0100

    fix encoding of binary storage

commit 37690deaba1aa07a93431e413dcc1bb7bc01f515
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Oct 19 17:41:34 2021 +0100

    add gather worker

commit 67cd50a21a27eae8f700b0a0f628af11f12dedf7
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Oct 19 16:55:39 2021 +0100

    fix anomalous name
This commit is contained in:
Oliver Gorwits
2021-11-13 12:59:21 +00:00
parent 6545fff0c2
commit 24c68f4a04
5 changed files with 153 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/netdisco-do
View File

@@ -428,15 +428,16 @@ Performs an snmp walk from L<.1.3.6.1> on the device and builds a data
structure which SNMP::Info can use to mimic the device. The structure is
saved into the L<device_snapshot> database table.
Pass a value to the L<-p> parameter (mnemonic: persist) and the base64 encoded
data will also be saved to L<NETDISCO_HOME/logs/snapshots/IP> (where L<IP> is
the canonical IP of the device passed). Netdisco will load this for any pseudo
device with the same canonical IP.
Optionally, pass a value to the L<-p> parameter (mnemonic: persist) and the
base64 encoded data will also be saved to L<NETDISCO_HOME/logs/snapshots/IP>
(where L<IP> is the canonical IP of the device passed). Netdisco will load
this for any pseudo device with the same canonical IP.
~/bin/netdisco-do snapshot -d 192.0.2.1 -p yes
Pass a value to the L<-e> parameter (mnemonic: explore> and the data is also
saved into the Netdisco database for web browsing (under Device->SNMP tab).
Optionally, pass a value to the L<-e> parameter (mnemonic: explore> and the
data is also saved into the Netdisco database for web browsing (under
Device->SNMP tab).
~/bin/netdisco-do snapshot -d 192.0.2.1 -e yes

6
lib/App/Netdisco/Transport/SNMP.pm
View File

@@ -65,7 +65,10 @@ sub reader_for {
my $device = get_device($ip) or return undef;
my $pseudo_cache = catfile( catdir(($ENV{NETDISCO_HOME} || $ENV{HOME}), 'logs', 'snapshots'), $device->ip );
return undef if $device->in_storage and $device->is_pseudo and ! -f $pseudo_cache;
if ($device->in_storage and $device->is_pseudo and ! -f $pseudo_cache) {
error sprintf 'transport error - cannot act on pseudo-device [%s] without offline cache', $device->ip;
return undef;
}
my $readers = $class->instance->readers or return undef;
return $readers->{$device->ip} if exists $readers->{$device->ip};
@@ -168,6 +171,7 @@ sub _snmp_connect_generic {
my $pseudo_cache = catfile( catdir(($ENV{NETDISCO_HOME} || $ENV{HOME}), 'logs', 'snapshots'), $device->ip );
$snmp_args{Cache} = thaw( decode_base64( read_text($pseudo_cache) ) );
$snmp_args{Offline} = 1;
debug sprintf 'snmp transport running in offline mode for: [%s]', $device->ip;
}
# get the community string(s)

2
lib/App/Netdisco/Web/Plugin/Device/SNMP.pm
View File

@@ -19,7 +19,7 @@ register_device_tab({ tag => 'snmp', label => 'SNMP',
get '/ajax/content/device/snmp' => require_login sub {
my $device = try { schema('netdisco')->resultset('Device')
->find( param('ip') ) }
->find( param('q') ) }
or send_error('Bad Device', 404);
template 'ajax/device/snmp.tt', { device => $device->ip },

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

@@ -25,127 +25,59 @@ register_worker({ phase => 'check' }, sub {
register_worker({ phase => 'main', driver => 'snmp' }, sub {
my ($job, $workerconf) = @_;
my $device = $job->device;
my $save_browser = $job->extra;
my $save_file = $job->port;
my $save_db = $job->extra;
# needed to avoid $var being returned with leafname and breaking loop checks
$SNMP::use_numeric = 1;
# might restore a cache if there's one on disk
my $snmp = App::Netdisco::Transport::SNMP->reader_for($device)
or return Status->defer("snapshot failed: could not SNMP connect to $device");
my %oidmap = getoidmap($device, $snmp);
my %walk = walker($device, $snmp, '.1.3.6.1'); # 10205 rows
# my %walk = walker($device, $snmp, '.1.3.6.1.2.1.2.2.1.6'); # 22 rows, i_mac/ifPhysAddress
my %munges = get_munges($snmp);
my %munge = %{ $snmp->munge() };
my %munge_set = ();
# only if not pseudo device
walk_and_store($device, $snmp, %oidmap) if not $device->is_pseudo;
# take the snmpwalk of the device which is numeric (no MIB translateObj),
# resolve to MIB identifiers using netdisco-mibs, then store in SNMP::Info
# instance cache
# load the cache
my %cache = %{ $snmp->cache() };
my (%tables, %leaves, @realoids) = ((), (), ());
OID: foreach my $orig_oid (keys %walk) {
my $oid = $orig_oid;
my $idx = '';
# finally, freeze the cache, then base64 encode, store in the DB,
# optionally store browsing data, and optionally save file.
while (length($oid) and !exists $oidmap{$oid}) {
$oid =~ s/\.(\d+)$//;
$idx = ($idx ? "${1}.${idx}" : $1);
}
if (exists $oidmap{$oid}) {
$idx =~ s/^\.//;
my $leaf = $oidmap{$oid};
if ($idx eq 0) {
push @realoids, $oid;
$leaves{ $leaf } = $walk{$orig_oid};
$munge_set{$leaf} = subname($munge{$leaf}) if exists $munge{$leaf};
}
else {
push @realoids, $oid if !exists $tables{ $leaf };
$tables{ $leaf }->{$idx} = $walk{$orig_oid};
$munge_set{$leaf} = subname($munge{$leaf}) if exists $munge{$leaf};
}
# debug "snapshot $device - cached $oidmap{$oid}($idx)";
next OID;
}
debug "snapshot $device - missing OID $orig_oid in netdisco-mibs";
}
$snmp->_cache($_, $leaves{$_}) for keys %leaves;
$snmp->_cache($_, $tables{$_}) for keys %tables;
# we want to add in the GLOBALS and FUNCS aliases which users
# have created in the SNMP::Info device class, with binary copy
# of data so that it can be frozen
my %cache = %{ $snmp->cache() };
my %funcs = %{ $snmp->funcs() };
my %globals = %{ $snmp->globals() };
while (my ($alias, $leaf) = each %globals) {
if (exists $cache{"_$leaf"} and !exists $cache{"_$alias"}) {
$snmp->_cache($alias, $cache{"_$leaf"});
}
$munge_set{$leaf} = subname($munge{$alias}) if exists $munge{$alias};
}
while (my ($alias, $leaf) = each %funcs) {
if (exists $cache{store}->{$leaf} and !exists $cache{store}->{$alias}) {
$snmp->_cache($alias, dclone $cache{store}->{$leaf});
}
$munge_set{$leaf} = subname($munge{$alias}) if exists $munge{$alias};
}
# now for any other SNMP::Info method in GLOBALS or FUNCS which Netdisco
# might call, but will not have data, we fake a cache entry to avoid
# throwing errors
# refresh the cache
%cache = %{ $snmp->cache() };
while (my $method = <DATA>) {
$method =~ s/\s//g;
next unless length $method and !exists $cache{"_$method"};
$snmp->_cache($method, {}) if exists $funcs{$method};
$snmp->_cache($method, '') if exists $globals{$method};
}
# finally, freeze the cache, then base64 encode, store in the DB, and
# optionally save file.
# refresh the cache again
%cache = %{ $snmp->cache() };
debug "snapshot $device - cacheing snapshot bundle";
my $frozen = encode_base64( nfreeze( \%cache ) );
$device->update_or_create_related('snapshot', {cache => $frozen});
if ($save_db) {
if ($save_browser) {
debug "snapshot $device - cacheing snapshot for browsing";
my %seenoid = ();
my @browser = map {{
oid => $_,
oid_parts => [ grep {length} (split m/\./, $_) ],
leaf => $oidmap{$_},
munge => $munge_set{ $oidmap{$_} },
munge => $munges{ $oidmap{$_} },
value => do { my $m = $oidmap{$_}; encode_base64( nfreeze( [$snmp->$m] ) ); },
}} sort {sortable_oid($a) cmp sortable_oid($b)} @realoids;
}} sort {sortable_oid($a) cmp sortable_oid($b)}
grep {not $seenoid{$_}++}
grep {m/^\.1\.3\.6\.1/}
map {s/^_//; $_}
keys %cache;
schema('netdisco')->txn_do(sub {
my $gone = $device->oids->delete;
debug sprintf ' [%s] snapshot - removed %d oids',
debug sprintf 'snapshot %s - removed %d oids from db',
$device->ip, $gone;
$device->oids->populate(\@browser);
debug sprintf ' [%s] snapshot - added %d new oids',
debug sprintf 'snapshot %s - added %d new oids to db',
$device->ip, scalar @browser;
});
}
debug "snapshot $device - cacheing snapshot bundle";
my $frozen = encode_base64( nfreeze( \%cache ) );
$device->update_or_create_related('snapshot', {cache => $frozen});
if ($save_file) {
my $target_dir = catdir(($ENV{NETDISCO_HOME} || $ENV{HOME}), 'logs', 'snapshots');
make_path($target_dir);
@@ -181,6 +113,112 @@ sub getoidmap {
return %oidmap;
}
sub get_munges {
my $snmp = shift;
my %munge_set = ();
my %munge = %{ $snmp->munge() };
my %funcs = %{ $snmp->funcs() };
my %globals = %{ $snmp->globals() };
while (my ($alias, $leaf) = each %globals) {
$munge_set{$leaf} = subname($munge{$leaf}) if exists $munge{$leaf};
$munge_set{$leaf} = subname($munge{$alias}) if exists $munge{$alias};
}
while (my ($alias, $leaf) = each %funcs) {
$munge_set{$leaf} = subname($munge{$leaf}) if exists $munge{$leaf};
$munge_set{$leaf} = subname($munge{$alias}) if exists $munge{$alias};
}
return %munge_set;
}
sub walk_and_store {
my ($device, $snmp, %oidmap) = @_;
my %walk = walker($device, $snmp, '.1.3.6.1'); # 10205 rows
# my %walk = walker($device, $snmp, '.1.3.6.1.2.1.2.2.1.6'); # 22 rows, i_mac/ifPhysAddress
# take the snmpwalk of the device which is numeric (no MIB translateObj),
# resolve to MIB identifiers using netdisco-mibs, then store in SNMP::Info
# instance cache
my (%tables, %leaves, @realoids) = ((), (), ());
OID: foreach my $orig_oid (keys %walk) {
my $oid = $orig_oid;
my $idx = '';
while (length($oid) and !exists $oidmap{$oid}) {
$oid =~ s/\.(\d+)$//;
$idx = ($idx ? "${1}.${idx}" : $1);
}
if (exists $oidmap{$oid}) {
$idx =~ s/^\.//;
my $leaf = $oidmap{$oid};
if ($idx eq 0) {
push @realoids, $oid;
$leaves{ $leaf } = $walk{$orig_oid};
}
else {
push @realoids, $oid if !exists $tables{ $leaf };
$tables{ $leaf }->{$idx} = $walk{$orig_oid};
}
# debug "snapshot $device - cached $oidmap{$oid}($idx)";
next OID;
}
debug "snapshot $device - missing OID $orig_oid in netdisco-mibs";
}
$snmp->_cache($_, $leaves{$_}) for keys %leaves;
$snmp->_cache($_, $tables{$_}) for keys %tables;
# add in any GLOBALS and FUNCS aliases which users have created in the
# SNMP::Info device class, with binary copy of data so that it can be frozen
my %cache = %{ $snmp->cache() };
my %funcs = %{ $snmp->funcs() };
my %globals = %{ $snmp->globals() };
while (my ($alias, $leaf) = each %globals) {
if (exists $cache{"_$leaf"} and !exists $cache{"_$alias"}) {
$snmp->_cache($alias, $cache{"_$leaf"});
}
}
while (my ($alias, $leaf) = each %funcs) {
if (exists $cache{store}->{$leaf} and !exists $cache{store}->{$alias}) {
$snmp->_cache($alias, dclone $cache{store}->{$leaf});
}
}
# now for any other SNMP::Info method in GLOBALS or FUNCS which Netdisco
# might call, but will not have data, we fake a cache entry to avoid
# throwing errors
# refresh the cache
%cache = %{ $snmp->cache() };
while (my $method = <DATA>) {
$method =~ s/\s//g;
next unless length $method and !exists $cache{"_$method"};
$snmp->_cache($method, {}) if exists $funcs{$method};
$snmp->_cache($method, '') if exists $globals{$method};
}
# put into the cache an oid ref to each leaf name
# this allows rebuild of browser data from a frozen cache
foreach my $oid (@realoids) {
my $leaf = $oidmap{$oid} or next;
$snmp->_cache($oid, $snmp->$leaf);
}
}
# taken from SNMP::Info and adjusted to work on walks outside a single table
sub walker {
my ($device, $snmp, $base) = @_;

9
share/views/ajax/device/snmp.tt
View File

@@ -115,8 +115,15 @@
});
$('#jstree').on("search.jstree", function (e, data) {
if (data.res.length) {
document.getElementById( data.res[0] + '_anchor' ).scrollIntoView();
$('#node').load('[% uri_base | none %]/ajax/content/device/[% device %]/snmpnode/' + data.res[0]);
$("#jstree").jstree().deselect_all(true);
$('#jstree').jstree('select_node', data.res[0] + '_anchor');
var node = $('#jstree').jstree("get_selected", true);
var path = $('#jstree').jstree().get_path(node[0], false, true);
var parent = path[path.length - 2];
document.getElementById( parent ).scrollIntoView();
}
});
$("#searchTreeForm").submit(function(e) {