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

[Tags performance] Fixed select modules from Agent/Module dashboard widget

This commit is contained in:
Fermin 2018-10-08 13:45:30 +02:00
parent d2b8939804
commit 099f01a4ba
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pandora_console/include/functions_agents.php
View File

@ -2470,7 +2470,7 @@ function agents_get_agent_custom_field ($agent_id, $custom_field_name) {
} }
function select_modules_for_agent_group( function select_modules_for_agent_group(
$id_group, $id_agents, $selection, $return = true $id_group, $id_agents, $selection, $return = true, $index_by_name = false
) { ) {
global $config; global $config;
$agents = (empty($id_agents)) ? array() : implode(",", $id_agents); $agents = (empty($id_agents)) ? array() : implode(",", $id_agents);
@ -2533,16 +2533,23 @@ function select_modules_for_agent_group(
$modules = db_get_all_rows_sql($sql); $modules = db_get_all_rows_sql($sql);
if ($modules === false) $modules = array(); if ($modules === false) $modules = array();
if($return == false){ if ($return) {
foreach ($modules as $value) {
$modules_array[$value['id_agente_modulo']] = $value['nombre'];
}
return $modules_array;
}
else{
echo json_encode($modules); echo json_encode($modules);
return; return;
} }
$modules_array = array();
foreach ($modules as $value) {
if($index_by_name) {
$modules_array[io_safe_output($value['nombre'])] =
ui_print_truncate_text(
io_safe_output($value['nombre']), 'module_medium', false, true
);
} else {
$modules_array[$value['id_agente_modulo']] = $value['nombre'];
}
}
return $modules_array;
} }
/** /**

25
pandora_console/operation/agentes/ver_agente.php
View File

@ -35,6 +35,7 @@ if (is_ajax ()) {
$get_agent_status_tooltip = (bool) get_parameter ("get_agent_status_tooltip"); $get_agent_status_tooltip = (bool) get_parameter ("get_agent_status_tooltip");
$get_agents_group_json = (bool) get_parameter ("get_agents_group_json"); $get_agents_group_json = (bool) get_parameter ("get_agents_group_json");
$get_modules_group_json = (bool) get_parameter ("get_modules_group_json"); $get_modules_group_json = (bool) get_parameter ("get_modules_group_json");
$get_modules_group_value_name_json = (bool) get_parameter ("get_modules_group_value_name_json");
$get_agent_modules_json_for_multiple_agents = (bool) get_parameter("get_agent_modules_json_for_multiple_agents"); $get_agent_modules_json_for_multiple_agents = (bool) get_parameter("get_agent_modules_json_for_multiple_agents");
$get_agent_modules_alerts_json_for_multiple_agents = (bool) get_parameter("get_agent_modules_alerts_json_for_multiple_agents"); $get_agent_modules_alerts_json_for_multiple_agents = (bool) get_parameter("get_agent_modules_alerts_json_for_multiple_agents");
$get_agent_modules_multiple_alerts_json_for_multiple_agents = (bool) get_parameter("get_agent_modules_multiple_alerts_json_for_multiple_agents"); $get_agent_modules_multiple_alerts_json_for_multiple_agents = (bool) get_parameter("get_agent_modules_multiple_alerts_json_for_multiple_agents");
@ -165,13 +166,24 @@ if (is_ajax ()) {
} }
if ($get_modules_group_json) { if ($get_modules_group_json) {
$id_group = (int) get_parameter('id_module_group'); $id_group = (int) get_parameter('id_module_group', 0);
$id_agents = get_parameter('id_agents'); $id_agents = get_parameter('id_agents');
$selection = get_parameter('selection'); $selection = get_parameter('selection');
select_modules_for_agent_group($id_group, $id_agents, $selection); select_modules_for_agent_group($id_group, $id_agents, $selection);
} }
if ($get_modules_group_value_name_json) {
$id_agents = get_parameter('id_agents');
$selection = get_parameter('selection');
// No filter by module group
$modules = select_modules_for_agent_group(0, $id_agents, $selection, false, true);
echo json_encode($modules);
return;
}
if ($get_agent_json) { if ($get_agent_json) {
$id_agent = (int) get_parameter ('id_agent'); $id_agent = (int) get_parameter ('id_agent');
@ -373,17 +385,7 @@ if (is_ajax ()) {
$filter .= ' AND t1.id_tipo_modulo NOT IN (' . implode($module_types_excluded) . ')'; $filter .= ' AND t1.id_tipo_modulo NOT IN (' . implode($module_types_excluded) . ')';
if (!empty($module_name)) { if (!empty($module_name)) {
switch ($config['dbtype']) {
case "mysql":
$filter .= " AND t1.nombre COLLATE utf8_general_ci LIKE '%$module_name%'"; $filter .= " AND t1.nombre COLLATE utf8_general_ci LIKE '%$module_name%'";
break;
case "postgresql":
$filter .= " AND t1.nombre LIKE '%$module_name%'";
break;
case "oracle":
$filter .= " AND UPPER(t1.nombre) LIKE UPPER('%$module_name%')";
break;
}
} }
// Status selector // Status selector
@ -533,6 +535,7 @@ if (is_ajax ()) {
asort($result); asort($result);
} }
else { else {
$modules = agents_get_modules();
if($idAgents[0] < 0){ if($idAgents[0] < 0){
if($selection_mode == 'common'){ if($selection_mode == 'common'){
$sql_agent_total = 'SELECT count(*) FROM tagente WHERE disabled=0'; $sql_agent_total = 'SELECT count(*) FROM tagente WHERE disabled=0';