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

Add new search for id source event in metaconsole

This commit is contained in:
marcos.alconada 2019-05-22 11:53:57 +02:00
parent ba9edc0378
commit 36afbea8b7
2 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/include/functions_events.php
View File

@ -32,6 +32,9 @@ require_once $config['homedir'].'/include/functions.php';
enterprise_include_once('meta/include/functions_events_meta.php');
enterprise_include_once('meta/include/functions_agents_meta.php');
enterprise_include_once('meta/include/functions_modules_meta.php');
if (is_metaconsole()) {
$id_source_event = get_parameter('id_source_event');
}
/**
@ -228,11 +231,25 @@ function events_get_events_grouped(
db_process_sql('SET group_concat_max_len = 9999999');
$event_lj = events_get_secondary_groups_left_join($table);
if ($total) {
if (is_metaconsole()) {
$id_source_event = get_parameter('id_source_event');
if ($id_source_event != '') {
$sql_post .= "AND id_source_event = $id_source_event";
}
}
$sql = "SELECT COUNT(*) FROM (SELECT id_evento
FROM $table te $event_lj
WHERE 1=1 ".$sql_post.'
GROUP BY estado, evento, id_agente, id_agentmodule'.$groupby_extra.') AS t';
} else {
if (is_metaconsole()) {
$id_source_event = get_parameter('id_source_event');
if ($id_source_event != '') {
$sql_post .= "AND id_source_event = $id_source_event";
}
}
$sql = "SELECT *, MAX(id_evento) AS id_evento,
GROUP_CONCAT(DISTINCT user_comment SEPARATOR '<br>') AS user_comment,
GROUP_CONCAT(DISTINCT id_evento SEPARATOR ',') AS similar_ids,

42
pandora_console/operation/events/events_list.php
View File

@ -48,6 +48,9 @@ check_login();
$sort_field = get_parameter('sort_field', 'timestamp');
$sort_order = get_parameter('sort', 'down');
if (is_metaconsole()) {
$id_source_event = get_parameter('id_source_event');
}
$event_a = check_acl($config['id_user'], 0, 'ER');
$event_w = check_acl($config['id_user'], 0, 'EW');
@ -125,6 +128,10 @@ if (is_ajax()) {
$values['id_extra'] = get_parameter('id_extra');
$values['user_comment'] = get_parameter('user_comment');
if (is_metaconsole()) {
$values['id_source_event'] = get_parameter('id_source_event');
}
$exists = (bool) db_get_value_filter(
'id_filter',
'tevent_filter',
@ -172,6 +179,10 @@ if (is_ajax()) {
$values['id_extra'] = get_parameter('id_extra');
$values['user_comment'] = get_parameter('user_comment');
if (is_metaconsole()) {
$values['id_source_event'] = get_parameter('id_source_event');
}
if (io_safe_output($values['tag_with']) == '["0"]') {
$values['tag_with'] = '[]';
}
@ -248,6 +259,10 @@ if ($user_filter != 0 && empty($id_name) && !$update_from_filter_table) {
$user_comment = $user_default_filter['user_comment'];
$source = $user_default_filter['source'];
if (is_metaconsole()) {
$id_source_event = $user_default_filter['id_source_event'];
}
if ($user_default_filter['search'] != '') {
$search = $user_default_filter['search'];
}
@ -984,8 +999,12 @@ $data[2] .= html_print_input_text(
255,
true
);
$table->data[] = $data;
$table->rowclass[] = '';
if (is_metaconsole()) {
$data[3] = __('Id source event').$jump;
$data[3] .= html_print_input_text('id_source_event', $id_source_event, '', 11, 255, true);
$table->data[] = $data;
$table->rowclass[] = '';
}
$data = [];
$data[0] = ui_toggle(
@ -1335,6 +1354,8 @@ $(document).ready( function() {
$("#text-id_extra").val(val);
if (i == 'user_comment')
$("#text-user_comment").val(val);
if (i == 'id_source_event')
$("#text-id_source_event").val(val);
});
reorder_tags_inputs();
// Update the info with the loaded filter
@ -1374,7 +1395,10 @@ $(document).ready( function() {
$("#text-source").val('');
$("#text-id_extra").val('');
$("#text-user_comment").val('');
if(is_metaconsole()){
$("#text-id_source_event").val('');
}
clear_tags_inputs();
// Update the view of filter load with no loaded filters message
@ -1448,6 +1472,10 @@ $(document).ready( function() {
$("#text-id_extra").val(val);
if (i == 'user_comment')
$("#text-user_comment").val(val);
if(is_metaconsole()){if (i == 'id_source_event')
$("#text-id_source_event").val(val);
}
});
reorder_tags_inputs();
// Update the info with the loaded filter
@ -1516,7 +1544,9 @@ $(document).ready( function() {
"date_to": $("#text-date_to").val(),
"source": $("#text-source").val(),
"id_extra": $("#text-id_extra").val(),
"user_comment": $("#text-user_comment").val()
"user_comment": $("#text-user_comment").val(),
"id_source_event": $("#text-id_extra").val()
},
function (data) {
$(".info_box").hide();
@ -1616,7 +1646,9 @@ $(document).ready( function() {
"date_to": $("#text-date_to").val(),
"source": $("#text-source").val(),
"id_extra": $("#text-id_extra").val(),
"user_comment": $("#text-user_comment").val()
"user_comment": $("#text-user_comment").val(),
"id_source_event": $("#text-id_source_event").val()
},
function (data) {
$(".info_box").hide();