diff --git a/pandora_console/include/functions_groupview.php b/pandora_console/include/functions_groupview.php index 286c24b689..a87bea1650 100644 --- a/pandora_console/include/functions_groupview.php +++ b/pandora_console/include/functions_groupview.php @@ -86,7 +86,8 @@ function groupview_get_modules_counters($groups_ids=false) WHERE tasg.id_group IN ($groups_ids) GROUP BY tasg.id_group ) x GROUP BY g"; - return db_get_all_rows_sql($sql); + $data = db_get_all_rows_sql($sql); + return $data; } diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 5217ba2b15..ab1e64cfcf 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -11537,7 +11537,7 @@ function reporting_get_group_stats_resume($id_group=0, $access='AR', $ignore_per $data['status'] = 'critical'; } else if ($data['monitor_warning'] > 0) { $data['status'] = 'warning'; - } else if (($data['monitor_unknown'] > 0) || ($data['agents_unknown'] > 0)) { + } else if (($data['monitor_unknown'] > 0) || ($data['agent_unknown'] > 0)) { $data['status'] = 'unknown'; } else if ($data['monitor_ok'] > 0) { $data['status'] = 'ok'; diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 0ff126ed8a..fbe1289537 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -3788,6 +3788,7 @@ function visual_map_get_user_layouts( unset($filter['can_manage_group_all']); } + $where = ''; if ($check_user_groups === true && !empty($groups)) { if (empty($where)) { $where = ''; @@ -4080,7 +4081,7 @@ function visual_map_get_layout_status($layout_id, $status_data=[], $depth=0) // When the status calculation type is 'default', only one critical // element is required to set the layout status as critical, so we can // return the critical status right now. - if ($status_data['linked_layout_status_type'] === 'default' + if ((isset($status_data['linked_layout_status_type']) === true && $status_data['linked_layout_status_type'] === 'default') && ($status == VISUAL_MAP_STATUS_CRITICAL_BAD || $status == VISUAL_MAP_STATUS_CRITICAL_ALERT) ) { @@ -4104,71 +4105,73 @@ function visual_map_get_layout_status($layout_id, $status_data=[], $depth=0) metaconsole_restore_db(); } - // Status calculation. - switch ($status_data['linked_layout_status_type']) { - default: - case 'default': - $num_items_critical_alert = $num_elements_by_status[VISUAL_MAP_STATUS_CRITICAL_ALERT]; - $num_items_critical = $num_elements_by_status[VISUAL_MAP_STATUS_CRITICAL_BAD]; - $num_items_warning_alert = $num_elements_by_status[VISUAL_MAP_STATUS_WARNING_ALERT]; - $num_items_warning = $num_elements_by_status[VISUAL_MAP_STATUS_WARNING]; - $num_items_unknown = $num_elements_by_status[VISUAL_MAP_STATUS_UNKNOWN]; + if (isset($status_data['linked_layout_status_type']) === true) { + // Status calculation. + switch ($status_data['linked_layout_status_type']) { + default: + case 'default': + $num_items_critical_alert = $num_elements_by_status[VISUAL_MAP_STATUS_CRITICAL_ALERT]; + $num_items_critical = $num_elements_by_status[VISUAL_MAP_STATUS_CRITICAL_BAD]; + $num_items_warning_alert = $num_elements_by_status[VISUAL_MAP_STATUS_WARNING_ALERT]; + $num_items_warning = $num_elements_by_status[VISUAL_MAP_STATUS_WARNING]; + $num_items_unknown = $num_elements_by_status[VISUAL_MAP_STATUS_UNKNOWN]; - if ($num_items_critical_alert > 0) { - return VISUAL_MAP_STATUS_CRITICAL_ALERT; - } else if ($num_items_critical > 0) { - return VISUAL_MAP_STATUS_CRITICAL_BAD; - } else if ($num_items_warning_alert > 0) { - return VISUAL_MAP_STATUS_WARNING_ALERT; - } else if ($num_items_warning > 0) { - return VISUAL_MAP_STATUS_WARNING; - } else if ($num_items_unknown > 0) { - return VISUAL_MAP_STATUS_UNKNOWN; - } else { - return VISUAL_MAP_STATUS_NORMAL; - } - break; - case 'weight': - $weight = $status_data['id_layout_linked_weight']; - $num_items = count($valid_layout_items); - $num_items_critical_alert = $num_elements_by_status[VISUAL_MAP_STATUS_CRITICAL_ALERT]; - $num_items_critical = $num_elements_by_status[VISUAL_MAP_STATUS_CRITICAL_BAD]; - $num_items_warning_alert = $num_elements_by_status[VISUAL_MAP_STATUS_WARNING_ALERT]; - $num_items_warning = $num_elements_by_status[VISUAL_MAP_STATUS_WARNING]; - $num_items_unknown = $num_elements_by_status[VISUAL_MAP_STATUS_UNKNOWN]; + if ($num_items_critical_alert > 0) { + return VISUAL_MAP_STATUS_CRITICAL_ALERT; + } else if ($num_items_critical > 0) { + return VISUAL_MAP_STATUS_CRITICAL_BAD; + } else if ($num_items_warning_alert > 0) { + return VISUAL_MAP_STATUS_WARNING_ALERT; + } else if ($num_items_warning > 0) { + return VISUAL_MAP_STATUS_WARNING; + } else if ($num_items_unknown > 0) { + return VISUAL_MAP_STATUS_UNKNOWN; + } else { + return VISUAL_MAP_STATUS_NORMAL; + } + break; + case 'weight': + $weight = $status_data['id_layout_linked_weight']; + $num_items = count($valid_layout_items); + $num_items_critical_alert = $num_elements_by_status[VISUAL_MAP_STATUS_CRITICAL_ALERT]; + $num_items_critical = $num_elements_by_status[VISUAL_MAP_STATUS_CRITICAL_BAD]; + $num_items_warning_alert = $num_elements_by_status[VISUAL_MAP_STATUS_WARNING_ALERT]; + $num_items_warning = $num_elements_by_status[VISUAL_MAP_STATUS_WARNING]; + $num_items_unknown = $num_elements_by_status[VISUAL_MAP_STATUS_UNKNOWN]; - if (($num_items_critical > 0 || $num_items_critical_alert > 0) - && ((($num_items_critical_alert + $num_items_critical) * 100) / $num_items) >= $weight - ) { - return ($num_items_critical_alert > 0) ? VISUAL_MAP_STATUS_CRITICAL_ALERT : VISUAL_MAP_STATUS_CRITICAL_BAD; - } else if (($num_items_warning > 0 || $num_items_warning_alert > 0) - && (($num_items_warning_alert + $num_items_warning * 100) / $num_items) >= $weight - ) { - return ($num_items_warning_alert > 0) ? VISUAL_MAP_STATUS_WARNING_ALERT : VISUAL_MAP_STATUS_WARNING; - } else if ($num_items_unknown > 0 - && (($num_items_unknown * 100) / $num_items) >= $weight - ) { - return VISUAL_MAP_STATUS_UNKNOWN; - } else { - return VISUAL_MAP_STATUS_NORMAL; - } - break; + if (($num_items_critical > 0 || $num_items_critical_alert > 0) + && ((($num_items_critical_alert + $num_items_critical) * 100) / $num_items) >= $weight + ) { + return ($num_items_critical_alert > 0) ? VISUAL_MAP_STATUS_CRITICAL_ALERT : VISUAL_MAP_STATUS_CRITICAL_BAD; + } else if (($num_items_warning > 0 || $num_items_warning_alert > 0) + && (($num_items_warning_alert + $num_items_warning * 100) / $num_items) >= $weight + ) { + return ($num_items_warning_alert > 0) ? VISUAL_MAP_STATUS_WARNING_ALERT : VISUAL_MAP_STATUS_WARNING; + } else if ($num_items_unknown > 0 + && (($num_items_unknown * 100) / $num_items) >= $weight + ) { + return VISUAL_MAP_STATUS_UNKNOWN; + } else { + return VISUAL_MAP_STATUS_NORMAL; + } + break; - case 'service': - $num_items_critical = ($num_elements_by_status[VISUAL_MAP_STATUS_CRITICAL_BAD] + $num_elements_by_status[VISUAL_MAP_STATUS_CRITICAL_ALERT]); - $critical_percentage = (($num_items_critical * 100) / count($valid_layout_items)); + case 'service': + $num_items_critical = ($num_elements_by_status[VISUAL_MAP_STATUS_CRITICAL_BAD] + $num_elements_by_status[VISUAL_MAP_STATUS_CRITICAL_ALERT]); + $critical_percentage = (($num_items_critical * 100) / count($valid_layout_items)); - $num_items_warning = ($num_elements_by_status[VISUAL_MAP_STATUS_WARNING] + $num_elements_by_status[VISUAL_MAP_STATUS_WARNING_ALERT]); - $warning_percentage = (($num_items_warning * 100) / count($valid_layout_items)); + $num_items_warning = ($num_elements_by_status[VISUAL_MAP_STATUS_WARNING] + $num_elements_by_status[VISUAL_MAP_STATUS_WARNING_ALERT]); + $warning_percentage = (($num_items_warning * 100) / count($valid_layout_items)); - if ($critical_percentage >= $status_data['linked_layout_status_as_service_critical'] && $critical_percentage !== 0) { - return VISUAL_MAP_STATUS_CRITICAL_BAD; - } else if ($warning_percentage >= $status_data['linked_layout_status_as_service_warning'] && $warning_percentage !== 0) { - return VISUAL_MAP_STATUS_WARNING; - } else { - return VISUAL_MAP_STATUS_NORMAL; - } - break; + if ($critical_percentage >= $status_data['linked_layout_status_as_service_critical'] && $critical_percentage !== 0) { + return VISUAL_MAP_STATUS_CRITICAL_BAD; + } else if ($warning_percentage >= $status_data['linked_layout_status_as_service_warning'] && $warning_percentage !== 0) { + return VISUAL_MAP_STATUS_WARNING; + } else { + return VISUAL_MAP_STATUS_NORMAL; + } + break; + } } } diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php index 8c4a1b6ade..e48babd58d 100644 --- a/pandora_console/include/graphs/functions_d3.php +++ b/pandora_console/include/graphs/functions_d3.php @@ -526,8 +526,7 @@ function print_clock_analogic_1( $color, $title=true ) { - global $config; - $output .= '