From 2b446a681db49eab49e5b8f4e85627b218fc2598 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Tue, 30 Jan 2018 17:38:29 +0100 Subject: [PATCH] Popup when click modules in cluster view, new images, filter modules - #1748 --- .../general/firts_task/cluster_builder.php | 2 +- .../reporting/cluster_builder.main.php | 8 +- .../godmode/reporting/cluster_list.php | 5 +- .../godmode/reporting/cluster_name_agents.php | 136 ++++++++++++++++++ .../godmode/reporting/cluster_view.php | 46 ++++-- .../firts_task/icono-cluster-activo.png | Bin 0 -> 3975 bytes .../os_icons/so_big_icons/so_cluster.png | Bin 0 -> 3665 bytes .../images/os_icons/so_cluster.png | Bin 0 -> 850 bytes .../images/os_icons/so_cluster_small.png | Bin 0 -> 659 bytes .../include/functions_clusters.php | 5 +- pandora_console/include/functions_modules.php | 5 + pandora_console/include/styles/pandora.css | 8 ++ pandora_console/pandoradb_data.sql | 2 +- 13 files changed, 195 insertions(+), 22 deletions(-) create mode 100644 pandora_console/godmode/reporting/cluster_name_agents.php create mode 100644 pandora_console/images/firts_task/icono-cluster-activo.png create mode 100644 pandora_console/images/os_icons/so_big_icons/so_cluster.png create mode 100644 pandora_console/images/os_icons/so_cluster.png create mode 100644 pandora_console/images/os_icons/so_cluster_small.png diff --git a/pandora_console/general/firts_task/cluster_builder.php b/pandora_console/general/firts_task/cluster_builder.php index a9c4cf2083..e0ca22576a 100644 --- a/pandora_console/general/firts_task/cluster_builder.php +++ b/pandora_console/general/firts_task/cluster_builder.php @@ -25,7 +25,7 @@ ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no cl
- __('Clusters')));?> + __('Clusters')));?>

