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

import legacy sshcollector config

Browse Source
This commit is contained in:
Oliver Gorwits
2019-03-11 20:44:26 +00:00
parent 98d7a71024
commit ed675b249c
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/App/Netdisco/Configuration.pm
View File

@@ -84,6 +84,7 @@ if ((setting('snmp_auth') and 0 == scalar @{ setting('snmp_auth') })
config->{'community_rw'} = [ @{setting('community_rw')}, 'private' ]; config->{'community_rw'} = [ @{setting('community_rw')}, 'private' ];
} }
# fix up device_auth (or create it from old snmp_auth and community settings) # fix up device_auth (or create it from old snmp_auth and community settings)
# also imports legacy sshcollcetor config
config->{'device_auth'} config->{'device_auth'}
= [ App::Netdisco::Util::DeviceAuth::fixup_device_auth() ]; = [ App::Netdisco::Util::DeviceAuth::fixup_device_auth() ];

18
lib/App/Netdisco/Util/DeviceAuth.pm
View File

@@ -63,7 +63,23 @@ sub fixup_device_auth {
die "error: config: stanza in device_auth must have a tag\n" die "error: config: stanza in device_auth must have a tag\n"
if not $stanza->{tag} and exists $stanza->{user}; if not $stanza->{tag} and exists $stanza->{user};
push @new_stanzas, $stanza push @new_stanzas, $stanza;
}
# import legacy sshcollector configuration
my $sshcollector = (setting('sshcollector') || []);
foreach my $stanza (@$sshcollector) {
# defaults
$stanza->{driver} = 'cli';
$stanza->{read} = 1;
$stanza->{no} ||= [];
# fixups
$stanza->{only} ||= [ scalar delete $stanza->{ip} ||
scalar delete $stanza->{hostname} ];
$stanza->{username} = scalar delete $stanza->{user};
push @new_stanzas, $stanza;
} }
# legacy config # legacy config