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

Merge branch '2827-Mensaje-de-alerta-disparada' into 'develop' 

Added number of times an alert is fired - #2827

See merge request artica/pandorafms!1823
This commit is contained in:
vgilc 2018-10-29 09:15:32 +01:00
parent 696abbdead 2dd10a4328
commit 08a8165b93
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/extensions/agents_alerts.php
View File

@ -472,7 +472,7 @@ function print_alerts_summary_modal_window($id, $alerts) {
if ($alert["times_fired"] > 0) { if ($alert["times_fired"] > 0) {
$status = STATUS_ALERT_FIRED; $status = STATUS_ALERT_FIRED;
$title = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); $title = __('Alert fired').' '.$alert["internal_counter"].' '.__('time(s)');
} }
elseif ($alert["disabled"] > 0) { elseif ($alert["disabled"] > 0) {
$status = STATUS_ALERT_DISABLED; $status = STATUS_ALERT_DISABLED;

2
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -645,7 +645,7 @@ foreach ($simple_alerts as $alert) {
if ($alert["times_fired"] > 0) { if ($alert["times_fired"] > 0) {
$status = STATUS_ALERT_FIRED; $status = STATUS_ALERT_FIRED;
$title = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); $title = __('Alert fired').' '.$alert["internal_counter"].' '.__('time(s)');
} }
elseif ($alert["disabled"] > 0) { elseif ($alert["disabled"] > 0) {
$status = STATUS_ALERT_DISABLED; $status = STATUS_ALERT_DISABLED;

2
pandora_console/godmode/alerts/alert_view.php
View File

@ -82,7 +82,7 @@ $table_details->data[] = $data;
if ($alert["times_fired"] > 0) { if ($alert["times_fired"] > 0) {
$status = STATUS_ALERT_FIRED; $status = STATUS_ALERT_FIRED;
$title = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); $title = __('Alert fired').' '.$alert["internal_counter"].' '.__('time(s)');
} }
elseif ($alert["disabled"] > 0) { elseif ($alert["disabled"] > 0) {
$status = STATUS_ALERT_DISABLED; $status = STATUS_ALERT_DISABLED;

2
pandora_console/include/functions_ui.php
View File

@ -979,7 +979,7 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
if ($alert["times_fired"] > 0) { if ($alert["times_fired"] > 0) {
$status = STATUS_ALERT_FIRED; $status = STATUS_ALERT_FIRED;
$title = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); $title = __('Alert fired').' '.$alert["internal_counter"].' '.__('time(s)');
} }
elseif ($alert["disabled"] > 0) { elseif ($alert["disabled"] > 0) {
$status = STATUS_ALERT_DISABLED; $status = STATUS_ALERT_DISABLED;

2
pandora_console/mobile/operation/alerts.php
View File

@ -250,7 +250,7 @@ class Alerts {
if ($alert["times_fired"] > 0) { if ($alert["times_fired"] > 0) {
$status = STATUS_ALERT_FIRED; $status = STATUS_ALERT_FIRED;
$title = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); $title = __('Alert fired').' '.$alert["internal_counter"].' '.__('time(s)');
} }
elseif ($alert["disabled"] > 0) { elseif ($alert["disabled"] > 0) {
$status = STATUS_ALERT_DISABLED; $status = STATUS_ALERT_DISABLED;