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

Merge branch '1920_Informe_de_alertas' into 'develop' 

Fixed alert report date

See merge request artica/pandorafms!1715
This commit is contained in:
vgilc 2018-08-28 10:30:23 +02:00
parent fc820a8eaa 9915518b8e
commit 7a6c3c16ec
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/include/functions_reporting.php
View File

@ -2869,7 +2869,7 @@ function reporting_alert_get_fired($id_agent_module, $id_alert_template_module,
if (empty($firedTimes)) { if (empty($firedTimes)) {
$firedTimes = array(); $firedTimes = array();
$firedTimes[0]['timestamp'] = '----------------------------'; $firedTimes[0]['timestamp'] = null;
} }
foreach ($firedTimes as $fireTime) { foreach ($firedTimes as $fireTime) {
@ -3010,7 +3010,10 @@ function reporting_alert_report_group($report, $content) {
(int) $report["datetime"]); (int) $report["datetime"]);
$module_actions["actions"] = $data_action; $module_actions["actions"] = $data_action;
if ($module_actions["template_fired"][0] !== null)
$data_row['alerts'][$ntemplates] = $module_actions; $data_row['alerts'][$ntemplates] = $module_actions;
else
$data_row = null;
$ntemplates++; $ntemplates++;
} }
@ -3127,7 +3130,10 @@ function reporting_alert_report_agent($report, $content) {
(int) $report["datetime"]); (int) $report["datetime"]);
$module_actions["actions"] = $data_action; $module_actions["actions"] = $data_action;
if ($module_actions["template_fired"][0] !== null)
$data_row['alerts'][$ntemplates] = $module_actions; $data_row['alerts'][$ntemplates] = $module_actions;
else
$data_row = null;
$ntemplates++; $ntemplates++;
} }
@ -3248,7 +3254,10 @@ function reporting_alert_report_module($report, $content) {
(int) $report["datetime"]); (int) $report["datetime"]);
$module_actions["actions"] = $data_action; $module_actions["actions"] = $data_action;
if ($module_actions["template_fired"][0] !== null)
$data_row['alerts'][$ntemplates] = $module_actions; $data_row['alerts'][$ntemplates] = $module_actions;
else
$data_row = null;
$ntemplates++; $ntemplates++;
} }