tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-26 03:19:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed monitor details search by module name and module group. Ticket #4025

Browse Source 
(cherry picked from commit dbb5aeee4c79802d2a7861d6e7582219b983c388)
This commit is contained in:
Arturo Gonzalez 2016-09-12 11:54:54 +02:00
parent 18d3f1e7a0
commit ed4693a6fe
2 changed files with 420 additions and 499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/include/functions_modules.php
View File

@ -2340,7 +2340,19 @@ function modules_get_modules_name ($sql_from , $sql_conditions = '', $meta = fal
return $return; return $return;
} }
else { else {
// For each server defined and not disabled: switch ($config['dbtype']) {
case 'mysql':
case 'postgresql':
$sql = 'SELECT distinct(tagente_modulo.nombre)
'. $sql_from . $sql_conditions;
break;
case 'oracle':
$sql = 'SELECT DISTINCT(tagente_modulo.nombre)' .
$sql_from . $sql_conditions;
break;
}
// For each server defined and not disabled:h
$servers = db_get_all_rows_sql ('SELECT * $servers = db_get_all_rows_sql ('SELECT *
FROM tmetaconsole_setup FROM tmetaconsole_setup
WHERE disabled = 0'); WHERE disabled = 0');
@ -2349,6 +2361,7 @@ function modules_get_modules_name ($sql_from , $sql_conditions = '', $meta = fal
$servers = array(); $servers = array();
$result = array(); $result = array();
$modules = array();
foreach($servers as $server) { foreach($servers as $server) {
// If connection was good then retrieve all data server // If connection was good then retrieve all data server
if (metaconsole_connect($server) == NOERR) { if (metaconsole_connect($server) == NOERR) {
@ -2357,7 +2370,6 @@ function modules_get_modules_name ($sql_from , $sql_conditions = '', $meta = fal
else { else {
$connection = false; $connection = false;
} }
// Get all info for filters of all nodes // Get all info for filters of all nodes
$modules_temp = db_get_all_rows_sql($sql); $modules_temp = db_get_all_rows_sql($sql);

903
pandora_console/operation/agentes/status_monitor.php
View File

File diff suppressed because it is too large Load Diff