diff --git a/pandora_console/godmode/reporting/cluster_builder.main.php b/pandora_console/godmode/reporting/cluster_builder.main.php index e5002e2df1..38f8bbb486 100644 --- a/pandora_console/godmode/reporting/cluster_builder.main.php +++ b/pandora_console/godmode/reporting/cluster_builder.main.php @@ -250,13 +250,9 @@ elseif($step == 2){ $cluster_agents_all[$value['id_agente']] = $value['alias']; } - $cluster_agents_out = array(); - $cluster_agents_out = array_diff_key($template_agents_all, $template_agents_in); + $cluster_agents_out = array_diff_key($cluster_agents_all,$cluster_agents_in); - $cluster_agents_in_keys = array_keys($template_agents_in); - $cluster_agents_out_keys = array_keys($template_agents_out); - - html_print_select ($cluster_agents_all, 'id_agents[]', 0, false, '', '', false, true, true, '', false, 'width: 100%;', $option_style); + html_print_select ($cluster_agents_out, 'id_agents[]', 0, false, '', '', false, true, true, '', false, 'width: 100%;', $option_style); echo ""; diff --git a/pandora_console/godmode/reporting/cluster_list.php b/pandora_console/godmode/reporting/cluster_list.php index e7c3857f1e..e70aa21e06 100644 --- a/pandora_console/godmode/reporting/cluster_list.php +++ b/pandora_console/godmode/reporting/cluster_list.php @@ -77,8 +77,7 @@ ui_pagination (count($clusters)); foreach ($clusters as $cluster) { $data = array (); - $data[0] = ''.$cluster["name"].' - Enlace Map Dani (Mapa de red)

'. - ''.$cluster["name"].' - Enlace Enrique (pantalla informativa)'; + $data[0] = ''.$cluster["name"].''; $data[1] = ui_print_truncate_text($cluster["description"], 70); $data[2] = ui_print_group_icon($cluster['group'],true); @@ -143,7 +142,7 @@ ui_pagination (count($clusters)); break; } - $data[6] = " + $data[6] = " "; array_push ($table->data, $data); diff --git a/pandora_console/godmode/reporting/cluster_name_agents.php b/pandora_console/godmode/reporting/cluster_name_agents.php new file mode 100644 index 0000000000..0247a10ffe --- /dev/null +++ b/pandora_console/godmode/reporting/cluster_name_agents.php @@ -0,0 +1,136 @@ + $value) { + $module_agents_value[$module_agents[$key]['id_agente']] = $module_agents[$key]['id_agente_modulo']; + } + + + echo ' + + + + + + + + + + + + + '; + foreach ($module_agents_value as $key => $value) { + + if ($value === reset($module_agents_value) && $module_ap) { + echo ''; + } + else{ + echo ''; + } + + echo ''; + echo ''; + echo ''; + + echo ''; + + echo ''; + echo ''; + echo ''; + echo ''; + } + + echo ' + +
Agent aliasModule nameStatusDataGraphLast contact
'.agents_get_alias($key).''.modules_get_agentmodule_name($value).''; + + switch (modules_get_agentmodule_last_status($value)) { + case 1: + + echo 'CRITICAL: '.modules_get_last_value($value).''; + + break; + case 2: + + echo 'WARNING: '.modules_get_last_value($value).''; + + break; + case 4: + + echo 'NO DATA: '.modules_get_last_value($value).''; + + break; + case 3: + + echo 'UNKNOWN: '.modules_get_last_value($value).''; + + break; + case 5: + + echo 'NOT INIT: '.modules_get_last_value($value).''; + + break; + case 0: + + echo 'NORMAL: '.modules_get_last_value($value).''; + + break; + + default: + + break; + } + + + echo ''.modules_get_last_value($value).''; + echo ''; + echo ''; + echo '   '; + + $nombre_tipo_modulo = modules_get_moduletype_name (modules_get_type_id($value)); + $handle = "stat".$nombre_tipo_modulo."_".$value; + $url = 'include/procesos.php?agente='.$value; + $win_handle=dechex(crc32($value.modules_get_agentmodule_name($value))); + + if ($graph_type == 'boolean') { + $draw_events = 1; + } else { + $draw_events = 0; + } + + $link ="winopeng('" . + "operation/agentes/stat_win.php?" . + "type=$graph_type&" . + "period=" . SECONDS_1DAY . "&" . + "id=" . $value . "&" . + "label=" . rawurlencode( + urlencode( + base64_encode($module["nombre"]))) . "&" . + "refresh=" . SECONDS_10MINUTES . "&" . + "draw_events=$draw_events', 'day_".$win_handle."')"; + + echo ''; + echo ''; + echo ''; + + + echo ''.date("d/m/Y - H:i:s",modules_get_last_contact($value)).''; + echo '
+'; + + return; + +?> \ No newline at end of file diff --git a/pandora_console/godmode/reporting/cluster_view.php b/pandora_console/godmode/reporting/cluster_view.php index 47b33cb3ef..050dea02c8 100644 --- a/pandora_console/godmode/reporting/cluster_view.php +++ b/pandora_console/godmode/reporting/cluster_view.php @@ -142,7 +142,7 @@ echo ""; echo "
"; - $balanced_modules_in = items_get_cluster_items_id_name($id_cluster,'AP'); + $balanced_modules_in = items_get_cluster_items_id_name($id_cluster,'AP',1); foreach ($balanced_modules_in as $key => $value) { $cluster_module = db_process_sql('select id_agente_modulo from tagente_modulo where custom_integer_2 = '.$key); @@ -150,12 +150,12 @@ echo "
"; $cluster_module_status = modules_get_agentmodule_last_status($cluster_module[0]['id_agente_modulo']); echo "
"; - - if($cluster_module_status == 5){ - echo '
'.ui_print_truncate_text($value, 40,false).'
'; + + if($cluster_module_status == 0){ + echo '
'.ui_print_truncate_text($value, 40,false).'
'; } else{ - echo '
'.ui_print_truncate_text($value, 40,false).'
'; + echo '
'.ui_print_truncate_text($value, 40,false).'
'; } echo '
'; @@ -169,7 +169,9 @@ echo "
"; echo ""; } - + // $module_agents = db_process_sql('select tagente_modulo.id_agente_modulo,tagente_modulo.id_agente,utimestamp from tagente_modulo,tagente_estado where tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo and nombre = "CPU Load" and tagente_modulo.id_agente in + // (select id_agent from tcluster_agent where id_cluster = 6)'); + // html_debug($module_agents); echo "
"; @@ -195,11 +197,11 @@ echo "
"; echo "
"; - if($cluster_module_status == 5){ - echo '
'.ui_print_truncate_text($value, 40,false).'
'; + if($cluster_module_status == 0){ + echo '
'.ui_print_truncate_text($value, 40,false).'
'; } else{ - echo '
'.ui_print_truncate_text($value, 40,false).'
'; + echo '
'.ui_print_truncate_text($value, 40,false).'
'; } echo '
'; @@ -280,6 +282,8 @@ echo "
"; echo ""; echo "
"; +echo ""; + $id_agent = db_process_sql('select id_agent from tcluster where id = '.$id_cluster); $id_agent_value = $id_agent[0]['id_agent']; @@ -513,8 +517,32 @@ function refresh_pagination_callback (module_id, id_agent, server_name,module_na }); } +function modal_module(name,id_cluster,module_ap,event){ + + x=event.clientX-550; + y=event.clientY-50; + + $.ajax({ + type: "POST", + url: "ajax.php", + data: {"page" : "godmode/reporting/cluster_name_agents", + "name_module" : name, + "id_cluster" : id_cluster, + "module_ap" : module_ap + }, + success: function(data) { + + $('#modal_module_popup').css({'display':'block','width':'600px','left':x+'px','top': y+'px'}); + + $('#modal_module_popup').html(data); + } + }); + +} + $(document).ready(function(){ + $('.tooltip').tooltipster(); var controller = null $(function() { diff --git a/pandora_console/images/firts_task/icono-cluster-activo.png b/pandora_console/images/firts_task/icono-cluster-activo.png new file mode 100644 index 0000000000000000000000000000000000000000..49720af75d05c705325a09de719482cf257832bf GIT binary patch literal 3975 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 literal 0 HcmV?d00001 diff --git a/pandora_console/images/os_icons/so_cluster.png b/pandora_console/images/os_icons/so_cluster.png new file mode 100644 index 0000000000000000000000000000000000000000..5f76cd16151dabfd3af9306dbcb42035a8f48d5e GIT binary patch literal 850 zcmV-Y1FigtP)vAM0g|uB=V?%=6acXxQ1b_5Ie-A79AU&1vfGi9 z4AgTBpI6~3Sk03KlGzy8f-y@tN_RkfXTzs z$%mg`m^MHYS0a)^P{R5E#T#&DXlSMuAT|cyql*Is7$XTu0Avd&ktqQ2L|~9^Af$(x z7=uC1m(cljo|W^z1Jv*c1qB7h3x}Q_z^9K9JxfD19{@&+0yIv+d?0QV)BNTC`x{e% zQS@g)pgbs>2JeUDU>&imXV ze-8kC5s2b)q&xxgfg>niAZdIL^*%ZXM2=W!x@-jHP>lSJB_bU_3HS9aR;=mqiuHimG}#a^^Zsq^x?*Ku7{6LvopZL8X9y5K`BJW_$SO@ zaA^T_i~%EoUUzW@LL literal 0 HcmV?d00001 diff --git a/pandora_console/images/os_icons/so_cluster_small.png b/pandora_console/images/os_icons/so_cluster_small.png new file mode 100644 index 0000000000000000000000000000000000000000..8f5a3c9c5f3d7f685a0afa27bc3186ef7272b885 GIT binary patch literal 659 zcmV;E0&M+>P)KVrc!J5CnV-^6@@0r0W0RjjU0WJP-Z*MOE zV>1Fd4bD~X?Lh*2+XN3Xf<%D~K_FiMC~+Ud2!H@WF&d~nAbA%5^?#2w9s^8YjxxqSLF@paf_UA) zub9pUSqJrk05b)`7)9av&2H0Da+q z@ZiA)pul{Pf;#tuiAFI-{y?8Cfaz#}g)Impi!p;7#mvf3&-Y)&L&^5X382^oV8AU< zcmKxWUnX)8WJSHa#Seo!`#3k&xnF94>Sh3jO9Ds^#hX>D4F1<`)c=pun;iWA3_-Do zECvu@jQElk(0!oj1_j&$p!JHl)UhCG043uO!1N*jb)UlXOJ5g)*lgVYCj#9LGVlWs z7Xs4~h!y}Ed;snepaBg?9xDV&PCyF$|G=7C&&@}M@Xrmx5bpZQz=m-G{vK;^b002ovPDHLkV1gH+4nF_@ literal 0 HcmV?d00001 diff --git a/pandora_console/include/functions_clusters.php b/pandora_console/include/functions_clusters.php index b59607b377..e54e73c08c 100644 --- a/pandora_console/include/functions_clusters.php +++ b/pandora_console/include/functions_clusters.php @@ -123,8 +123,8 @@ function items_get_cluster_items_id ($id_cluster,$item_type = 'AA'){ return ($post_items); } -function items_get_cluster_items_id_name ($id_cluster,$item_type = 'AA'){ - $items = db_get_all_rows_filter("tcluster_item", array("id_cluster" => $id_cluster,"item_type" => $item_type), array("id")); +function items_get_cluster_items_id_name ($id_cluster,$item_type = 'AA',$is_critical = '%%'){ + $items = db_get_all_rows_filter("tcluster_item", array("id_cluster" => $id_cluster,"item_type" => $item_type,"is_critical" => $is_critical), array("id")); $post_items = array(); @@ -214,4 +214,5 @@ function cluster_get_status ($id_agente){ } + ?> \ No newline at end of file diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index 15058a3a4b..0f26670a06 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -1649,6 +1649,11 @@ function modules_is_unit_macro($macro) { return false; } +function modules_get_last_contact ($id_agentmodule) { + return db_get_value ('utimestamp', 'tagente_estado', + 'id_agente_modulo', $id_agentmodule); +} + /** * Get the current value of an agent module. * diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 04f11bf691..0b63010b2d 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -4451,3 +4451,11 @@ form ul.form_flex li ul li{ height: 50px; width: 100%; } + +#modal_module_popup_close:hover{ + cursor: pointer; +} + +.modal_module_list:hover{ + cursor: pointer; +} \ No newline at end of file diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 27dbfea739..3f850e0bd0 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -142,7 +142,7 @@ INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`) VALUES (18, 'Switch', 'Generic switch', 'so_switch.png'), (19, 'Satellite', 'Satellite agent', 'satellite.png'), (20, 'Mainframe', 'Mainframe agent', 'so_mainframe.png'), -(21, 'Cluster', 'Cluster agent', 'so_mainframe.png'); +(21, 'Cluster', 'Cluster agent', 'so_cluster.png'); UNLOCK TABLES;