Merge branch 'ent-9135-buscar-por-nombre-de-usuario-en-eventos' into 'develop'
add new filter pandora_enterprise#9135 See merge request artica/pandorafms!5244
This commit is contained in:
commit
c423eedbf3
|
@ -2,4 +2,7 @@ START TRANSACTION;
|
|||
|
||||
ALTER TABLE `tagent_custom_fields` ADD `is_link_enabled` TINYINT(1) NOT NULL DEFAULT 0;
|
||||
|
||||
ALTER TABLE `tevent_filter` ADD COLUMN `owner_user` TEXT;
|
||||
ALTER TABLE `tevent_filter` ADD COLUMN `not_search` INT NOT NULL DEFAULT 0;
|
||||
|
||||
COMMIT;
|
||||
|
|
|
@ -66,6 +66,7 @@ if ($id) {
|
|||
$severity = explode(',', $filter['severity']);
|
||||
$status = $filter['status'];
|
||||
$search = $filter['search'];
|
||||
$not_search = $filter['not_search'];
|
||||
$text_agent = $filter['text_agent'];
|
||||
$id_agent = $filter['id_agent'];
|
||||
$text_module = $filter['text_module'];
|
||||
|
@ -73,6 +74,7 @@ if ($id) {
|
|||
$pagination = $filter['pagination'];
|
||||
$event_view_hr = $filter['event_view_hr'];
|
||||
$id_user_ack = $filter['id_user_ack'];
|
||||
$owner_user = $filter['owner_user'];
|
||||
$group_rep = $filter['group_rep'];
|
||||
$date_from = str_replace('-', '/', $filter['date_from']);
|
||||
$date_to = str_replace('-', '/', $filter['date_to']);
|
||||
|
@ -115,10 +117,12 @@ if ($id) {
|
|||
$severity = '';
|
||||
$status = '';
|
||||
$search = '';
|
||||
$not_search = 0;
|
||||
$text_agent = '';
|
||||
$pagination = '';
|
||||
$event_view_hr = '';
|
||||
$id_user_ack = '';
|
||||
$owner_user = '';
|
||||
$group_rep = '';
|
||||
$date_from = '';
|
||||
$date_to = '';
|
||||
|
@ -140,6 +144,7 @@ if ($update || $create) {
|
|||
$severity = implode(',', get_parameter('severity', -1));
|
||||
$status = get_parameter('status', '');
|
||||
$search = get_parameter('search', '');
|
||||
$not_search = get_parameter_switch('not_search', 0);
|
||||
$text_agent = get_parameter('text_agent', '');
|
||||
$id_agent = (int) get_parameter('id_agent');
|
||||
$text_module = get_parameter('text_module', '');
|
||||
|
@ -157,6 +162,7 @@ if ($update || $create) {
|
|||
$pagination = get_parameter('pagination', '');
|
||||
$event_view_hr = get_parameter('event_view_hr', '');
|
||||
$id_user_ack = get_parameter('id_user_ack', '');
|
||||
$owner_user = get_parameter('owner_user', '');
|
||||
$group_rep = get_parameter('group_rep', '');
|
||||
$date_from = get_parameter('date_from', '');
|
||||
$date_to = get_parameter('date_to', '');
|
||||
|
@ -185,12 +191,14 @@ if ($update || $create) {
|
|||
'severity' => $severity,
|
||||
'status' => $status,
|
||||
'search' => $search,
|
||||
'not_search' => $not_search,
|
||||
'text_agent' => $text_agent,
|
||||
'id_agent_module' => $id_agent_module,
|
||||
'id_agent' => $id_agent,
|
||||
'pagination' => $pagination,
|
||||
'event_view_hr' => $event_view_hr,
|
||||
'id_user_ack' => $id_user_ack,
|
||||
'owner_user' => $owner_user,
|
||||
'group_rep' => $group_rep,
|
||||
'tag_with' => $tag_with_json,
|
||||
'tag_without' => $tag_without_json,
|
||||
|
@ -376,6 +384,15 @@ $table->data[6][1] = html_print_input_text(
|
|||
255,
|
||||
true
|
||||
);
|
||||
$table->data[6][1] .= ' '.html_print_checkbox_switch(
|
||||
'not_search',
|
||||
$not_search,
|
||||
$not_search,
|
||||
true,
|
||||
false,
|
||||
'checked_slide_events(this);',
|
||||
true
|
||||
);
|
||||
|
||||
$table->data[7][0] = '<b>'.__('Agent search').'</b>';
|
||||
$params = [];
|
||||
|
@ -420,7 +437,12 @@ $table->data[9][1] = html_print_input_text(
|
|||
true
|
||||
);
|
||||
|
||||
$table->data[10][0] = '<b>'.__('User ack.').'</b>'.' '.ui_print_help_tip(__('Choose between the users who have validated an event. '), true);
|
||||
$table->data[10][0] = '<b>'.__('User ack.').'</b>';
|
||||
$table->data[10][0] .= ' ';
|
||||
$table->data[10][0] .= ui_print_help_tip(
|
||||
__('Choose between the users who have validated an event. '),
|
||||
true
|
||||
);
|
||||
|
||||
if ($strict_user) {
|
||||
$users = [$config['id_user'] => $config['id_user']];
|
||||
|
@ -442,14 +464,25 @@ $table->data[10][1] = html_print_select(
|
|||
true
|
||||
);
|
||||
|
||||
$table->data[11][0] = '<b>'.__('Owner.').'</b>';
|
||||
$table->data[11][1] = html_print_select(
|
||||
$users,
|
||||
'owner_user',
|
||||
$owner_user,
|
||||
'',
|
||||
__('Any'),
|
||||
0,
|
||||
true
|
||||
);
|
||||
|
||||
$repeated_sel = [
|
||||
EVENT_GROUP_REP_ALL => __('All events'),
|
||||
EVENT_GROUP_REP_EVENTS => __('Group events'),
|
||||
EVENT_GROUP_REP_AGENTS => __('Group agents'),
|
||||
EVENT_GROUP_REP_EXTRAIDS => __('Group extra id'),
|
||||
];
|
||||
$table->data[11][0] = '<b>'.__('Repeated').'</b>';
|
||||
$table->data[11][1] = html_print_select(
|
||||
$table->data[12][0] = '<b>'.__('Repeated').'</b>';
|
||||
$table->data[12][1] = html_print_select(
|
||||
$repeated_sel,
|
||||
'group_rep',
|
||||
$group_rep,
|
||||
|
@ -459,11 +492,11 @@ $table->data[11][1] = html_print_select(
|
|||
true
|
||||
);
|
||||
|
||||
$table->data[12][0] = '<b>'.__('Date from').'</b>';
|
||||
$table->data[12][1] = html_print_input_text('date_from', $date_from, '', 15, 10, true);
|
||||
$table->data[13][0] = '<b>'.__('Date from').'</b>';
|
||||
$table->data[13][1] = html_print_input_text('date_from', $date_from, '', 15, 10, true);
|
||||
|
||||
$table->data[13][0] = '<b>'.__('Date to').'</b>';
|
||||
$table->data[13][1] = html_print_input_text('date_to', $date_to, '', 15, 10, true);
|
||||
$table->data[14][0] = '<b>'.__('Date to').'</b>';
|
||||
$table->data[14][1] = html_print_input_text('date_to', $date_to, '', 15, 10, true);
|
||||
|
||||
$tag_with = json_decode($tag_with_json_clean, true);
|
||||
if (empty($tag_with)) {
|
||||
|
@ -502,9 +535,9 @@ $remove_with_tag_disabled = empty($tag_with_temp);
|
|||
$add_without_tag_disabled = empty($tags_select_without);
|
||||
$remove_without_tag_disabled = empty($tag_without_temp);
|
||||
|
||||
$table->colspan[14][0] = '2';
|
||||
$table->data[14][0] = '<b>'.__('Events with following tags').'</b>';
|
||||
$table->data[15][0] = html_print_select(
|
||||
$table->colspan[15][0] = '2';
|
||||
$table->data[15][0] = '<b>'.__('Events with following tags').'</b>';
|
||||
$table->data[16][0] = html_print_select(
|
||||
$tags_select_with,
|
||||
'select_with',
|
||||
'',
|
||||
|
@ -518,7 +551,7 @@ $table->data[15][0] = html_print_select(
|
|||
false,
|
||||
'width: 220px;'
|
||||
);
|
||||
$table->data[15][1] = html_print_button(
|
||||
$table->data[16][1] = html_print_button(
|
||||
__('Add'),
|
||||
'add_whith',
|
||||
$add_with_tag_disabled,
|
||||
|
@ -527,7 +560,7 @@ $table->data[15][1] = html_print_button(
|
|||
true
|
||||
);
|
||||
|
||||
$table->data[16][0] = html_print_select(
|
||||
$table->data[17][0] = html_print_select(
|
||||
$tag_with_temp,
|
||||
'tag_with_temp',
|
||||
[],
|
||||
|
@ -541,12 +574,12 @@ $table->data[16][0] = html_print_select(
|
|||
false,
|
||||
'width: 220px; height: 50px;'
|
||||
);
|
||||
$table->data[16][0] .= html_print_input_hidden(
|
||||
$table->data[17][0] .= html_print_input_hidden(
|
||||
'tag_with',
|
||||
$tag_with_base64,
|
||||
true
|
||||
);
|
||||
$table->data[16][1] = html_print_button(
|
||||
$table->data[17][1] = html_print_button(
|
||||
__('Remove'),
|
||||
'remove_whith',
|
||||
$remove_with_tag_disabled,
|
||||
|
@ -555,9 +588,9 @@ $table->data[16][1] = html_print_button(
|
|||
true
|
||||
);
|
||||
|
||||
$table->colspan[17][0] = '2';
|
||||
$table->data[17][0] = '<b>'.__('Events without following tags').'</b>';
|
||||
$table->data[18][0] = html_print_select(
|
||||
$table->colspan[18][0] = '2';
|
||||
$table->data[18][0] = '<b>'.__('Events without following tags').'</b>';
|
||||
$table->data[19][0] = html_print_select(
|
||||
$tags_select_without,
|
||||
'select_without',
|
||||
'',
|
||||
|
@ -571,7 +604,7 @@ $table->data[18][0] = html_print_select(
|
|||
false,
|
||||
'width: 220px;'
|
||||
);
|
||||
$table->data[18][1] = html_print_button(
|
||||
$table->data[19][1] = html_print_button(
|
||||
__('Add'),
|
||||
'add_whithout',
|
||||
$add_without_tag_disabled,
|
||||
|
@ -580,7 +613,7 @@ $table->data[18][1] = html_print_button(
|
|||
true
|
||||
);
|
||||
|
||||
$table->data[19][0] = html_print_select(
|
||||
$table->data[20][0] = html_print_select(
|
||||
$tag_without_temp,
|
||||
'tag_without_temp',
|
||||
[],
|
||||
|
@ -594,12 +627,12 @@ $table->data[19][0] = html_print_select(
|
|||
false,
|
||||
'width: 220px; height: 50px;'
|
||||
);
|
||||
$table->data[19][0] .= html_print_input_hidden(
|
||||
$table->data[20][0] .= html_print_input_hidden(
|
||||
'tag_without',
|
||||
$tag_without_base64,
|
||||
true
|
||||
);
|
||||
$table->data[19][1] = html_print_button(
|
||||
$table->data[20][1] = html_print_button(
|
||||
__('Remove'),
|
||||
'remove_whithout',
|
||||
$remove_without_tag_disabled,
|
||||
|
@ -608,8 +641,8 @@ $table->data[19][1] = html_print_button(
|
|||
true
|
||||
);
|
||||
|
||||
$table->data[20][0] = '<b>'.__('Alert events').'</b>';
|
||||
$table->data[20][1] = html_print_select(
|
||||
$table->data[21][0] = '<b>'.__('Alert events').'</b>';
|
||||
$table->data[21][1] = html_print_select(
|
||||
[
|
||||
'-1' => __('All'),
|
||||
'0' => __('Filter alert events'),
|
||||
|
@ -624,8 +657,8 @@ $table->data[20][1] = html_print_select(
|
|||
);
|
||||
|
||||
if (!is_metaconsole()) {
|
||||
$table->data[21][0] = '<b>'.__('Module search').'</b>';
|
||||
$table->data[21][1] .= html_print_autocomplete_modules(
|
||||
$table->data[22][0] = '<b>'.__('Module search').'</b>';
|
||||
$table->data[22][1] .= html_print_autocomplete_modules(
|
||||
'module_search',
|
||||
$text_module,
|
||||
false,
|
||||
|
@ -637,17 +670,17 @@ if (!is_metaconsole()) {
|
|||
);
|
||||
}
|
||||
|
||||
$table->data[22][0] = '<b>'.__('Source').'</b>';
|
||||
$table->data[22][1] = html_print_input_text('source', $source, '', 35, 255, true);
|
||||
$table->data[23][0] = '<b>'.__('Source').'</b>';
|
||||
$table->data[23][1] = html_print_input_text('source', $source, '', 35, 255, true);
|
||||
|
||||
$table->data[23][0] = '<b>'.__('Extra ID').'</b>';
|
||||
$table->data[23][1] = html_print_input_text('id_extra', $id_extra, '', 11, 255, true);
|
||||
$table->data[24][0] = '<b>'.__('Extra ID').'</b>';
|
||||
$table->data[24][1] = html_print_input_text('id_extra', $id_extra, '', 11, 255, true);
|
||||
|
||||
$table->data[24][0] = '<b>'.__('Comment').'</b>';
|
||||
$table->data[24][1] = html_print_input_text('user_comment', $user_comment, '', 35, 255, true);
|
||||
$table->data[25][0] = '<b>'.__('Comment').'</b>';
|
||||
$table->data[25][1] = html_print_input_text('user_comment', $user_comment, '', 35, 255, true);
|
||||
|
||||
$table->data[25][0] = '<b>'.__('Custom data filter type').'</b>';
|
||||
$table->data[25][1] = html_print_select(
|
||||
$table->data[26][0] = '<b>'.__('Custom data filter type').'</b>';
|
||||
$table->data[26][1] = html_print_select(
|
||||
[
|
||||
'0' => __('Filter custom data by name field'),
|
||||
'1' => __('Filter custom data by value field'),
|
||||
|
@ -660,12 +693,12 @@ $table->data[25][1] = html_print_select(
|
|||
true
|
||||
);
|
||||
|
||||
$table->data[26][0] = '<b>'.__('Custom data').'</b>';
|
||||
$table->data[26][1] = html_print_input_text('custom_data', $custom_data, '', 35, 255, true);
|
||||
$table->data[27][0] = '<b>'.__('Custom data').'</b>';
|
||||
$table->data[27][1] = html_print_input_text('custom_data', $custom_data, '', 35, 255, true);
|
||||
|
||||
if (is_metaconsole()) {
|
||||
$table->data[27][0] = '<b>'.__('Id souce event').'</b>';
|
||||
$table->data[27][1] = html_print_input_text(
|
||||
$table->data[28][0] = '<b>'.__('Id souce event').'</b>';
|
||||
$table->data[28][1] = html_print_input_text(
|
||||
'id_source_event',
|
||||
$id_source_event,
|
||||
'',
|
||||
|
@ -727,6 +760,14 @@ $(document).ready( function() {
|
|||
|
||||
});
|
||||
|
||||
function checked_slide_events(element) {
|
||||
var value = $("#checkbox-"+element.name).val();
|
||||
if (value == 0) {
|
||||
$("#checkbox-"+element.name).val(1);
|
||||
} else {
|
||||
$("#checkbox-"+element.name).val(0);
|
||||
}
|
||||
}
|
||||
|
||||
function click_button_remove_tag(what_button) {
|
||||
if (what_button == "with") {
|
||||
|
|
|
@ -229,7 +229,8 @@ if ($add_module === true) {
|
|||
// Safe output remove all entities.
|
||||
io_safe_output_array($id_modules, '');
|
||||
|
||||
$id_modules = array_map(function ($mod) {
|
||||
$id_modules = array_map(
|
||||
function ($mod) {
|
||||
return io_safe_input($mod);
|
||||
},
|
||||
$id_modules
|
||||
|
|
|
@ -351,12 +351,14 @@ if ($save_event_filter) {
|
|||
$values['severity'] = implode(',', get_parameter('severity', -1));
|
||||
$values['status'] = get_parameter('status');
|
||||
$values['search'] = get_parameter('search');
|
||||
$values['not_search'] = get_parameter('not_search');
|
||||
$values['text_agent'] = get_parameter('text_agent');
|
||||
$values['id_agent'] = get_parameter('id_agent');
|
||||
$values['id_agent_module'] = get_parameter('id_agent_module');
|
||||
$values['pagination'] = get_parameter('pagination');
|
||||
$values['event_view_hr'] = get_parameter('event_view_hr');
|
||||
$values['id_user_ack'] = get_parameter('id_user_ack');
|
||||
$values['owner_user'] = get_parameter('owner_user');
|
||||
$values['group_rep'] = get_parameter('group_rep');
|
||||
$values['tag_with'] = get_parameter('tag_with', io_json_mb_encode([]));
|
||||
$values['tag_without'] = get_parameter(
|
||||
|
@ -409,12 +411,14 @@ if ($update_event_filter) {
|
|||
$values['severity'] = implode(',', get_parameter('severity', -1));
|
||||
$values['status'] = get_parameter('status');
|
||||
$values['search'] = get_parameter('search');
|
||||
$values['not_search'] = get_parameter('not_search');
|
||||
$values['text_agent'] = get_parameter('text_agent');
|
||||
$values['id_agent'] = get_parameter('id_agent');
|
||||
$values['id_agent_module'] = get_parameter('id_agent_module');
|
||||
$values['pagination'] = get_parameter('pagination');
|
||||
$values['event_view_hr'] = get_parameter('event_view_hr');
|
||||
$values['id_user_ack'] = get_parameter('id_user_ack');
|
||||
$values['owner_user'] = get_parameter('owner_user');
|
||||
$values['group_rep'] = get_parameter('group_rep');
|
||||
$values['tag_with'] = get_parameter('tag_with', io_json_mb_encode([]));
|
||||
$values['tag_without'] = get_parameter(
|
||||
|
@ -481,6 +485,7 @@ if ($get_filter_values) {
|
|||
'user_comment' => '',
|
||||
'id_extra' => '',
|
||||
'id_user_ack' => '',
|
||||
'owner_user' => '',
|
||||
'date_from' => '',
|
||||
'time_from' => '',
|
||||
'date_to' => '',
|
||||
|
@ -642,6 +647,8 @@ function load_form_filter() {
|
|||
$("#status").val(val);
|
||||
if (i == 'search')
|
||||
$('#text-search').val(val);
|
||||
if (i == 'not_search')
|
||||
$('#checkbox-not_search').val(val);
|
||||
if (i == 'text_agent')
|
||||
$('input[name=text_agent]').val(val);
|
||||
if (i == 'id_agent')
|
||||
|
@ -654,6 +661,8 @@ function load_form_filter() {
|
|||
$("#text-event_view_hr").val(val);
|
||||
if (i == 'id_user_ack')
|
||||
$("#id_user_ack").val(val);
|
||||
if (i == 'owner_user')
|
||||
$("#owner_user").val(val);
|
||||
if (i == 'group_rep')
|
||||
$("#group_rep").val(val);
|
||||
if (i == 'tag_with')
|
||||
|
@ -898,12 +907,14 @@ function save_new_filter() {
|
|||
"severity" : $("#severity").val(),
|
||||
"status" : $("#status").val(),
|
||||
"search" : $("#text-search").val(),
|
||||
"not_search" : $("#checkbox-not_search").val(),
|
||||
"text_agent" : $("#text_id_agent").val(),
|
||||
"id_agent" : $('input:hidden[name=id_agent]').val(),
|
||||
"id_agent_module" : $('input:hidden[name=module_search_hidden]').val(),
|
||||
"pagination" : $("#pagination").val(),
|
||||
"event_view_hr" : $("#text-event_view_hr").val(),
|
||||
"id_user_ack" : $("#id_user_ack").val(),
|
||||
"owner_user" : $("#owner_user").val(),
|
||||
"group_rep" : $("#group_rep").val(),
|
||||
"tag_with": Base64.decode($("#hidden-tag_with").val()),
|
||||
"tag_without": Base64.decode($("#hidden-tag_without").val()),
|
||||
|
@ -975,12 +986,14 @@ function save_update_filter() {
|
|||
"severity" : $("#severity").val(),
|
||||
"status" : $("#status").val(),
|
||||
"search" : $("#text-search").val(),
|
||||
"not_search" : $("#checkbox-not_search").val(),
|
||||
"text_agent" : $("#text_id_agent").val(),
|
||||
"id_agent" : $('input:hidden[name=id_agent]').val(),
|
||||
"id_agent_module" : $('input:hidden[name=module_search_hidden]').val(),
|
||||
"pagination" : $("#pagination").val(),
|
||||
"event_view_hr" : $("#text-event_view_hr").val(),
|
||||
"id_user_ack" : $("#id_user_ack").val(),
|
||||
"owner_user" : $("#owner_user").val(),
|
||||
"group_rep" : $("#group_rep").val(),
|
||||
"tag_with" : Base64.decode($("#hidden-tag_with").val()),
|
||||
"tag_without" : Base64.decode($("#hidden-tag_without").val()),
|
||||
|
@ -2417,6 +2430,7 @@ if ($get_events_fired) {
|
|||
'severity' => -1,
|
||||
'status' => -1,
|
||||
'search' => '',
|
||||
'not_search' => 0,
|
||||
'text_agent' => '',
|
||||
'id_agent' => 0,
|
||||
'id_agent_module' => 0,
|
||||
|
|
|
@ -640,11 +640,13 @@ function events_update_status($id_evento, $status, $filter=null)
|
|||
* 'status'
|
||||
* 'agent_alias'
|
||||
* 'search'
|
||||
* 'not_search'
|
||||
* 'id_extra'
|
||||
* 'id_source_event'
|
||||
* 'user_comment'
|
||||
* 'source'
|
||||
* 'id_user_ack'
|
||||
* 'owner_user'
|
||||
* 'tag_with'
|
||||
* 'tag_without'
|
||||
* 'filter_only_alert'
|
||||
|
@ -1058,16 +1060,40 @@ function events_get_all(
|
|||
$custom_data_search = 'te.custom_data';
|
||||
}
|
||||
|
||||
$sql_filters[] = vsprintf(
|
||||
' AND (lower(ta.alias) like lower("%%%s%%")
|
||||
OR te.id_evento like "%%%s%%"
|
||||
OR lower(te.evento) like lower("%%%s%%")
|
||||
OR lower(te.user_comment) like lower("%%%s%%")
|
||||
OR lower(te.id_extra) like lower("%%%s%%")
|
||||
OR lower(te.source) like lower("%%%s%%")
|
||||
OR lower('.$custom_data_search.') like lower("%%%s%%") )',
|
||||
array_fill(0, 7, $filter['search'])
|
||||
);
|
||||
$not_search = '';
|
||||
$nexo = 'OR';
|
||||
$array_search = [
|
||||
'te.id_evento',
|
||||
'lower(te.evento)',
|
||||
'lower(te.user_comment)',
|
||||
'lower(te.id_extra)',
|
||||
'lower(te.source)',
|
||||
'lower('.$custom_data_search.')',
|
||||
];
|
||||
if (isset($filter['not_search']) === true
|
||||
&& empty($filter['not_search']) === false
|
||||
) {
|
||||
$not_search = 'NOT';
|
||||
$nexo = 'AND';
|
||||
} else {
|
||||
$array_search[] = 'lower(ta.alias)';
|
||||
}
|
||||
|
||||
$sql_search = ' AND (';
|
||||
foreach ($array_search as $key => $field) {
|
||||
$sql_search .= sprintf(
|
||||
'%s %s %s like lower("%%%s%%")',
|
||||
($key === 0) ? '' : $nexo,
|
||||
$field,
|
||||
$not_search,
|
||||
$filter['search']
|
||||
);
|
||||
$sql_search .= ' ';
|
||||
}
|
||||
|
||||
$sql_search .= ' )';
|
||||
|
||||
$sql_filters[] = $sql_search;
|
||||
}
|
||||
|
||||
// Free search exclude.
|
||||
|
@ -1152,11 +1178,19 @@ function events_get_all(
|
|||
// Validated or in process by.
|
||||
if (empty($filter['id_user_ack']) === false) {
|
||||
$sql_filters[] = sprintf(
|
||||
' AND te.owner_user like lower("%%%s%%") ',
|
||||
' AND te.id_usuario like lower("%%%s%%") ',
|
||||
$filter['id_user_ack']
|
||||
);
|
||||
}
|
||||
|
||||
// Owner by.
|
||||
if (empty($filter['owner_user']) === false) {
|
||||
$sql_filters[] = sprintf(
|
||||
' AND te.owner_user like lower("%%%s%%") ',
|
||||
$filter['owner_user']
|
||||
);
|
||||
}
|
||||
|
||||
$tag_names = [];
|
||||
// With following tags.
|
||||
if (empty($filter['tag_with']) === false) {
|
||||
|
|
|
@ -140,6 +140,11 @@ form.flex-row div.filter_input.filter_input_switch .p-slider {
|
|||
width: 30px;
|
||||
}
|
||||
|
||||
form .filter_input_not_search .p-switch {
|
||||
flex: 0 1 30px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
fieldset {
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
|
|
@ -122,6 +122,10 @@ $search = get_parameter(
|
|||
'filter[search]',
|
||||
($filter['search'] ?? '')
|
||||
);
|
||||
$not_search = get_parameter(
|
||||
'filter[not_search]',
|
||||
0
|
||||
);
|
||||
$text_agent = get_parameter(
|
||||
'filter[text_agent]',
|
||||
($filter['text_agent'] ?? '')
|
||||
|
@ -153,6 +157,10 @@ $id_user_ack = get_parameter(
|
|||
'filter[id_user_ack]',
|
||||
($filter['id_user_ack'] ?? '')
|
||||
);
|
||||
$owner_user = get_parameter(
|
||||
'filter[owner_user]',
|
||||
($filter['owner_user'] ?? '')
|
||||
);
|
||||
$group_rep = get_parameter(
|
||||
'filter[group_rep]',
|
||||
($filter['group_rep'] ?? '')
|
||||
|
@ -1082,6 +1090,7 @@ if ($loaded_filter !== false && $from_event_graph != 1 && isset($fb64) === false
|
|||
$severity = $filter['severity'];
|
||||
$status = $filter['status'];
|
||||
$search = $filter['search'];
|
||||
$not_search = $filter['not_search'];
|
||||
$text_agent = $filter['text_agent'];
|
||||
$id_agent = $filter['id_agent'];
|
||||
$id_agent_module = $filter['id_agent_module'];
|
||||
|
@ -1095,6 +1104,7 @@ if ($loaded_filter !== false && $from_event_graph != 1 && isset($fb64) === false
|
|||
$pagination = $filter['pagination'];
|
||||
$event_view_hr = $filter['event_view_hr'];
|
||||
$id_user_ack = $filter['id_user_ack'];
|
||||
$owner_user = $filter['owner_user'];
|
||||
$group_rep = $filter['group_rep'];
|
||||
$tag_with = json_decode(io_safe_output($filter['tag_with']));
|
||||
$tag_without = json_decode(io_safe_output($filter['tag_without']));
|
||||
|
@ -1707,8 +1717,23 @@ $inputs[] = $in;
|
|||
|
||||
// Free search.
|
||||
$data = html_print_input_text('search', $search, '', '', 255, true);
|
||||
$in = '<div class="filter_input"><label>'.__('Free search').'</label>';
|
||||
$in .= $data.'</div>';
|
||||
// Search recursive groups.
|
||||
$data .= ui_print_help_tip(
|
||||
__('Search for elements NOT containing given text.'),
|
||||
true
|
||||
);
|
||||
$data .= html_print_checkbox_switch(
|
||||
'not_search',
|
||||
$not_search,
|
||||
$not_search,
|
||||
true,
|
||||
false,
|
||||
'checked_slide_events(this);',
|
||||
true
|
||||
);
|
||||
$in = '<div class="filter_input filter_input_not_search"><label>'.__('Free search').'</label>';
|
||||
$in .= $data;
|
||||
$in .= '</div>';
|
||||
$inputs[] = $in;
|
||||
|
||||
if (is_array($severity) === false) {
|
||||
|
@ -1747,7 +1772,7 @@ $data = html_print_checkbox_switch(
|
|||
$search_recursive_groups,
|
||||
true,
|
||||
false,
|
||||
'search_in_secondary_groups(this);',
|
||||
'checked_slide_events(this);',
|
||||
true
|
||||
);
|
||||
|
||||
|
@ -1769,7 +1794,7 @@ $data = html_print_checkbox_switch(
|
|||
$search_secondary_groups,
|
||||
true,
|
||||
false,
|
||||
'search_in_secondary_groups(this);',
|
||||
'checked_slide_events(this);',
|
||||
true
|
||||
);
|
||||
|
||||
|
@ -1934,6 +1959,19 @@ $in = '<div class="filter_input"><label>'.__('User ack.').'</label>';
|
|||
$in .= $data.'</div>';
|
||||
$adv_inputs[] = $in;
|
||||
|
||||
$data = html_print_select(
|
||||
$user_users,
|
||||
'owner_user',
|
||||
$owner_user,
|
||||
'',
|
||||
__('Any'),
|
||||
0,
|
||||
true
|
||||
);
|
||||
$in = '<div class="filter_input"><label>'.__('Owner').'</label>';
|
||||
$in .= $data.'</div>';
|
||||
$adv_inputs[] = $in;
|
||||
|
||||
// Only alert events.
|
||||
$data = html_print_select(
|
||||
[
|
||||
|
@ -3076,7 +3114,7 @@ $(document).ready( function() {
|
|||
|
||||
});
|
||||
|
||||
function search_in_secondary_groups(element) {
|
||||
function checked_slide_events(element) {
|
||||
var value = $("#checkbox-"+element.name).val();
|
||||
if (value == 0) {
|
||||
$("#checkbox-"+element.name).val(1);
|
||||
|
|
|
@ -1238,6 +1238,7 @@ CREATE TABLE IF NOT EXISTS `tevent_filter` (
|
|||
`severity` TEXT,
|
||||
`status` INT NOT NULL DEFAULT -1,
|
||||
`search` TEXT,
|
||||
`not_search` INT NOT NULL DEFAULT 0,
|
||||
`text_agent` TEXT,
|
||||
`id_agent` INT DEFAULT 0,
|
||||
`id_agent_module` INT DEFAULT 0,
|
||||
|
@ -1261,6 +1262,7 @@ CREATE TABLE IF NOT EXISTS `tevent_filter` (
|
|||
`time_to` TIME NULL,
|
||||
`custom_data` VARCHAR(500) DEFAULT '',
|
||||
`custom_data_filter_type` TINYINT UNSIGNED DEFAULT 0,
|
||||
`owner_user` TEXT,
|
||||
PRIMARY KEY (`id_filter`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
|
||||
|
||||
|
|
Loading…
Reference in New Issue