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

Discovery Applications minor fixes - SAP backend

This commit is contained in:
fbsanchez 2019-11-26 15:47:04 +01:00
parent d4b99a03bb
commit a4db8483d1
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -357,6 +357,9 @@ sub pandora_load_config {
# Discovery SAP utils
$pa_config->{"sap_utils"} = "/usr/share/pandora_server/util/recon_scripts/SAP";
# Discovery SAP Artica environment
$pa_config->{"sap_artica_test"} = 0;
# braa for enterprise snmp server
$pa_config->{"braa"} = "/usr/bin/braa";
@ -855,6 +858,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^sap_utils\s(.*)/i) {
$pa_config->{'sap_utils'}= clean_blank($1);
}
elsif ($parametro =~ m/^sap_artica_test\s(.*)/i) {
$pa_config->{'sap_artica_test'}= clean_blank($1);
}
elsif ($parametro =~ m/^nmap_timing_template\s+([0-9]*)/i) {
$pa_config->{'nmap_timing_template'}= clean_blank($1);
}

10
pandora_server/lib/PandoraFMS/Recon/Base.pm
View File

@ -1556,8 +1556,8 @@ sub database_scan($$$) {
}
return {
'modules' => @modules,
'data' => @data
'modules' => \@modules,
'data' => \@data
};
}
@ -1671,14 +1671,16 @@ sub app_scan($) {
}
print Dumper($results);
# Add results.
if (ref($results) eq 'HASH') {
if (defined($results->{'modules'})) {
push @modules, $results->{'modules'};
push @modules, @{$results->{'modules'}};
}
if (defined($results->{'data'})) {
push @data, $results->{'data'};
push @data, @{$results->{'data'}};
}
}
}