From b9b64d062dbff31c6f5f41d1223b6be7f5542190 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Mon, 10 Jul 2023 16:08:26 +0200 Subject: [PATCH 1/2] #10946 redirect to Agent detail and monitor detail --- .../lib/Dashboard/Widgets/groups_status.php | 60 ++++++++++++++++--- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/groups_status.php b/pandora_console/include/lib/Dashboard/Widgets/groups_status.php index c4ed2e72b2..13985f2533 100755 --- a/pandora_console/include/lib/Dashboard/Widgets/groups_status.php +++ b/pandora_console/include/lib/Dashboard/Widgets/groups_status.php @@ -340,6 +340,7 @@ class GroupsStatusWidget extends Widget // Head agents. $table->data[0][0] = ''; + $table->data[0][0] .= html_print_image( 'images/agent.png', true, @@ -360,37 +361,63 @@ class GroupsStatusWidget extends Widget if ($stats['total_agents'] !== 0) { // Agent Critical. - $table->data[1][0] = $this->getCellCounter( + $agent_url = ''; + $agent_url .= $url.'&status=1'; + $agent_data = ''; + $agent_data .= $this->getCellCounter( $stats['agent_critical'], '', 'bg_ff5' ); + $agent_data .= ''; + + $table->data[1][0] = $agent_data; // Agent Warning. - $table->data[2][0] = $this->getCellCounter( + $agent_url = ''; + $agent_url .= $url.'&status=2'; + $agent_data = ''; + $agent_data .= $this->getCellCounter( $stats['agent_warning'], '', 'bg_ffd' ); + $agent_data .= ''; + $table->data[2][0] = $agent_data; // Agent OK. - $table->data[3][0] = $this->getCellCounter( + $agent_url = ''; + $agent_url .= $url.'&status=0'; + $agent_data = ''; + $agent_data .= $this->getCellCounter( $stats['agent_ok'], '', 'bg_82B92E' ); + $agent_data .= ''; + $table->data[3][0] = $agent_data; // Agent Unknown. - $table->data[1][1] = $this->getCellCounter( + $agent_url = ''; + $agent_url .= $url.'&status=3'; + $agent_data = ''; + $agent_data .= $this->getCellCounter( $stats['agent_unknown'], '#B2B2B2' ); + $agent_data .= ''; + $table->data[1][1] = $agent_data; // Agent Not Init. - $table->data[2][1] = $this->getCellCounter( + $agent_url = ''; + $agent_url .= $url.'&status=5'; + $agent_data = ''; + $agent_data .= $this->getCellCounter( $stats['agent_not_init'], '#4a83f3' ); + $agent_data .= ''; + $table->data[2][1] = $agent_data; $data .= html_print_table($table, true); $data .= ''; @@ -436,26 +463,43 @@ class GroupsStatusWidget extends Widget $table->data[0][1] .= ''; $table->data[0][1] .= ''; + $monitordetail_url = 'index.php?sec=view&sec2=operation/agentes/status_monitor&refr=0&ag_group='.$this->values['groupId']; + // Modules Critical. - $table->data[1][0] = $this->getCellCounter( + $module_url = ''; + $module_url .= $monitordetail_url.'&status=1'; + $module_data = ''; + $module_data .= $this->getCellCounter( $stats['monitor_critical'], '', 'bg_ff5' ); + $module_data .= ''; + $table->data[1][0] = $module_data; // Modules Warning. - $table->data[2][0] = $this->getCellCounter( + $module_url = ''; + $module_url .= $monitordetail_url.'&status=2'; + $module_data = ''; + $module_data .= $this->getCellCounter( $stats['monitor_warning'], '', 'bg_ffd' ); + $module_data .= ''; + $table->data[2][0] = $module_data; // Modules OK. - $table->data[3][0] = $this->getCellCounter( + $module_url = ''; + $module_url .= $monitordetail_url.'&status=0'; + $module_data = ''; + $module_data .= $this->getCellCounter( $stats['monitor_ok'], '', 'bg_82B92E' ); + $module_data .= ''; + $table->data[3][0] = $module_data; // Modules Unknown. $table->data[1][1] = $this->getCellCounter( From 8bcd7cae26f545667c7dc06400b6e21336746268 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Tue, 11 Jul 2023 09:56:46 +0200 Subject: [PATCH 2/2] #10946 redirect to tree view in metaconsole --- pandora_console/include/class/Tree.class.php | 5 +- .../lib/Dashboard/Widgets/groups_status.php | 42 ++++++++--- pandora_console/operation/tree.php | 75 +++++++++---------- 3 files changed, 71 insertions(+), 51 deletions(-) diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php index 91f24b80bc..b4a41c494d 100644 --- a/pandora_console/include/class/Tree.class.php +++ b/pandora_console/include/class/Tree.class.php @@ -122,10 +122,11 @@ class Tree public function setFilter($filter) { // There is not module filter in metaconsole. - if (is_metaconsole()) { + /* + if (is_metaconsole()) { $filter['searchModule'] = ''; $filter['statusModule'] = self::TV_DEFAULT_AGENT_STATUS; - } + }*/ $this->filter = $filter; } diff --git a/pandora_console/include/lib/Dashboard/Widgets/groups_status.php b/pandora_console/include/lib/Dashboard/Widgets/groups_status.php index 13985f2533..2ba42f7bc2 100755 --- a/pandora_console/include/lib/Dashboard/Widgets/groups_status.php +++ b/pandora_console/include/lib/Dashboard/Widgets/groups_status.php @@ -360,9 +360,15 @@ class GroupsStatusWidget extends Widget $table->data[0][1] .= ''; if ($stats['total_agents'] !== 0) { + if (is_metaconsole() === true) { + $agentdetail_url = $url.'&statusAgent='; + } else { + $agentdetail_url = $url.'&status='; + } + // Agent Critical. $agent_url = ''; - $agent_url .= $url.'&status=1'; + $agent_url .= $agentdetail_url.'1'; $agent_data = ''; $agent_data .= $this->getCellCounter( $stats['agent_critical'], @@ -375,7 +381,7 @@ class GroupsStatusWidget extends Widget // Agent Warning. $agent_url = ''; - $agent_url .= $url.'&status=2'; + $agent_url .= $agentdetail_url.'2'; $agent_data = ''; $agent_data .= $this->getCellCounter( $stats['agent_warning'], @@ -387,7 +393,7 @@ class GroupsStatusWidget extends Widget // Agent OK. $agent_url = ''; - $agent_url .= $url.'&status=0'; + $agent_url .= $agentdetail_url.'0'; $agent_data = ''; $agent_data .= $this->getCellCounter( $stats['agent_ok'], @@ -399,7 +405,7 @@ class GroupsStatusWidget extends Widget // Agent Unknown. $agent_url = ''; - $agent_url .= $url.'&status=3'; + $agent_url .= $agentdetail_url.'3'; $agent_data = ''; $agent_data .= $this->getCellCounter( $stats['agent_unknown'], @@ -410,7 +416,7 @@ class GroupsStatusWidget extends Widget // Agent Not Init. $agent_url = ''; - $agent_url .= $url.'&status=5'; + $agent_url .= $agentdetail_url.'5'; $agent_data = ''; $agent_data .= $this->getCellCounter( $stats['agent_not_init'], @@ -463,11 +469,15 @@ class GroupsStatusWidget extends Widget $table->data[0][1] .= ''; $table->data[0][1] .= ''; - $monitordetail_url = 'index.php?sec=view&sec2=operation/agentes/status_monitor&refr=0&ag_group='.$this->values['groupId']; + if (is_metaconsole() === true) { + $monitordetail_url = $url.'&statusModule='; + } else { + $monitordetail_url = 'index.php?sec=view&sec2=operation/agentes/status_monitor&refr=0&ag_group='.$this->values['groupId'].'&status='; + } // Modules Critical. $module_url = ''; - $module_url .= $monitordetail_url.'&status=1'; + $module_url .= $monitordetail_url.'1'; $module_data = ''; $module_data .= $this->getCellCounter( $stats['monitor_critical'], @@ -479,7 +489,7 @@ class GroupsStatusWidget extends Widget // Modules Warning. $module_url = ''; - $module_url .= $monitordetail_url.'&status=2'; + $module_url .= $monitordetail_url.'2'; $module_data = ''; $module_data .= $this->getCellCounter( $stats['monitor_warning'], @@ -491,7 +501,7 @@ class GroupsStatusWidget extends Widget // Modules OK. $module_url = ''; - $module_url .= $monitordetail_url.'&status=0'; + $module_url .= $monitordetail_url.'0'; $module_data = ''; $module_data .= $this->getCellCounter( $stats['monitor_ok'], @@ -502,16 +512,26 @@ class GroupsStatusWidget extends Widget $table->data[3][0] = $module_data; // Modules Unknown. - $table->data[1][1] = $this->getCellCounter( + $module_url = ''; + $module_url .= $monitordetail_url.'3'; + $module_data = ''; + $module_data .= $this->getCellCounter( $stats['monitor_unknown'], '#B2B2B2' ); + $module_data .= ''; + $table->data[1][1] = $module_data; // Modules Not Init. - $table->data[2][1] = $this->getCellCounter( + $module_url = ''; + $module_url .= $monitordetail_url.'5'; + $module_data = ''; + $module_data .= $this->getCellCounter( $stats['monitor_not_init'], '#4a83f3' ); + $module_data .= ''; + $table->data[2][1] = $module_data; $data .= html_print_table($table, true); $data .= ''; diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index 41784398fe..2f690dc0b5 100755 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -291,47 +291,46 @@ if (is_metaconsole() === true) { ); } -if (is_metaconsole() === false) { - // Module filter. - $module_status_arr = []; - $module_status_arr[-1] = __('All'); - // Default. - $module_status_arr[AGENT_MODULE_STATUS_NORMAL] = __('Normal'); - $module_status_arr[AGENT_MODULE_STATUS_WARNING] = __('Warning'); - $module_status_arr[AGENT_MODULE_STATUS_CRITICAL_BAD] = __('Critical'); - $module_status_arr[AGENT_MODULE_STATUS_UNKNOWN] = __('Unknown'); - $module_status_arr[AGENT_MODULE_STATUS_NOT_INIT] = __('Not init'); - $module_status_arr['fired'] = __('Fired alerts'); +// if (is_metaconsole() === false) { +// Module filter. +$module_status_arr = []; +$module_status_arr[-1] = __('All'); +// Default. +$module_status_arr[AGENT_MODULE_STATUS_NORMAL] = __('Normal'); +$module_status_arr[AGENT_MODULE_STATUS_WARNING] = __('Warning'); +$module_status_arr[AGENT_MODULE_STATUS_CRITICAL_BAD] = __('Critical'); +$module_status_arr[AGENT_MODULE_STATUS_UNKNOWN] = __('Unknown'); +$module_status_arr[AGENT_MODULE_STATUS_NOT_INIT] = __('Not init'); +$module_status_arr['fired'] = __('Fired alerts'); - $table->data['last_row'][] = html_print_label_input_block( - __('Search module'), - html_print_input_text('search_module', $search_module, '', 25, 30, true) - ); +$table->data['last_row'][] = html_print_label_input_block( + __('Search module'), + html_print_input_text('search_module', $search_module, '', 25, 30, true) +); - $table->data['last_row'][] = html_print_label_input_block( - __('Show not init modules'), - html_print_checkbox_switch('show_not_init_modules', $show_not_init_modules, true, true) - ); - - $table->data['last_row'][] = html_print_label_input_block( - __('Module status'), - html_print_select( - $module_status_arr, - 'status_module', - $status_module, - '', - '', - 0, - true, - false, - false, - '', - false, - 'width:100%' - ) - ); -} +$table->data['last_row'][] = html_print_label_input_block( + __('Show not init modules'), + html_print_checkbox_switch('show_not_init_modules', $show_not_init_modules, true, true) +); +$table->data['last_row'][] = html_print_label_input_block( + __('Module status'), + html_print_select( + $module_status_arr, + 'status_module', + $status_module, + '', + '', + 0, + true, + false, + false, + '', + false, + 'width:100%' + ) +); +// } $form_html = '