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

Fixed calculation of group items in visual maps on linked maps.

Browse Source 
NOTE: this fix must be ported to 6.0 code (has not been ported here because
the code in 6.0 is completely different)
This commit is contained in:
Sancho Lerena 2014-12-31 16:49:32 +01:00
parent 6c9316c1c8
commit f45c09259e
1 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
pandora_console/include/functions_visual_map.php
View File

@ -2171,35 +2171,62 @@ function visual_map_get_layout_status ($id_layout = 0, $depth = 0) {
$id_layout = (int) $id_layout; $id_layout = (int) $id_layout;
$result = db_get_all_rows_filter ('tlayout_data', array ('id_layout' => $id_layout), $result = db_get_all_rows_filter ('tlayout_data', array ('id_layout' => $id_layout),
array ('id_agente_modulo', 'parent_item', 'id_layout_linked', 'id_agent', 'type')); array ('id_agente_modulo', 'parent_item', 'id_layout_linked', 'id_agent', 'type', 'id_group'));
if ($result === false) if ($result === false)
return VISUAL_MAP_STATUS_NORMAL; return VISUAL_MAP_STATUS_NORMAL;
foreach ($result as $rownum => $data) { foreach ($result as $rownum => $data) {
if (($data["id_layout_linked"] == 0 && $data["id_agente_modulo"] == 0 && $data["id_agent"] == 0) || $data['type'] != 0) if (($data["id_layout_linked"] == 0 && $data["type"] != 11 && $data["id_agente_modulo"] == 0 && $data["id_agent"] == 0) || ($data["type"] != 0 && $data["type"] !=11 ))
continue; continue;
// Other Layout (Recursive!)
if (($data["id_layout_linked"] != 0) && ($data["id_agente_modulo"] == 0)) {
$status = visual_map_get_layout_status ($data["id_layout_linked"], $depth);
}
// Module
elseif ($data["id_agente_modulo"] != 0) {
$status = modules_get_agentmodule_status ($data["id_agente_modulo"]);
} // Groups (slerena, 30 Dec 2014)
// Agent if (($data["id_layout_linked"] == 0) && ($data["type"] == 11)){
else {
//-------------------------------------------------- $group_status = groups_get_status($data['id_group']);
// ADDED NO CHECK ACL FOR AVOID CHECK TAGS THAT switch ($group_status) {
// MAKE VERY SLOW THE VISUALMAPS WITH ACL TAGS case AGENT_STATUS_ALERT_FIRED:
//-------------------------------------------------- $status = VISUAL_MAP_STATUS_CRITICAL_ALERT;
break;
$status = agents_get_status ($data["id_agent"], true); case AGENT_STATUS_CRITICAL:
} $status = VISUAL_MAP_STATUS_CRITICAL_BAD;
if ($status == VISUAL_MAP_STATUS_CRITICAL_BAD) break;
return VISUAL_MAP_STATUS_CRITICAL_BAD; case AGENT_STATUS_WARNING:
if ($status > $temp_total) $status = VISUAL_MAP_STATUS_WARNING;
$temp_total = $status; break;
case AGENT_STATUS_UNKNOWN:
$status = VISUAL_MAP_STATUS_UNKNOWN;
break;
case AGENT_STATUS_NORMAL:
default:
$status = VISUAL_MAP_STATUS_NORMAL;
break;
}
}
// Other Layout (Recursive!)
if (($data["id_layout_linked"] != 0) && ($data["id_agente_modulo"] == 0)) {
$status = visual_map_get_layout_status ($data["id_layout_linked"], $depth);
}
// Module
elseif ($data["id_agente_modulo"] != 0) {
$status = modules_get_agentmodule_status ($data["id_agente_modulo"]);
}
// Agent
elseif ($data["type"]!=11) {
//--------------------------------------------------
// ADDED NO CHECK ACL FOR AVOID CHECK TAGS THAT
// MAKE VERY SLOW THE VISUALMAPS WITH ACL TAGS
//--------------------------------------------------
$status = agents_get_status ($data["id_agent"], true);
}
if ($status == VISUAL_MAP_STATUS_CRITICAL_BAD)
return VISUAL_MAP_STATUS_CRITICAL_BAD;
if ($status > $temp_total)
$temp_total = $status;
} }
return $temp_total; return $temp_total;