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

2014-06-16 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_networkmap.php: fixed into the function
	networkmap_generate_dot the order of agents, now the agents without
	parents are the first elements in the array.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10202 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-06-16 16:29:04 +00:00
parent 8f21da56ad
commit 2c96e69b40
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2014-06-16 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php: fixed into the function
networkmap_generate_dot the order of agents, now the agents without
parents are the first elements in the array.
2014-06-16 Miguel de Dios <miguel.dedios@artica.es> 2014-06-16 Miguel de Dios <miguel.dedios@artica.es>
* godmode/update_manager/update_manager.setup.php, * godmode/update_manager/update_manager.setup.php,

18
pandora_console/include/functions_networkmap.php
View File

@ -260,10 +260,15 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
if ($group >= 1) { if ($group >= 1) {
$filter['id_grupo'] = $group; $filter['id_grupo'] = $group;
//Order by id_parent ascendant for to avoid the bugs
//because the first agents to process in the next
//foreach loop are without parent (id_parent = 0)
$agents = agents_get_agents ($filter, $agents = agents_get_agents ($filter,
array ('id_grupo, nombre, id_os, id_parent, id_agente, array ('id_grupo, nombre, id_os, id_parent, id_agente,
normal_count, warning_count, critical_count, normal_count, warning_count, critical_count,
unknown_count, total_count, notinit_count')); unknown_count, total_count, notinit_count'), 'AR',
array('field' => 'id_parent', 'order' => 'ASC'));
} }
else if ($group == -666) { else if ($group == -666) {
$agents = false; $agents = false;
@ -275,10 +280,15 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
unknown_count, total_count, notinit_count')); unknown_count, total_count, notinit_count'));
} }
else { else {
//Order by id_parent ascendant for to avoid the bugs
//because the first agents to process in the next
//foreach loop are without parent (id_parent = 0)
$agents = agents_get_agents ($filter, $agents = agents_get_agents ($filter,
array ('id_grupo, nombre, id_os, id_parent, id_agente, array ('id_grupo, nombre, id_os, id_parent, id_agente,
normal_count, warning_count, critical_count, normal_count, warning_count, critical_count,
unknown_count, total_count, notinit_count')); unknown_count, total_count, notinit_count'), 'AR',
array('field' => 'id_parent', 'order' => 'ASC'));
} }
@ -306,7 +316,9 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
$node_ref[$agent['id_agente']] = $node_count; $node_ref[$agent['id_agente']] = $node_count;
// Save node parent information to define edges later // Save node parent information to define edges later
if ($agent['id_parent'] != "0" && array_key_exists($agent['id_parent'], $node_ref)) { if ($agent['id_parent'] != "0" &&
array_key_exists($agent['id_parent'], $node_ref)) {
$parents[$node_count] = $node_ref[$agent['id_parent']]; $parents[$node_count] = $node_ref[$agent['id_parent']];
} }
else { else {