tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the relations A-M-M-A and A-M-A in the old networkmaps (and this is the source of new networkmaps)

Browse Source
This commit is contained in:
mdtrooper 2016-05-13 13:20:53 +02:00
parent 04c6bd9c88
commit ae475c8447
4 changed files with 387 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/class/Networkmap.class.php
View File

@ -456,6 +456,9 @@ class Networkmap extends Map {
public function show() { public function show() {
$this->getNodes(); $this->getNodes();
//~ html_debug($this->nodes, true);
//~ html_debug($this->edges, true);
foreach ($this->nodes as $i => $node) { foreach ($this->nodes as $i => $node) {
$this->nodes[$i]['title'] = $this->nodes[$i]['title'] =
ui_print_truncate_text( ui_print_truncate_text(

394
pandora_console/include/functions_networkmap.php
View File

@ -545,6 +545,15 @@ function networkmap_get_nodes_and_links($pandora_name, $group = 0,
$module_groups[$agent['id_node']] = array(); $module_groups[$agent['id_node']] = array();
//~ html_debug("---------------modules-------------------");
//~ foreach ($modules as $module) {
//~ html_debug(
//~ $module['id_agente'] . "|" .
//~ $module['id_agente_modulo'] . "|" .
//~ $module['nombre']);
//~ }
// Parse modules // Parse modules
foreach ($modules as $key => $module) { foreach ($modules as $key => $module) {
@ -691,24 +700,45 @@ function networkmap_get_nodes_and_links($pandora_name, $group = 0,
$nodes[$module['id_node']] = $module; $nodes[$module['id_node']] = $module;
} }
} }
//~ html_debug("----------------------------------------");
//~ html_debug("------------nodes-----------------------");
//~ foreach($nodes as $node_id => $node) {
//~ if ($node['type'] == 'agent')
//~ html_debug($node_id . "|AGENT|" . $node["id_agente"] . "(" . $node['id_parent'] . ")" . $node['nombre']);
//~ elseif ($node['type'] == 'module')
//~ html_debug($node_id . "|MODULE|" . $node['id_agente_modulo'] . "(" . $node['id_agente'] . ")" . $node['nombre']);
//~ }
//~ html_debug("------------parents---------------------");
//~ html_debug($parents);
} }
} // End if ($show_agents) } // End if ($show_agents)
// Drop the modules without a partner if l2_network is true // Drop the modules without a partner if l2_network is true
// and the snmp interfaces token is false // and the snmp interfaces token is false
if ($l2_network_or_mixed === 'mix_l2_l3') { if ($l2_network_or_mixed === 'mix_l2_l3') {
if (!$show_all_modules || $show_snmp_modules) { if (!$show_all_modules || $show_snmp_modules) {
foreach ($modules_node_ref as $id_module => $node_count) { foreach ($modules_node_ref as $id_module => $node_count) {
if (! modules_relation_exists($id_module, array_keys($modules_node_ref))) { if (! modules_relation_exists($id_module, array_keys($modules_node_ref))) {
if ($show_snmp_modules) { if ($show_snmp_modules) {
$module_type = modules_get_agentmodule_type($id_module); $module_type = modules_get_agentmodule_type($id_module);
if ($module_type != 18) { if ($module_type != 18) {
//~ html_debug("unset111 " . $id_module);
unset($nodes[$node_count]); unset($nodes[$node_count]);
unset($orphans[$node_count]); unset($orphans[$node_count]);
unset($parents[$node_count]); unset($parents[$node_count]);
} }
} }
else { else {
//~ html_debug("unset222 " . $id_module . " | " . $node_count);
unset($nodes[$node_count]); unset($nodes[$node_count]);
unset($orphans[$node_count]); unset($orphans[$node_count]);
unset($parents[$node_count]); unset($parents[$node_count]);
@ -717,12 +747,15 @@ function networkmap_get_nodes_and_links($pandora_name, $group = 0,
else { else {
$module_type = modules_get_agentmodule_type($id_module); $module_type = modules_get_agentmodule_type($id_module);
if ($module_type != 18) { if ($module_type != 18) {
//~ html_debug("unset333 " . $id_module);
unset($nodes[$node_count]); unset($nodes[$node_count]);
unset($orphans[$node_count]); unset($orphans[$node_count]);
unset($parents[$node_count]); unset($parents[$node_count]);
} }
} }
} }
} }
// Addded the relationship of parents of agents // Addded the relationship of parents of agents
@ -738,6 +771,9 @@ function networkmap_get_nodes_and_links($pandora_name, $group = 0,
} }
} }
//~ html_debug("--------result parents---------------------------");
//~ html_debug($parents);
} }
else if ($l2_network) { else if ($l2_network) {
foreach ($modules_node_ref as $id_module => $node_count) { foreach ($modules_node_ref as $id_module => $node_count) {
@ -780,7 +816,9 @@ function networkmap_get_nodes_and_links($pandora_name, $group = 0,
} }
} }
} }
$stats = array(); $stats = array();
$edges = array(); $edges = array();
@ -814,6 +852,8 @@ function networkmap_get_nodes_and_links($pandora_name, $group = 0,
// Define edges // Define edges
foreach ($parents as $node => $parent_id) { foreach ($parents as $node => $parent_id) {
// Verify that the parent is in the graph // Verify that the parent is in the graph
@ -825,59 +865,285 @@ function networkmap_get_nodes_and_links($pandora_name, $group = 0,
} }
} }
//------------------------------------------------------------------
// INIT Relations between the nodes
//------------------------------------------------------------------
//~ html_debug("------------modules_node_ref-------------------------");
//~ html_debug($modules_node_ref);
foreach ($modules_node_ref as $id_module => $id_node) {
$relations = db_get_all_rows_sql(
"SELECT module_b AS id_module
FROM tmodule_relationship
WHERE module_a = " . $id_module . "
UNION
SELECT module_a AS id_module
FROM tmodule_relationship
WHERE module_b = " . $id_module);
$id_module_type = modules_get_agentmodule_type($id_module);
$agent_id = modules_get_agentmodule_agent($id_module);
//~ html_debug("------relations-----");
//~ html_debug($relations);
foreach ($relations as $relation) {
$id_module_relation = $relation['id_module'];
$id_module_type_relation =
modules_get_agentmodule_type($id_module_relation);
$agent_id_relation = modules_get_agentmodule_agent($id_module_relation);
//~ html_debug_print($id_module_type."~".$id_module_type_relation);
if ($id_module_type == 18 && $id_module_type_relation == 18) {
//~ html_debug(111);
if (isset($modules_node_ref[$id_module]) &&
isset($modules_node_ref[$id_module_relation])) {
//~ html_debug(222);
$exists =
networkmap_check_exists_edge_between_nodes(
$edges,
$modules_node_ref[$id_module],
$modules_node_ref[$id_module_relation]
);
if (!$exists) {
if (empty($edges[$modules_node_ref[$id_module]])) {
//~ html_debug(333);
$edges[$modules_node_ref[$id_module]] =
$modules_node_ref[$id_module_relation];
}
else {
//~ html_debug(444);
//~ html_debug($id_module . "|" . $modules_node_ref[$id_module]
//~ . "|" . $edges[$modules_node_ref[$id_module]]);
$edges[$modules_node_ref[$id_module]] =
(array)$edges[$modules_node_ref[$id_module]];
$edges[$modules_node_ref[$id_module]][] =
$modules_node_ref[$id_module_relation];
}
}
}
}
// Relation into agents
elseif ($id_module_type == 6 && $id_module_type_relation == 6) {
if ($l2_network_or_mixed !== 'mix_l2_l3') {
if (isset($node_ref[$agent_id]) &&
isset($node_ref[$agent_id_relation])) {
//~ html_debug(111111);
$exists =
networkmap_check_exists_edge_between_nodes(
$edges,
$node_ref[$agent_id],
$node_ref[$agent_id_relation]
);
if (!$exists) {
if (empty($edges[$node_ref[$agent_id]])) {
//~ html_debug(111222);
$edges[$node_ref[$agent_id]] =
$node_ref[$agent_id_relation];
}
else {
//~ html_debug(111333);
if (!$exists) {
$edges[$node_ref[$agent_id]] =
(array)$edges[$node_ref[$agent_id]];
$edges[$node_ref[$agent_id]][] =
$node_ref[$agent_id_relation];
}
}
}
}
}
}
elseif ($id_module_type == 6 && $id_module_type_relation == 18) {
if (isset($node_ref[$agent_id]) &&
isset($modules_node_ref[$id_module_relation])) {
$exists =
networkmap_check_exists_edge_between_nodes(
$edges,
$node_ref[$agent_id],
$modules_node_ref[$id_module_relation]
);
if (!$exists) {
if (empty($edges[$node_ref[$agent_id]])) {
$edges[$node_ref[$agent_id]] =
$modules_node_ref[$id_module_relation];
}
else {
if (!$exists) {
$edges[$node_ref[$agent_id]] =
(array)$edges[$node_ref[$agent_id]];
$edges[$node_ref[$agent_id]][] =
$modules_node_ref[$id_module_relation];
}
}
}
}
}
elseif ($id_module_type_relation == 6 && $id_module_type == 18) {
if (isset($node_ref[$agent_id_relation]) &&
isset($modules_node_ref[$id_module])) {
//~ html_debug(222111);
//~ elseif ($module_b_type == 6 && $module_a_type == 18) {
//~ if (isset($node_ref[$agent_b]) &&
//~ isset($modules_node_ref[$module_a])) {
//~
//~ $edges[$node_ref[$agent_b]] = $modules_node_ref[$module_a];
//~ }
$exists =
networkmap_check_exists_edge_between_nodes(
$edges,
$node_ref[$agent_id_relation],
$modules_node_ref[$id_module]
);
if (!$exists) {
if (empty($edges[$node_ref[$agent_id_relation]])) {
//~ html_debug(222222);
$edges[$node_ref[$agent_id_relation]] =
$modules_node_ref[$id_module];
}
else {
//~ html_debug(222333);
if (!$exists) {
$edges[$node_ref[$agent_id_relation]] =
(array)$edges[$node_ref[$agent_id_relation]];
$edges[$node_ref[$agent_id_relation]][] =
$modules_node_ref[$id_module];
}
}
}
}
}
//~ html_debug($edges);
}
}
//------------------------------------------------------------------
// END Relations between the nodes
//------------------------------------------------------------------
// Define edges for the module interfaces relations // Define edges for the module interfaces relations
// Get the remote_snmp_proc relations // Get the remote_snmp_proc relations
$relations = modules_get_relations(); //~ $relations = modules_get_relations();
if ($relations === false) //~ if ($relations === false)
$relations = array(); //~ $relations = array();
foreach ($relations as $key => $relation) { //~ foreach ($relations as $key => $relation) {
$module_a = $relation['module_a']; //~ $module_a = $relation['module_a'];
$module_a_type = modules_get_agentmodule_type($module_a); //~ $module_a_type = modules_get_agentmodule_type($module_a);
$agent_a = modules_get_agentmodule_agent($module_a); //~ $agent_a = modules_get_agentmodule_agent($module_a);
$module_b = $relation['module_b']; //~ $module_b = $relation['module_b'];
$module_b_type = modules_get_agentmodule_type($module_b); //~ $module_b_type = modules_get_agentmodule_type($module_b);
$agent_b = modules_get_agentmodule_agent($module_b); //~ $agent_b = modules_get_agentmodule_agent($module_b);
//~
if ($module_a_type == 18 && $module_b_type == 18) { //~ if ($module_a_type == 18 && $module_b_type == 18) {
if (isset($modules_node_ref[$module_a]) && //~ if (isset($modules_node_ref[$module_a]) &&
isset($modules_node_ref[$module_b])) { //~ isset($modules_node_ref[$module_b])) {
//~
$edges[$modules_node_ref[$module_a]] = //~ $edges[$modules_node_ref[$module_a]] =
$modules_node_ref[$module_b]; //~ $modules_node_ref[$module_b];
} //~ }
} //~ }
// Relation into agents //~ // Relation into agents
elseif ($module_a_type == 6 && $module_b_type == 6) { //~ elseif ($module_a_type == 6 && $module_b_type == 6) {
if ($l2_network_or_mixed !== 'mix_l2_l3') { //~ if ($l2_network_or_mixed !== 'mix_l2_l3') {
if (isset($node_ref[$agent_a]) && //~ if (isset($node_ref[$agent_a]) &&
isset($node_ref[$agent_b])) { //~ isset($node_ref[$agent_b])) {
//~
$edges[$node_ref[$agent_a]] = $node_ref[$agent_b]; //~ $edges[$node_ref[$agent_a]] = $node_ref[$agent_b];
} //~ }
} //~ }
//~
} //~ }
elseif ($module_a_type == 6 && $module_b_type == 18) { //~ elseif ($module_a_type == 6 && $module_b_type == 18) {
if (isset($node_ref[$agent_a]) && //~ if (isset($node_ref[$agent_a]) &&
isset($modules_node_ref[$module_b])) { //~ isset($modules_node_ref[$module_b])) {
//~
$edges[$node_ref[$agent_a]] = $modules_node_ref[$module_b]; //~ $edges[$node_ref[$agent_a]] = $modules_node_ref[$module_b];
} //~ }
} //~ }
elseif ($module_b_type == 6 && $module_a_type == 18) { //~ elseif ($module_b_type == 6 && $module_a_type == 18) {
if (isset($node_ref[$agent_b]) && //~ if (isset($node_ref[$agent_b]) &&
isset($modules_node_ref[$module_a])) { //~ isset($modules_node_ref[$module_a])) {
//~
$edges[$node_ref[$agent_b]] = $modules_node_ref[$module_a]; //~ $edges[$node_ref[$agent_b]] = $modules_node_ref[$module_a];
} //~ }
} //~ }
} //~ }
//~ html_debug("-----------GENERATE_DOT------------------------------");
//~ html_debug("-----------nodes-------------------------------------");
//~ foreach($nodes as $node_id => $node) {
//~ if ($node['type'] == 'agent')
//~ html_debug($node_id . "|AGENT|" . $node["id_agente"] . "|" . $node['nombre']);
//~ elseif ($node['type'] == 'module')
//~ html_debug($node_id . "|MODULE|" . $node['id_agente_modulo'] . "|" . $node['id_agente'] . "|" . $node['nombre']);
//~ }
//~ html_debug("-----------edges-------------------------------------");
//~ html_debug($edges);
return array("nodes" => $nodes, "edges" => $edges, "orphans" => $orphans); return array("nodes" => $nodes, "edges" => $edges, "orphans" => $orphans);
} }
function networkmap_check_exists_edge_between_nodes($edges, $node_a, $node_b) {
$relation = false;
if (is_array($edges[$node_a])) {
if (array_search($node_b, $edges[$node_a]) !== false)
$relation = true;
}
else {
if ($edges[$node_a] == $node_b)
$relation = true;
}
if (is_array($edges[$node_b])) {
if (array_search($node_a, $edges[$node_b]) !== false)
$relation = true;
}
else {
if ($edges[$node_b] == $node_a)
$relation = true;
}
return $relation;
}
function networkmap_generate_dot ($pandora_name, $group = 0, function networkmap_generate_dot ($pandora_name, $group = 0,
@ -948,20 +1214,26 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
// Define edges // Define edges
foreach ($networkmap_data['edges'] as $id_child => $id_parent) { foreach ($networkmap_data['edges'] as $id_child => $id_parent) {
$graph .= networkmap_create_edge ($id_parent, if (!is_array($id_parent)) {
$id_child, $id_parent = (array)$id_parent;
$layout, }
$nooverlap,
$pure, foreach ($id_parent as $id_p) {
$zoom, $graph .= networkmap_create_edge ($id_p,
$ranksep, $id_child,
$simple, $layout,
$regen, $nooverlap,
$font_size, $pure,
$group, $zoom,
'operation/agentes/networkmap', $ranksep,
'topology', $simple,
$id_networkmap); $regen,
$font_size,
$group,
'operation/agentes/networkmap',
'topology',
$id_networkmap);
}
} }

38
pandora_console/include/javascript/map/MapController.js
View File

@ -1544,9 +1544,36 @@ MapController.prototype.events_for_minimap = function() {
.on("mouseout", function(d) { .on("mouseout", function(d) {
self._over = null; self._over = null;
}) })
//~ .on("mousedown", function(d) {
//~ console.log("minimap mousedown");
//~ d3.event.stopPropagation();
//~ d3.event.preventDefault();
//~ })
//~ .on("mouseup", function(d) {
//~ console.log("minimap mouseup");
//~ d3.event.stopPropagation();
//~ d3.event.preventDefault();
//~ })
.on("click", function(d) { .on("click", function(d) {
//~ console.log("minimap click");
self.minimap_panning_map(); self.minimap_panning_map();
}); });
var drag = d3.behavior.drag()
.origin(function(d) { return d; })
.on("dragstart", function(d) {
console.log("dragstart minimap");
//~ self.event_resize("dragstart", item, d);
})
.on("drag", function(d) {
console.log("drag minimap");
})
.on("dragend", function(d) {
console.log("dragend minimap");
});
d3.select(self._target + " .minimap .viewport").call(drag);
} }
/** /**
@ -2071,7 +2098,7 @@ MapController.prototype.events = function() {
} }
}); });
setTimeout(function() { self.refresh_map();}, self._refresh_time); //~ setTimeout(function() { self.refresh_map();}, self._refresh_time);
} }
/** /**
@ -3175,7 +3202,14 @@ function get_distance_between_point(point1, point2) {
* This function returns the center of the node * This function returns the center of the node
*/ */
function get_center_element(element) { function get_center_element(element) {
var element_t = d3.transform(d3.select(element).attr("transform")); var element_t;
try {
element_t = d3.transform(d3.select(element).attr("transform"));
}
catch(err) {
console.log(element, err);
}
//~ var element_t = d3.transform(d3.select(element).attr("transform"));
var element_t_scale = parseFloat(element_t['scale']); var element_t_scale = parseFloat(element_t['scale']);
var element_b = d3.select(element).node().getBBox(); var element_b = d3.select(element).node().getBBox();

16
pandora_console/include/javascript/map/NetworkmapController.js
View File

@ -40,6 +40,9 @@ NetworkmapController.prototype.init_map = function() {
var self = this; var self = this;
var clean_arrows = []; var clean_arrows = [];
console.log(self.get_nodes_map());
console.log(self.get_edges_map());
$.each(self.get_edges_map(), function(i, edge) { $.each(self.get_edges_map(), function(i, edge) {
var arrow_AF_or_FF = self.get_arrow_AF_or_FF(edge['to'], edge['from']); var arrow_AF_or_FF = self.get_arrow_AF_or_FF(edge['to'], edge['from']);
if (arrow_AF_or_FF !== null) { if (arrow_AF_or_FF !== null) {
@ -58,6 +61,7 @@ NetworkmapController.prototype.init_map = function() {
var arrow_AMMA = self.get_arrow_AMMA(edge['to'], edge['from']); var arrow_AMMA = self.get_arrow_AMMA(edge['to'], edge['from']);
if (arrow_AMMA !== null) { if (arrow_AMMA !== null) {
if (!self.exists_arrow(clean_arrows, arrow_AMMA)) { if (!self.exists_arrow(clean_arrows, arrow_AMMA)) {
console.log(arrow_AMMA);
clean_arrows.push(arrow_AMMA); clean_arrows.push(arrow_AMMA);
} }
} }
@ -220,6 +224,7 @@ NetworkmapController.prototype.filter_only_agents = function(node) {
* This function returns an AMMA arrow * This function returns an AMMA arrow
*/ */
NetworkmapController.prototype.get_arrow_AMMA = function(id_to, id_from) { NetworkmapController.prototype.get_arrow_AMMA = function(id_to, id_from) {
console.log("--------------------get_arrow_AMMA-----------------------");
var self = this; var self = this;
var return_var = null; var return_var = null;
@ -230,15 +235,19 @@ NetworkmapController.prototype.get_arrow_AMMA = function(id_to, id_from) {
if ((self.get_node_type(id_to) == ITEM_TYPE_MODULE_NETWORKMAP) if ((self.get_node_type(id_to) == ITEM_TYPE_MODULE_NETWORKMAP)
&& (self.get_node_type(id_from) == ITEM_TYPE_MODULE_NETWORKMAP)) { && (self.get_node_type(id_from) == ITEM_TYPE_MODULE_NETWORKMAP)) {
var arrow_MM = self.get_arrow(id_to, id_from); var arrow_MM = self.get_arrow(id_to, id_from);
console.log("arrow_MM", arrow_MM);
var arrows_to = self var arrows_to = self
.get_edges_from_node(arrow_MM['nodes']['to']['graph_id']); .get_edges_from_node(arrow_MM['nodes']['to']['graph_id']);
var arrows_from = self var arrows_from = self
.get_edges_from_node(arrow_MM['nodes']['from']['graph_id']); .get_edges_from_node(arrow_MM['nodes']['from']['graph_id']);
console.log("arrows_to", arrows_to);
console.log("arrows_from", arrows_from);
var temp = null; var temp = null;
$.each(arrows_to, function(i, arrow_to) { $.each(arrows_to, function(i, arrow_to) {
if (arrow_to['graph_id'] != arrow_MM['arrow']['graph_id']) { if (arrow_to['graph_id'] != arrow_MM['arrow']['graph_id']) {
@ -257,6 +266,7 @@ NetworkmapController.prototype.get_arrow_AMMA = function(id_to, id_from) {
}); });
var arrow_from = temp; var arrow_from = temp;
if (arrow_to !== null && arrow_from !== null) { if (arrow_to !== null && arrow_from !== null) {
// There is one arrow for A-M-M-A // There is one arrow for A-M-M-A
@ -264,10 +274,14 @@ NetworkmapController.prototype.get_arrow_AMMA = function(id_to, id_from) {
arrow_to = self.get_arrow_from_id(arrow_to['graph_id']); arrow_to = self.get_arrow_from_id(arrow_to['graph_id']);
arrow_to = self.get_arrow( arrow_to = self.get_arrow(
arrow_to['to'], arrow_to['from']); arrow_to['to'], arrow_to['from']);
arrow_from = self.get_arrow_from_id(arrow_from['graph_id']); arrow_from = self.get_arrow_from_id(arrow_from['graph_id']);
arrow_from = self.get_arrow( arrow_from = self.get_arrow(
arrow_from['to'], arrow_from['from']); arrow_from['to'], arrow_from['from']);
console.log("arrow_to", arrow_to);
console.log("arrow_from", arrow_from);
// Make the new id with concatenate the id_to + id_mm + id_from // Make the new id with concatenate the id_to + id_mm + id_from
arrow['graph_id'] = arrow_to['arrow']['graph_id'] + "" + arrow['graph_id'] = arrow_to['arrow']['graph_id'] + "" +
arrow_MM['arrow']['graph_id'] + "" + arrow_MM['arrow']['graph_id'] + "" +