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

add new macro in alerts

This commit is contained in:
daniel 2017-02-02 16:11:46 +01:00
parent af276ab7ac
commit a6fadecd47
5 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/include/help/en/help_alert_config.php
View File

@ -35,6 +35,7 @@ Apart from the defined module macros, the following macros are also available:
<li>_timestamp_ : Time when the alert was fired (yy-mm-dd hh:mm:ss).</li>
<li>_timezone_ : Timezone name that _timestamp_ represents in.</li>
<li>_data_ : Module data that caused the alert to fire.</li>
<li>_prevdata_ : Module data previus the alert to fire.</li>
<li>_alert_description_ : Alert description.</li>
<li>_alert_threshold_ : Alert threshold.</li>
<li>_alert_times_fired_ : Number of times the alert has been fired.</li>

1
pandora_console/include/help/en/help_alert_macros.php
View File

@ -29,6 +29,7 @@ Besides the defined module macros, the following macros are available:
<li>_timestamp_: Time and date on which the alert was triggered (yy-mm-dd hh:mm:ss).</li>
<li>_timezone_: Timezone that is represented on _timestamp_.</li>
<li>_data_: Module data that caused the alert to fire.</li>
<li>_prevdata_ : Module data previus the alert to fire.</li>
<li>_alert_description_: Alert description.</li>
<li>_alert_threshold_: Alert threshold.</li>
<li>_alert_times_fired_: Number of times the alert has been triggered.</li>

1
pandora_console/include/help/es/help_alert_config.php
View File

@ -37,6 +37,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
<li>_timestamp_: Hora y fecha en que se disparó la alerta.</li>
<li>_timezone_: Area Nombre _timestamp_ que representa en.</li>
<li>_data_: Dato que hizo que la alerta se disparase.</li>
<li>_prevdata_: Dato previo antes de disparase la alerta.</li>
<li>_alert_description_: Descripción de la alerta.</li>
<li>_alert_threshold_: Umbral de la alerta.</li>
<li>_alert_times_fired_: Número de veces que se ha disparado la alerta.</li>

1
pandora_console/include/help/es/help_alert_macros.php
View File

@ -29,6 +29,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
<li>_timestamp_: Hora y fecha en que se disparó la alerta.</li>
<li>_timezone_: Area Nombre _timestamp_ que representa en.</li>
<li>_data_: Dato que hizo que la alerta se disparase.</li>
<li>_prevdata_: Dato previo antes de disparase la alerta.</li>
<li>_alert_description_: Descripción de la alerta.</li>
<li>_alert_threshold_: Umbral de la alerta.</li>
<li>_alert_times_fired_: Número de veces que se ha disparado la alerta.</li>

7
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -936,6 +936,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
_timestamp_ => (defined($timestamp)) ? $timestamp : strftime ("%Y-%m-%d %H:%M:%S", localtime()),
_timezone_ => strftime ("%Z", localtime()),
_data_ => $data,
_prevdata_ => undef,
_alert_name_ => $alert->{'name'},
_alert_description_ => $alert->{'description'},
_alert_threshold_ => $alert->{'time_threshold'},
@ -3529,8 +3530,10 @@ sub on_demand_macro($$$$$$) {
return '' unless defined ($agent);
my $field_number = $1;
my $field_value = get_db_value($dbh, 'SELECT description FROM tagent_custom_data WHERE id_field=? AND id_agent=?', $field_number, $agent->{'id_agente'});
return (defined($field_value)) ? $field_value : '';
return (defined($field_value)) ? $field_value : '';
} elsif ($macro eq '_prevdata_') {
return '' unless defined ($module);
my $field_value = get_db_value($dbh, 'SELECT datos FROM tagente_datos where id_agente_modulo = ? order by utimestamp desc limit 1 offset 1', $module->{'id_agente_modulo'});
}
}