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

fixes in non agent per database 

Former-commit-id: 180cf7269886787b17dc359bf941b5ce5e1b1313
This commit is contained in:
fbsanchez 2019-04-05 10:41:09 +02:00
parent e76a5af441
commit db9068e25a
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -475,6 +475,16 @@ class DiscoveryTaskList extends Wizard
$data[6] .= __('Discovery.App.MySQL'); $data[6] .= __('Discovery.App.MySQL');
break; break;
case DISCOVERY_APP_ORACLE:
// Discovery Applications Oracle.
$data[6] = html_print_image(
'images/network.png',
true,
['title' => __('Discovery Applications Oracle')]
).'  ';
$data[6] .= __('Discovery.App.Oracle');
break;
case DISCOVERY_HOSTDEVICES: case DISCOVERY_HOSTDEVICES:
default: default:
// Discovery NetScan. // Discovery NetScan.
@ -631,6 +641,9 @@ class DiscoveryTaskList extends Wizard
case DISCOVERY_APP_MYSQL: case DISCOVERY_APP_MYSQL:
return 'wiz=app&mode=mysql&page=0'; return 'wiz=app&mode=mysql&page=0';
case DISCOVERY_APP_ORACLE:
return 'wiz=app&mode=oracle&page=0';
case DISCOVERY_APP_VMWARE: case DISCOVERY_APP_VMWARE:
return 'wiz=app&mode=vmware&page=0'; return 'wiz=app&mode=vmware&page=0';

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

@ -1516,7 +1516,10 @@ sub db_scan($) {
push @data, @{$__data}; push @data, @{$__data};
} else { } else {
# Merge modules into engine agent. # Merge modules into engine agent.
my @_modules = map { $_->{'module_data'} } @{$__data}; my @_modules = map {
map { $_ } @{$_->{'module_data'}}
} @{$__data};
push @modules, @_modules; push @modules, @_modules;
} }
} }