tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite code to modules type cause it was broken.

Browse Source
This commit is contained in:
Arturo Gonzalez 2017-03-09 08:58:11 +01:00
parent 6548443c82
commit 7dd279b902
2 changed files with 81 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
pandora_console/include/functions_networkmap.php
View File

@ -524,85 +524,96 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
// 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);
$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);
$agent_b = modules_get_agentmodule_agent($module_b); $agent_b = modules_get_agentmodule_agent($module_b);
if (isset($modules_node_ref[$module_a]) && if ($module_a_type == 18 && $module_b_type == 18) {
isset($modules_node_ref[$module_b])) { if (isset($modules_node_ref[$module_a]) &&
$graph .= networkmap_create_edge( isset($modules_node_ref[$module_b])) {
$modules_node_ref[$module_a], $graph .= networkmap_create_edge(
$modules_node_ref[$module_b], $modules_node_ref[$module_a],
$layout, $modules_node_ref[$module_b],
$nooverlap, $layout,
$pure, $nooverlap,
$zoom, $pure,
$ranksep, $zoom,
$simple, $ranksep,
$regen, $simple,
$font_size, $regen,
$group, $font_size,
'operation/agentes/networkmap', $group,
'topology', 'operation/agentes/networkmap',
$id_networkmap); 'topology',
$id_networkmap);
}
} }
elseif (isset($node_ref[$agent_a]) && elseif ($module_a_type == 6 && $module_b_type == 6) {
isset($node_ref[$agent_b])) { if (isset($node_ref[$agent_a]) &&
$graph .= networkmap_create_edge( isset($node_ref[$agent_b])) {
$node_ref[$agent_a], $graph .= networkmap_create_edge(
$node_ref[$agent_b], $node_ref[$agent_a],
$layout, $node_ref[$agent_b],
$nooverlap, $layout,
$pure, $nooverlap,
$zoom, $pure,
$ranksep, $zoom,
$simple, $ranksep,
$regen, $simple,
$font_size, $regen,
$group, $font_size,
'operation/agentes/networkmap', $group,
'topology', 'operation/agentes/networkmap',
$id_networkmap); 'topology',
$id_networkmap);
}
} }
elseif (isset($node_ref[$agent_a]) && elseif ($module_a_type == 6 && $module_b_type == 18) {
isset($modules_node_ref[$module_b])) { if (isset($node_ref[$agent_a]) &&
$graph .= networkmap_create_edge( isset($modules_node_ref[$module_b])) {
$node_ref[$agent_a], $graph .= networkmap_create_edge(
$modules_node_ref[$module_b], $node_ref[$agent_a],
$layout, $modules_node_ref[$module_b],
$nooverlap, $layout,
$pure, $nooverlap,
$zoom, $pure,
$ranksep, $zoom,
$simple, $ranksep,
$regen, $simple,
$font_size, $regen,
$group, $font_size,
'operation/agentes/networkmap', $group,
'topology', 'operation/agentes/networkmap',
$id_networkmap); 'topology',
$id_networkmap);
}
} }
elseif (isset($node_ref[$agent_b]) && elseif ($module_b_type == 6 && $module_a_type == 18) {
isset($modules_node_ref[$module_a])) { if (isset($node_ref[$agent_b]) &&
$graph .= networkmap_create_edge( isset($modules_node_ref[$module_a])) {
$node_ref[$agent_b], $graph .= networkmap_create_edge(
$modules_node_ref[$module_a], $node_ref[$agent_b],
$layout, $modules_node_ref[$module_a],
$nooverlap, $layout,
$pure, $nooverlap,
$zoom, $pure,
$ranksep, $zoom,
$simple, $ranksep,
$regen, $simple,
$font_size, $regen,
$group, $font_size,
'operation/agentes/networkmap', $group,
'topology', 'operation/agentes/networkmap',
$id_networkmap); 'topology',
$id_networkmap);
}
} }
} }

4
pandora_console/operation/agentes/pandora_networkmap.php
View File

@ -456,7 +456,7 @@ switch ($tab) {
$count = db_get_value_sql( $count = db_get_value_sql(
'SELECT COUNT(*) 'SELECT COUNT(*)
FROM titem FROM titem
WHERE id_map = ' . $network_map['id'] . ' AND deleted = 0'); WHERE id_map = ' . $network_map['id'] . ' AND deleted = 0 AND type = 0');
} }
if (empty($count)) if (empty($count))
@ -466,7 +466,7 @@ switch ($tab) {
$data['nodes'] = __('Pending to generate'); $data['nodes'] = __('Pending to generate');
} }
else { else {
$data['nodes'] = $count; $data['nodes'] = $count - 1; //PandoraFMS node is not an agent
} }
$data['groups'] = ui_print_group_icon ($network_map['id_group'], true); $data['groups'] = ui_print_group_icon ($network_map['id_group'], true);