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

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

This commit is contained in:
Arturo Gonzalez 2016-09-12 12:08:25 +02:00
parent 9ea430cfc1
commit eaa98269b2
2 changed files with 19 additions and 6 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);

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

@ -113,8 +113,7 @@ if (!is_metaconsole()) {
} }
} }
else { else {
if (((int)$ag_group !== 0) && (check_acl ($config['id_user'], $id_ag_group, 'AR'))) {
if ($ag_group !== 0 && check_acl ($config['id_user'], $id_ag_group, 'AR')) {
$sql_conditions_group = sprintf (' AND tagente.id_grupo IN (%s) ', $ag_group); $sql_conditions_group = sprintf (' AND tagente.id_grupo IN (%s) ', $ag_group);
} }
elseif ($user_groups != '') { elseif ($user_groups != '') {
@ -126,8 +125,7 @@ else {
// Module group // Module group
if (is_metaconsole()) { if (is_metaconsole()) {
if ($modulegroup != '-1') if ($modulegroup != '-1')
$sql_conditions .= sprintf (' AND tagente_modulo.id_module_group IN (SELECT id_mg $sql_conditions .= sprintf (' AND tagente_modulo.id_module_group IN (%s)', $modulegroup);
FROM tmodule_group WHERE name = \'%s\')', $modulegroup);
} }
else if ($modulegroup > -1) { else if ($modulegroup > -1) {
$sql_conditions .= sprintf (' AND tagente_modulo.id_module_group = \'%d\'', $modulegroup); $sql_conditions .= sprintf (' AND tagente_modulo.id_module_group = \'%d\'', $modulegroup);
@ -295,6 +293,9 @@ if (!is_metaconsole()) {
foreach ($rows as $module_group) foreach ($rows as $module_group)
$rows_select[$module_group['id_mg']] = $module_group['name']; $rows_select[$module_group['id_mg']] = $module_group['name'];
} }
else {
$rows_select = modules_get_modulegroups();
}
$table->data[0][5] = html_print_select($rows_select, 'modulegroup', $modulegroup, '', __('All'), -1, true, false, true, '', false, 'width: 120px;'); $table->data[0][5] = html_print_select($rows_select, 'modulegroup', $modulegroup, '', __('All'), -1, true, false, true, '', false, 'width: 120px;');
$table->rowspan[0][6] = 2; $table->rowspan[0][6] = 2;