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

Merge branch 'ent-10010-mejorar-filtrado-logs-en-informe-de-logs' into 'develop' 

Ent 10010 mejorar filtrado logs en informe de logs

See merge request artica/pandorafms!5602
This commit is contained in:
Daniel Rodriguez 2023-03-23 11:46:49 +00:00
parent cbbddd1ac6 4220ac6e4f
commit b09d65dd91
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -115,6 +115,7 @@ $exception_condition_value = 10;
$modulegroup = 0; $modulegroup = 0;
$period = SECONDS_1DAY; $period = SECONDS_1DAY;
$search = ''; $search = '';
$full_text = 0;
$log_number = 1000; $log_number = 1000;
// Added support for projection graphs. // Added support for projection graphs.
$period_pg = SECONDS_5DAY; $period_pg = SECONDS_5DAY;
@ -316,6 +317,7 @@ switch ($action) {
$source = $es['source']; $source = $es['source'];
$search = $es['search']; $search = $es['search'];
$log_number = empty($es['log_number']) ? $log_number : $es['log_number']; $log_number = empty($es['log_number']) ? $log_number : $es['log_number'];
$full_text = empty($es['full_text']) ? 0 : $es['full_text'];
break; break;
case 'simple_graph': case 'simple_graph':
@ -1313,6 +1315,14 @@ $class = 'databox filters';
<td > <td >
<?php <?php
html_print_input_text('search', $search, '', 40, 100); html_print_input_text('search', $search, '', 40, 100);
html_print_checkbox(
'full_text',
1,
$full_text,
false,
false
);
ui_print_help_tip(__('Full context'), false);
?> ?>
</td> </td>
</tr> </tr>

4
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -1597,11 +1597,13 @@ switch ($action) {
$agents_to_report = get_parameter('id_agents3'); $agents_to_report = get_parameter('id_agents3');
$source = get_parameter('source', ''); $source = get_parameter('source', '');
$search = get_parameter('search', ''); $search = get_parameter('search', '');
$full_text = (integer) get_parameter('full_text', 0);
$log_number = get_parameter('log_number', ''); $log_number = get_parameter('log_number', '');
$es['source'] = $source; $es['source'] = $source;
$es['id_agents'] = $agents_to_report; $es['id_agents'] = $agents_to_report;
$es['search'] = $search; $es['search'] = $search;
$es['full_text'] = $full_text;
$es['log_number'] = $log_number; $es['log_number'] = $log_number;
$values['external_source'] = json_encode($es); $values['external_source'] = json_encode($es);
@ -2542,11 +2544,13 @@ switch ($action) {
$agents_to_report = get_parameter('id_agents3'); $agents_to_report = get_parameter('id_agents3');
$source = get_parameter('source', ''); $source = get_parameter('source', '');
$search = get_parameter('search', ''); $search = get_parameter('search', '');
$full_text = (integer) get_parameter('full_text', 0);
$log_number = get_parameter('log_number', ''); $log_number = get_parameter('log_number', '');
$es['source'] = $source; $es['source'] = $source;
$es['id_agents'] = $agents_to_report; $es['id_agents'] = $agents_to_report;
$es['search'] = $search; $es['search'] = $search;
$es['full_text'] = $full_text;
$es['log_number'] = $log_number; $es['log_number'] = $log_number;
$values['external_source'] = json_encode($es); $values['external_source'] = json_encode($es);