tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '854-no-estan-funcionando-modulos-snmp-mediante-wizard-interfaces' into 'develop' 

Add support for auto IP addresses to SNMP modules.

See merge request !473
This commit is contained in:
vgilc 2017-05-17 09:26:51 +02:00
parent ead3556700 c317fa478c
commit bd340f2327
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/lib/PandoraFMS/NetworkServer.pm
View File

@ -339,8 +339,8 @@ sub pandora_snmp_get_command ($$$$$$$$$$$) {
# Makes a call to SNMP modules to get a value,
##########################################################################
sub pandora_query_snmp ($$$) {
my ($pa_config, $module, $dbh) = @_;
sub pandora_query_snmp ($$$$) {
my ($pa_config, $module, $ip_target, $dbh) = @_;
my $snmp_version = $module->{"tcp_send"}; # (1, 2, 2c or 3)
my $snmp3_privacy_method = $module->{"custom_string_1"}; # DES/AES
@ -350,7 +350,7 @@ sub pandora_query_snmp ($$$) {
my $snmp3_auth_pass = pandora_output_password($pa_config, $module->{"plugin_pass"});
my $snmp3_auth_method = $module->{"plugin_parameter"}; #MD5/SHA1
my $snmp_community = $module->{"snmp_community"};
my $snmp_target = $module->{"ip_target"};
my $snmp_target = $ip_target;
my $snmp_oid = $module->{"snmp_oid"};
my $snmp_port = $module->{"tcp_port"};
@ -493,7 +493,7 @@ sub exec_network_module ($$$$) {
($id_tipo_modulo == 16) ||
($id_tipo_modulo == 17)) {
($module_data, $module_result) = pandora_query_snmp ($pa_config, $module, $dbh);
($module_data, $module_result) = pandora_query_snmp ($pa_config, $module, $ip_target, $dbh);
if ($module_result == 0) { # A correct SNMP Query
# SNMP_DATA_PROC