tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mixed the networkmap level 2 and level 3

This commit is contained in:
mdtrooper 2016-03-18 16:17:28 +01:00
parent 3a4f0ef9cd
commit 135ae1dd16
2 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,13 @@ class Networkmap extends Map {
// EDGE // EDGE
$graphviz_ids = explode("--", $chunks[0]); $graphviz_ids = explode("--", $chunks[0]);
if (!is_numeric(trim($graphviz_ids[0])) ||
!is_numeric(trim($graphviz_ids[1]))) {
continue;
}
$edges[] = array( $edges[] = array(
'to' => trim($graphviz_ids[0]), 'to' => trim($graphviz_ids[0]),
'from' => trim($graphviz_ids[1])); 'from' => trim($graphviz_ids[1]));
@ -202,7 +209,7 @@ class Networkmap extends Map {
false, //cut_names false, //cut_names
true, // relative true, // relative
'', '',
$parameters['l2_network_interfaces'], 'mix_l2_l3',
$parameters['ip_mask'], $parameters['ip_mask'],
$parameters['dont_show_subgroups'], $parameters['dont_show_subgroups'],
false, false,

52
pandora_console/include/functions_networkmap.php
View File

@ -229,12 +229,18 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
$simple = 0, $font_size = 12, $layout = 'radial', $nooverlap = 0, $simple = 0, $font_size = 12, $layout = 'radial', $nooverlap = 0,
$zoom = 1, $ranksep = 2.5, $center = 0, $regen = 1, $pure = 0, $zoom = 1, $ranksep = 2.5, $center = 0, $regen = 1, $pure = 0,
$id_networkmap = 0, $show_snmp_modules = 0, $cut_names = true, $id_networkmap = 0, $show_snmp_modules = 0, $cut_names = true,
$relative = false, $text_filter = '', $l2_network = false, $ip_mask = null, $relative = false, $text_filter = '', $l2_network_or_mixed = false, $ip_mask = null,
$dont_show_subgroups = false, $strict_user = false, $size_canvas = null, $dont_show_subgroups = false, $strict_user = false, $size_canvas = null,
$old_mode = false) { $old_mode = false) {
global $config; global $config;
if ($l2_network_or_mixed === 'mix_l2_l3') {
$l2_network = true;
}
else {
$l2_network = $l2_network_or_mixed;
}
if ($l2_network) { if ($l2_network) {
$nooverlap = 1; $nooverlap = 1;
@ -416,7 +422,49 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
// 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) { if ($l2_network_or_mixed === 'mix_l2_l3') {
foreach ($modules_node_ref as $id_module => $node_count) {
if (! modules_relation_exists($id_module, array_keys($modules_node_ref))) {
if ($show_snmp_modules) {
$module_type = modules_get_agentmodule_type($id_module);
if ($module_type != 18) {
unset($nodes[$node_count]);
unset($orphans[$node_count]);
unset($parents[$node_count]);
}
}
else {
unset($nodes[$node_count]);
unset($orphans[$node_count]);
unset($parents[$node_count]);
}
}
else {
$module_type = modules_get_agentmodule_type($id_module);
if ($module_type != 18) {
unset($nodes[$node_count]);
unset($orphans[$node_count]);
unset($parents[$node_count]);
}
}
}
// Addded the relationship of parents of agents
foreach ($agents as $agent) {
if ($agent['id_parent'] != "0" &&
array_key_exists($agent['id_parent'], $node_ref)) {
$parents[$node_ref[$agent['id_agente']]] = $node_ref[$agent['id_parent']];
}
else {
$orphans[$node_ref[$agent['id_agente']]] = 1;
}
}
}
else if ($l2_network) {
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) {