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-7558-Informe-group-event-report-no-saca-datos' into 'develop' 

Fixed issue with group events in reports

Closes pandora_enterprise#7558

See merge request artica/pandorafms!4144
This commit is contained in:
Daniel Rodriguez 2021-05-21 12:10:04 +00:00
parent 85565ef7f9 11d1b785b2
commit 5fbfacd718
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_events.php
View File

@ -3152,10 +3152,6 @@ function events_get_agent(
}
}
if (is_metaconsole() === true && empty($id_server) === false) {
$sql_where .= ' AND server_id = '.$id_server;
}
if ($show_summary_group) {
return events_get_events_grouped(
$sql_where,
@ -3169,7 +3165,7 @@ function events_get_agent(
} else {
return events_get_events_no_grouped(
$sql_where,
(is_metaconsole() === true && empty($id_server) === false) ? true : false,
(is_metaconsole() === true && (int) $id_server === 0) ? true : false,
$history
);
}

44
pandora_console/include/functions_reporting.php
View File

@ -1837,6 +1837,7 @@ function reporting_event_report_group(
$content['name'] = __('Event Report Group');
}
$id_meta = 0;
if (is_metaconsole() === true && empty($content['server_name']) === false) {
$id_meta = metaconsole_get_id_server($content['server_name']);
$server = metaconsole_get_connection_by_id($id_meta);
@ -1928,7 +1929,7 @@ function reporting_event_report_group(
true,
false,
false,
false,
$id_meta,
$filter_event_filter_exclude
);
@ -2176,10 +2177,6 @@ function reporting_event_report_module(
);
}
if (is_metaconsole()) {
metaconsole_restore_db();
}
$return['description'] = $content['description'];
$return['show_extended_events'] = $content['show_extended_events'];
$return['date'] = reporting_get_date_text($report, $content);
@ -2241,7 +2238,7 @@ function reporting_event_report_module(
$return['data'] = array_reverse($data);
}
if ($config['metaconsole']) {
if (is_metaconsole() === true) {
metaconsole_restore_db();
}
@ -3242,10 +3239,6 @@ function reporting_event_report_agent(
);
}
if ($config['metaconsole']) {
metaconsole_restore_db();
}
$label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
if ($label != '') {
$label = reporting_label_macro(
@ -3292,9 +3285,14 @@ function reporting_event_report_agent(
$filter_event_type,
$filter_event_status,
$filter_event_filter_search,
$filter_event_filter_exclude
$filter_event_filter_exclude,
$id_server
);
if (is_metaconsole() === true) {
metaconsole_restore_db();
}
reporting_set_conf_charts(
$width,
$height,
@ -9580,12 +9578,21 @@ function reporting_get_module_detailed_event(
* It construct a table object with all the grouped events happened in an agent
* during a period of time.
*
* @param mixed Agent id(s) to get the report from.
* @param int Period of time (in seconds) to get the report.
* @param int Beginning date (unixtime) of the report
* @param bool Flag to return or echo the report table (echo by default).
* @param mixed $id_agents Agent id(s) to get the report from.
* @param integer $period Period of time (in seconds) to get the report.
* @param integer $date Beginning date (unixtime) of the report.
* @param boolean $return Flag to return or echo the report table (echo by default).
* @param boolean $only_data Only data.
* @param boolean $history History.
* @param boolean $show_summary_group Show summary group.
* @param boolean $filter_event_severity Filter.
* @param boolean $filter_event_type Filter.
* @param boolean $filter_event_status Filter.
* @param boolean $filter_event_filter_search Filter.
* @param boolean $filter_event_filter_exclude Filter.
* @param integer $id_server Id server.
*
* @return A table object (XHTML)
* @return array table object (XHTML)
*/
function reporting_get_agents_detailed_event(
$id_agents,
@ -9599,7 +9606,8 @@ function reporting_get_agents_detailed_event(
$filter_event_type=false,
$filter_event_status=false,
$filter_event_filter_search=false,
$filter_event_filter_exclude=false
$filter_event_filter_exclude=false,
$id_server=0
) {
global $config;
@ -9634,7 +9642,7 @@ function reporting_get_agents_detailed_event(
false,
false,
false,
false,
$id_server,
$filter_event_filter_exclude
);