From 3c1025a1466dfadbcf79143156c5e637314714e5 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Wed, 31 Jan 2018 16:40:38 +0100 Subject: [PATCH] Changes visual style in cluster map and added autorefresh --- .../godmode/reporting/cluster_view.php | 31 +++++++++++------- .../images/networkmap/so_cluster.png | Bin 0 -> 3989 bytes pandora_console/operation/users/user_edit.php | 1 + 3 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 pandora_console/images/networkmap/so_cluster.png diff --git a/pandora_console/godmode/reporting/cluster_view.php b/pandora_console/godmode/reporting/cluster_view.php index bb7aa81931..6aab60e9d9 100644 --- a/pandora_console/godmode/reporting/cluster_view.php +++ b/pandora_console/godmode/reporting/cluster_view.php @@ -30,7 +30,7 @@ $buttons['editor'] = array('active' => false, ui_print_page_header ( __("Cluster detail").' ยป '.clusters_get_name($id_cluster), "images/agent_mc.png", false, "agent_status", false, $buttons); -$font_size = 10; +$font_size = 20; $width = "100%"; $height = "500"; $node_radius = 40; @@ -310,9 +310,9 @@ if ($graph === false) { // Generate image and map // If image was generated just a few minutes ago, then don't regenerate (it takes long) unless regen checkbox is set -$filename_map = safe_url_extraclean ($config["attachment_store"])."/vmware_map_" . $config['id_user']; -$filename_img = "attachment/vmware_map_" . $config['id_user']; -$filename_dot = safe_url_extraclean ($config["attachment_store"])."/vmware_map_" . $config['id_user']; +$filename_map = safe_url_extraclean ($config["attachment_store"])."/cluster_map_" . $config['id_user']; +$filename_img = "attachment/cluster_map_" . $config['id_user']; +$filename_dot = safe_url_extraclean ($config["attachment_store"])."/cluster_map_" . $config['id_user']; $filename_map .= ".map"; $filename_img .= ".png"; @@ -330,16 +330,24 @@ unlink($filename_dot); $nodes = cluster_loadfile($filename_plain, $graph, $id_cluster); +// Colored main node (active-passive) +$node_id_agent = array(); +foreach ($nodes['nodes'] as $key => $node) { + if ($node['id'] !== '1') { + $node_id_agent[$key] = $node['id_agent']; + } +} + +$sql_AP = "SELECT am.nombre, am.id_agente_modulo,am.id_agente, am.post_process, ae.datos, ae.estado, ae.utimestamp FROM tagente_modulo am + INNER JOIN tagente_estado ae ON am.id_agente_modulo = ae.id_agente_modulo + WHERE am.nombre IN (SELECT name FROM tcluster_item WHERE id_cluster = ".$id_cluster." AND item_type like 'AP') + AND am.id_agente IN (".implode(",",$node_id_agent).") ORDER BY ae.utimestamp DESC LIMIT 1"; + +$modules_AP = db_get_all_rows_sql ($sql_AP); foreach ($nodes['nodes'] as $key => $node) { if ($node['id'] !== '1') { - $sql_AP = "SELECT am.nombre, am.id_agente_modulo, am.post_process, ae.datos, ae.estado FROM tagente_modulo am - INNER JOIN tagente_estado ae ON am.id_agente_modulo = ae.id_agente_modulo - WHERE nombre IN (SELECT name FROM tcluster_item WHERE id_cluster = $id_cluster AND item_type like 'AP') AND am.id_agente = $node[id_agent]"; - - $modules_AP = db_get_all_rows_sql ($sql_AP); - - if ($modules_AP) { + if ($node['id_agent'] == $modules_AP[0]['id_agente']) { $nodes['nodes'][$key]['passive'] = 1; } } @@ -469,6 +477,7 @@ function show_module_detail_dialog(module_id, id_agent, server_name, offset, per data: "page=include/ajax/module&get_module_detail=1&server_name="+server_name+"&id_agent="+id_agent+"&id_module=" + module_id+"&offset="+offset+"&period="+period + extra_parameters, dataType: "html", success: function(data) { + $(".tooltipster-base").remove(); $("#module_details_dialog").hide () .empty () .append (data) diff --git a/pandora_console/images/networkmap/so_cluster.png b/pandora_console/images/networkmap/so_cluster.png new file mode 100644 index 0000000000000000000000000000000000000000..e515c9e7a89037d8398ab9eaa0e52ec9c5c2d460 GIT binary patch literal 3989 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 vyGF0q->$B%Zd9pMbxx