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

Merge branch 'ent-8263-Fallo-interpretacion-grupos-en-Consola-Visual' into 'develop' 

Ent 8263 fallo interpretacion grupos en consola visual

See merge request artica/pandorafms!4550
This commit is contained in:
Daniel Rodriguez 2022-01-11 15:39:43 +00:00
parent db4d9928b4 f5e165f253
commit cd073ef4e3
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/include/functions_groups.php
View File

@ -609,24 +609,15 @@ function groups_get_groups_tree_recursive($groups, $trash=0, $trash2=0)
*
* @return integer Status of the agents.
*/
function groups_get_status($id_group=0, $strict_user=false)
function groups_get_status($id_group=0, $ignore_alerts=false)
{
global $config;
include_once $config['homedir'].'/include/functions_reporting.php';
if ($strict_user) {
$acltags = tags_get_user_groups_and_tags($config['id_user'], 'AR', $strict_user);
$group_status = group_get_data($config['id_user'], $strict_user, $acltags, false, 'group');
$data['monitor_alerts_fired'] = $groups_status['_monitors_alerts_fired_'];
$data['agent_critical'] = $groups_status['_agents_critical_'];
$data['agent_warning'] = $groups_status['_agents_warning_'];
$data['agent_unknown'] = $groups_status['_agents_unknown_'];
} else {
$data = reporting_get_group_stats_resume($id_group);
}
$data = reporting_get_group_stats_resume($id_group);
if ($data['monitor_alerts_fired'] > 0) {
if ($data['monitor_alerts_fired'] > 0 && $ignore_alerts == false) {
return AGENT_STATUS_ALERT_FIRED;
} else if ($data['agent_critical'] > 0) {
return AGENT_STATUS_CRITICAL;

2
pandora_console/include/functions_visual_map.php
View File

@ -3420,7 +3420,7 @@ function visual_map_get_status_element($layoutData)
break;
case GROUP_ITEM:
$group_status = groups_get_status($layoutData['id_group']);
$group_status = groups_get_status($layoutData['id_group'], true);
switch ($group_status) {
case AGENT_STATUS_ALERT_FIRED:

6
pandora_console/include/rest-api/models/VisualConsole/Items/Group.php
View File

@ -346,9 +346,7 @@ final class Group extends Item
$countStatus = \db_get_row_sql($sql);
if ($countStatus['fired'] > 0) {
$status = AGENT_STATUS_ALERT_FIRED;
} else if ($countStatus['critical'] > 0) {
if ($countStatus['critical'] > 0) {
$status = AGENT_STATUS_CRITICAL;
} else if ($countStatus['warning'] > 0) {
$status = AGENT_STATUS_WARNING;
@ -359,7 +357,7 @@ final class Group extends Item
}
} else {
// Get the status img src.
$status = \groups_get_status($groupId);
$status = \groups_get_status($groupId, true);
}
$imagePath = \visual_map_get_image_status_element($data, $status);