From 9cd9eb6fb4ee310231ed841c4e1e73ab941ca280 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Tue, 14 Mar 2017 11:30:41 +0100 Subject: [PATCH] Added filter to non-relation modules. (networkmap) --- .../include/functions_networkmap.php | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php index 247911cc3d..651255f509 100644 --- a/pandora_console/include/functions_networkmap.php +++ b/pandora_console/include/functions_networkmap.php @@ -405,17 +405,34 @@ function networkmap_generate_dot ($pandora_name, $group = 0, $module['type'] = 'module'; // Try to get the interface name - if (preg_match ("/_(.+)$/" , (string)$module['nombre'], $matches)) { + if (preg_match ("/(.+)_ifOperStatus$/" , (string)$module['nombre'], $matches)) { if ($matches[1]) { - $module['nombre'] = $matches[1]; + $have_relations_a = db_get_value('id', 'tmodule_relationship', 'module_a', $module['id_agente_modulo']); + $have_relations_b = db_get_value('id', 'tmodule_relationship', 'module_b', $module['id_agente_modulo']); + + if ($have_relations_a || $have_relations_b) { + $module['nombre'] = $matches[1]; + + // Save node parent information to define edges later + $parents[$node_count] = $module['parent'] = $agent['id_node']; + + // Add node + $nodes[$node_count] = $module; + } + } + } + else { + $have_relations_a = db_get_value('id', 'tmodule_relationship', 'module_a', $module['id_agente_modulo']); + $have_relations_b = db_get_value('id', 'tmodule_relationship', 'module_b', $module['id_agente_modulo']); + + if ($have_relations_a || $have_relations_b) { + // Save node parent information to define edges later + $parents[$node_count] = $module['parent'] = $agent['id_node']; + + // Add node + $nodes[$node_count] = $module; } } - - // Save node parent information to define edges later - $parents[$node_count] = $module['parent'] = $agent['id_node']; - - // Add node - $nodes[$node_count] = $module; } }