diff --git a/pandora_console/include/help/en/help_alert_config.php b/pandora_console/include/help/en/help_alert_config.php
index fec2f835f3..bedc89c335 100644
--- a/pandora_console/include/help/en/help_alert_config.php
+++ b/pandora_console/include/help/en/help_alert_config.php
@@ -50,6 +50,7 @@ Besides the defined module macros, the following macros are available:
 <li>_event_text_severity_ : (Only event alerts) Text event (who fire the alert) severity (Maintenance, Informational, Normal Minor, Warning, Major, Critical).</li>
 <li>_event_id_ : (Only event alerts) Id of the event that fired the alert.</li>
 <li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.</li>
+<li>_id_group_ : Id of agent group.</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>
 <li>_interval_ : Execution interval of the module. </li>
diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php
index 93460ad554..d8ce3f4fe5 100644
--- a/pandora_console/include/help/en/help_alert_macros.php
+++ b/pandora_console/include/help/en/help_alert_macros.php
@@ -43,6 +43,7 @@ Besides the defined module macros, the following macros are available:
 <li>_event_text_severity_: (Only event alerts) Text event (who fire the alert) severity (Maintenance, Informational, Normal Minor, Warning, Major, Critical).</li>
 <li>_event_id_: (Only event alerts) Id of the event that fired the alert.</li>
 <li>_id_agent_: Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.</li>
+<li>_id_group_ : Id of agent group.</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>
 <li>_interval_: Execution interval of the module </li>
diff --git a/pandora_console/include/help/en/help_plugin_macros.php b/pandora_console/include/help/en/help_plugin_macros.php
index eec73e948c..3772c97ca5 100644
--- a/pandora_console/include/help/en/help_plugin_macros.php
+++ b/pandora_console/include/help/en/help_plugin_macros.php
@@ -18,6 +18,7 @@ The following macros are available:
 <li>_moduledescription_ : Description of the module.</li>
 <li>_modulestatus_ : Status of the module.</li>
 <li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.</li>
+<li>_id_group_ : Id of agent group.</li>
 <li>_policy_ : Name of the policy the module belongs to (if applies).</li>
 <li>_interval_ : Execution interval of the module. </li>
 
diff --git a/pandora_console/include/help/ja/help_alert_config.php b/pandora_console/include/help/ja/help_alert_config.php
index 8f4e9de4d6..ae4fcd469f 100644
--- a/pandora_console/include/help/ja/help_alert_config.php
+++ b/pandora_console/include/help/ja/help_alert_config.php
@@ -49,6 +49,7 @@ email アクションを設定するには、_field1_ (送信先アドレス)、
 <li>_event_text_severity_ : (イベントアラートのみ) イベント(アラートの発生元)のテキストでの重要度 (Maintenance, Informational, Normal Minor, Warning, Major, Critical)</li>
 <li>_event_id_ : (イベントアラートのみ) アラート発生元のイベントID</li>
 <li>_id_agent_ : エージェントのID / Webコンソールへのリンクを生成するのに便利です</li>
+<li>_id_group_ : エージェントグループのID</li>
 <li>_id_alert_ : アラートの(ユニークな)ID / 他のソフトウエアパッケージとの連携に利用できます</li>
 <li>_policy_ : モジュールが属するポリシー名 (存在する場合)</li>
 <li>_interval_ : モジュールの実行間隔</li>
diff --git a/pandora_console/include/help/ja/help_alert_macros.php b/pandora_console/include/help/ja/help_alert_macros.php
index 2fe02781e4..15b892651c 100644
--- a/pandora_console/include/help/ja/help_alert_macros.php
+++ b/pandora_console/include/help/ja/help_alert_macros.php
@@ -43,6 +43,7 @@
 <li>_event_text_severity_ : (イベントアラートのみ) イベント(アラートの発生元)のテキストでの重要度 (Maintenance, Informational, Normal Minor, Warning, Major, Critical)</li>
 <li>_event_id_ : (イベントアラートのみ) アラート発生元のイベントID</li>
 <li>_id_agent_ : エージェントのID / Webコンソールへのリンクを生成するのに便利です</li>
+<li>_id_group_ : エージェントグループのID</li>
 <li>_id_alert_ : アラートの(ユニークな)ID / 他のソフトウエアパッケージとの連携に利用できます</li>
 <li>_policy_ : モジュールが属するポリシー名 (存在する場合)</li>
 <li>_interval_ : モジュールの実行間隔</li>
diff --git a/pandora_console/include/help/ja/help_plugin_macros.php b/pandora_console/include/help/ja/help_plugin_macros.php
index 794a43e629..daaf6a6d1c 100644
--- a/pandora_console/include/help/ja/help_plugin_macros.php
+++ b/pandora_console/include/help/ja/help_plugin_macros.php
@@ -19,6 +19,7 @@
 <li>_moduledescription_ : モジュールの説明。</li>
 <li>_modulestatus_ : モジュールの状態。</li>
 <li>_id_agent_ : エージェントのID / Webコンソールへのリンクを生成するのに便利です。</li>
+<li>_id_group_ : エージェントグループのID</li>
 <li>_policy_ : モジュールが属するポリシー名。(存在する場合)</li>
 <li>_interval_ : モジュールの実行間隔。</li>
 
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 666680caf3..05736f6531 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -934,6 +934,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 				_modulestatus_ => undef,
 				_moduletags_ => undef,
 				_id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', 
+				_id_group_ => (defined ($group)) ? $group->{'id_grupo'} : '',
 				_id_alert_ => (defined ($alert->{'id_template_module'})) ? $alert->{'id_template_module'} : '',
 				_interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '',
 				_target_ip_ => (defined ($module)) ? $module->{'ip_target'} : '', 
diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm
index 6d8763dc63..9f18e971aa 100644
--- a/pandora_server/lib/PandoraFMS/PluginServer.pm
+++ b/pandora_server/lib/PandoraFMS/PluginServer.pm
@@ -226,6 +226,7 @@ sub data_consumer ($$) {
 				_modulestatus_ => undef,
 				_moduletags_ => undef,
 				_id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', 
+				_id_group_ => (defined ($group)) ? $group->{'id_grupo'} : '',
 				_interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '',
 				_target_ip_ => (defined ($module)) ? $module->{'ip_target'} : '', 
 				_target_port_ => (defined ($module)) ? $module->{'tcp_port'} : '',