From b5847fc36441b1455243e7187c7c65a6916c62ca Mon Sep 17 00:00:00 2001 From: zarzuelo <noreply@pandorafms.org> Date: Thu, 10 May 2012 08:45:55 +0000 Subject: [PATCH] 2012-05-10 Sergio Martin <sergio.martin@artica.es> * include/help/en/help_alert_macros.php include/help/es/help_alert_macros.php: Added to help two new macros git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6279 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/include/help/en/help_alert_macros.php | 4 +++- pandora_console/include/help/es/help_alert_macros.php | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e61e0d9a69..f5a4e60f58 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2012-05-10 Sergio Martin <sergio.martin@artica.es> + + * include/help/en/help_alert_macros.php + include/help/es/help_alert_macros.php: Added to help two new + macros + 2012-05-09 Sergio Martin <sergio.martin@artica.es> * include/functions_agents.php: Merged from 4.0 the extra_sql diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php index a540400629..1a5b8246e0 100644 --- a/pandora_console/include/help/en/help_alert_macros.php +++ b/pandora_console/include/help/en/help_alert_macros.php @@ -24,7 +24,9 @@ The following macros are available: <li>_modulegroup_ : Module group name.</li> <li>_moduledescription_ : Description of the module who fired the alert </li> <li>_alert_name_ : Alert name </li> -<li>_alert_priority_ : Numerical alert priority </li> +<li>_alert_priority_ : Numerical alert priority</li> +<li>_alert_text_severity_ : Text alert severity (Maintenance, Informational, Normal Minor, Warning, Major, Critical)</li> +<li>_event_text_severity_ : (Only event alerts) Text event (who fire the alert) severity (Maintenance, Informational, Normal Minor, Warning, Major, Critical)</li> <li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.</li> <li>_id_alert_ : Numerical ID of the alert (unique), used to correlate on third party software</li> <li>_policy_ : Name of the policy the module belongs to (if applies).</li> diff --git a/pandora_console/include/help/es/help_alert_macros.php b/pandora_console/include/help/es/help_alert_macros.php index 4943aab143..01c42a2169 100644 --- a/pandora_console/include/help/es/help_alert_macros.php +++ b/pandora_console/include/help/es/help_alert_macros.php @@ -24,6 +24,8 @@ Las siguientes macros están disponibles: <li>_moduledescription_: Descripcion del modulo.</li> <li>_alert_name_: Nombre de la alerta.</li> <li>_alert_priority_: Prioridad numérica de la alerta.</li> +<li>_alert_text_severity_: Prioridad en texto de la alerta. (Maintenance, Informational, Normal Minor, Warning, Major, Critical)</li> +<li>_alert_text_severity_: (Solo alertas de evento) Prioridad en texto de el evento que dispara la alerta. (Maintenance, Informational, Normal Minor, Warning, Major, Critical)</li> <li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de Pandora.</li> <li>_id_alert_: ID de la alerta, util para correlar la alerta en herramientas de terceros.</li> <li>_policy_: Nombre de la política a la que pertenece el módulo (si aplica).</li>