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

2009-09-02 Ramon Novoa <rnovoa@artica.es> 

* include/help/en/help_alert_macros.php,
          include/help/es/help_alert_macros.php: Added to repository. Alert
          macro help files.

        * godmode/alerts/configure_alert_template.php: Show alert macro help.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1908 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2009-09-02 15:53:05 +00:00
parent 5f408629bd
commit 3d9e3389c1
4 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2009-09-02 Ramon Novoa <rnovoa@artica.es>
* include/help/en/help_alert_macros.php,
include/help/es/help_alert_macros.php: Added to repository. Alert
macro help files.
* godmode/alerts/configure_alert_template.php: Show alert macro help.
2009-09-01 Sancho Lerena <slerena@artica.es> 2009-09-01 Sancho Lerena <slerena@artica.es>
* pandoradb_data.sql: Updated version, added two new module groups and * pandoradb_data.sql: Updated version, added two new module groups and

8
pandora_console/godmode/alerts/configure_alert_template.php
View File

@ -1,4 +1,4 @@
<?php 1<?php
// Pandora FMS - http://pandorafms.com // Pandora FMS - http://pandorafms.com
// ================================================== // ==================================================
@ -364,13 +364,13 @@ if ($step == 2) {
$table->data[3][3] = print_input_text ('max_alerts', $max_alerts, '', $table->data[3][3] = print_input_text ('max_alerts', $max_alerts, '',
5, 7, true); 5, 7, true);
$table->data['field1'][0] = __('Field 1'); $table->data['field1'][0] = __('Field 1') . print_help_icon ('alert_macros', true);
$table->data['field1'][1] = print_input_text ('field1', $field1, '', 35, 255, true); $table->data['field1'][1] = print_input_text ('field1', $field1, '', 35, 255, true);
$table->data['field2'][0] = __('Field 2'); $table->data['field2'][0] = __('Field 2') . print_help_icon ('alert_macros', true);
$table->data['field2'][1] = print_input_text ('field2', $field2, '', 35, 255, true); $table->data['field2'][1] = print_input_text ('field2', $field2, '', 35, 255, true);
$table->data['field3'][0] = __('Field 3'); $table->data['field3'][0] = __('Field 3') . print_help_icon ('alert_macros', true);
$table->data['field3'][1] = print_textarea ('field3', 10, 30, $field3, '', true); $table->data['field3'][1] = print_textarea ('field3', 10, 30, $field3, '', true);
$table->data[4][0] = __('Default action'); $table->data[4][0] = __('Default action');

25
pandora_console/include/help/en/help_alert_macros.php Normal file
View File

@ -0,0 +1,25 @@
<?php
/**
* @package Include/help/en
*/
?>
<h1>Alert macros</h1>
<p>
The following macros are available:
<ul>
<li>_field1_: User defined field 1.</li>
<li>_field2_: User defined field 2.</li>
<li>_field3_: User defined field 3.</li>
<li>_agent_: Name of the agent that fired the alert.</li>
<li>_address_: Address of the agent that fired the alert.</li>
<li>_timestamp_: Time when the alert was fired.</li>
<li>_data_: Module data that caused 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>
</ul>
<p>
</p>
Example: Agent _agent_ error: _alert_description_.
</p>

25
pandora_console/include/help/es/help_alert_macros.php Normal file
View File

@ -0,0 +1,25 @@
<?php
/**
* @package Include/help/en
*/
?>
<h1>Macros de alertas</h1>
<p>
Las siguientes macros están disponibles:
<ul>
<li>_field1_: Campo 1 definido por el usuario.</li>
<li>_field2_: Campo 2 definido por el usuario.</li>
<li>_field3_: Campo 3 definido por el usuario.</li>
<li>_agent_: Nombre del agente que disparó la alerta.</li>
<li>_address_: Dirección del agente que disparó la alerta.</li>
<li>_timestamp_: Hora y fecha en que se disparó la alerta.</li>
<li>_data_: Dato que hizo que la alerta se disparase.</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>
</ul>
<p>
</p>
Ejemplo: Error en el agente _agent_: _alert_description_.
</p>