From 08959d32004e46b274806029248d1a437262c728 Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Thu, 12 Nov 2009 19:47:08 +0000
Subject: [PATCH] 2009-11-12  Sancho lerena <slerena@artica.es>

        * include/help/en/help_web_checks.php: Added missing help.

        * include/help/en/help_alert_macros.php: Added missing macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2106 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  6 ++++
 .../include/help/en/help_alert_macros.php     |  6 ++++
 .../include/help/en/help_web_checks.php       | 35 +++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 pandora_console/include/help/en/help_web_checks.php

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index d92a9f59d8..5aa804a095 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-12  Sancho lerena <slerena@artica.es>
+
+	* include/help/en/help_web_checks.php: Added missing help.
+
+	* include/help/en/help_alert_macros.php: Added missing macros.
+
 2009-11-11  Miguel de Dios <miguel.dedios@artica.es>
 
 	* include/functions_reporting.php: fix the debug trace I forget in source
diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php
index e64e47ff1d..120f943264 100644
--- a/pandora_console/include/help/en/help_alert_macros.php
+++ b/pandora_console/include/help/en/help_alert_macros.php
@@ -12,6 +12,8 @@ The following macros are available:
 <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>_agentdescription_ : Description of the agent who fired alert</li>
+<li>_agentgroup_ : Agent group name </li>
 <li>_address_ : Address of the agent that fired the alert.</li>
 <li>_timestamp_ : Time when the alert was fired (yy-mm-dd hh:mm:ss).</li>
 <li>_data_ : Module data that caused the alert to fire.</li>
@@ -19,9 +21,13 @@ The following macros are available:
 <li>_alert_threshold_ : Alert threshold.</li>
 <li>_alert_times_fired_ : Number of times the alert has been fired.</li>
 <li>_module_ : Module name</li>
+<li>_moduledescription_ : Description of the module who fired the alert </li>
 <li>_alert_name_ : Alert name </li>
 <li>_alert_priority_ : Numerical alert priorityu </li>
 <li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.
+<li>_id_alert_ : Numerical ID of the alert (unique), used to correlate on third party software</li>
+
+
 </ul>
 <p>
 </p>
diff --git a/pandora_console/include/help/en/help_web_checks.php b/pandora_console/include/help/en/help_web_checks.php
new file mode 100644
index 0000000000..2eae42d440
--- /dev/null
+++ b/pandora_console/include/help/en/help_web_checks.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package Include/help/en
+ */
+?>
+<h1>WEB Monitoring</h1>
+
+<p>
+Advanced WEB Monitoring is a feature done by the Goliat/WEB Server in Pandora FMS Enterprise version.
+<br><br>
+This is a sample of GOLIAT Webcheck module:
+<br>
+<pre>
+
+
+task_begin
+post http://galaga.artica.es/pandora/index.php?login=1
+variable_name nick
+variable_value demo
+variable_name pass
+variable_value demo
+cookie 1
+resource 1
+task_end
+
+task_begin
+get http://galaga.artica.es/pandora/index.php?sec=messages&sec2=operation/messages/message
+cookie 1
+resource 1
+check_string Read messages
+task_end
+
+
+</pre>
+</p>