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-13007-tree-view-metaconsola-no-filtra-bien-usando-busqueda-de-modulo-y-status-conjunta' into 'develop' 

Ent 13007 tree view metaconsola no filtra bien usando busqueda de modulo y status conjunta

See merge request artica/pandorafms!7374
This commit is contained in:
Jose Martin 2024-05-14 07:09:47 +00:00
parent 6520af0278 b0da63dc62
commit ff6ee23521
1 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pandora_console/operation/tree.php
View File

@ -291,29 +291,29 @@ if (is_metaconsole() === true) {
); );
} }
// if (is_metaconsole() === false) { if (is_metaconsole() === false) {
// Module filter. // Module filter.
$module_status_arr = []; $module_status_arr = [];
$module_status_arr[-1] = __('All'); $module_status_arr[-1] = __('All');
// Default. // Default.
$module_status_arr[AGENT_MODULE_STATUS_NORMAL] = __('Normal'); $module_status_arr[AGENT_MODULE_STATUS_NORMAL] = __('Normal');
$module_status_arr[AGENT_MODULE_STATUS_WARNING] = __('Warning'); $module_status_arr[AGENT_MODULE_STATUS_WARNING] = __('Warning');
$module_status_arr[AGENT_MODULE_STATUS_CRITICAL_BAD] = __('Critical'); $module_status_arr[AGENT_MODULE_STATUS_CRITICAL_BAD] = __('Critical');
$module_status_arr[AGENT_MODULE_STATUS_UNKNOWN] = __('Unknown'); $module_status_arr[AGENT_MODULE_STATUS_UNKNOWN] = __('Unknown');
$module_status_arr[AGENT_MODULE_STATUS_NOT_INIT] = __('Not init'); $module_status_arr[AGENT_MODULE_STATUS_NOT_INIT] = __('Not init');
$module_status_arr['fired'] = __('Fired alerts'); $module_status_arr['fired'] = __('Fired alerts');
$table->data['last_row'][] = html_print_label_input_block( $table->data['last_row'][] = html_print_label_input_block(
__('Search module'), __('Search module'),
html_print_input_text('search_module', $search_module, '', 25, 30, true) html_print_input_text('search_module', $search_module, '', 25, 30, true)
); );
$table->data['last_row'][] = html_print_label_input_block( $table->data['last_row'][] = html_print_label_input_block(
__('Show not init modules'), __('Show not init modules'),
html_print_checkbox_switch('show_not_init_modules', $show_not_init_modules, true, true) html_print_checkbox_switch('show_not_init_modules', $show_not_init_modules, true, true)
); );
$table->data['last_row'][] = html_print_label_input_block( $table->data['last_row'][] = html_print_label_input_block(
__('Module status'), __('Module status'),
html_print_select( html_print_select(
$module_status_arr, $module_status_arr,
@ -329,8 +329,9 @@ $table->data['last_row'][] = html_print_label_input_block(
false, false,
'width:100%' 'width:100%'
) )
); );
// } }
$form_html = '<form id="tree_search" method="post" action="index.php?sec=monitoring&sec2=operation/tree&refr=0&tab='.$tab.'&pure='.$config['pure'].'">'; $form_html = '<form id="tree_search" method="post" action="index.php?sec=monitoring&sec2=operation/tree&refr=0&tab='.$tab.'&pure='.$config['pure'].'">';
$form_html .= html_print_table($table, true); $form_html .= html_print_table($table, true);
$form_html .= html_print_div( $form_html .= html_print_div(