diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 5dbaa94b38..cde388316f 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-agent-unix
-Version: 6.0-151103
+Version: 6.0-151104
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 573d6f8488..40db269246 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-pandora_version="6.0-151103"
+pandora_version="6.0-151104"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index ca0df4a585..273ed3d425 100644
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '6.0';
-use constant AGENT_BUILD => '151103';
+use constant AGENT_BUILD => '151104';
# Commands to retrieve total memory information in kB
use constant TOTALMEMORY_CMDS => {
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 838c0b4822..75cf14d3ce 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 6.0
-%define release 151103
+%define release 151104
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 985ef38318..469d17c3ce 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 6.0
-%define release 151103
+%define release 151104
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 779d87e1ea..2629303598 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
-{151103}
+{151104}
ViewReadme
{Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 4667233b30..a9f20544fb 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
-#define PANDORA_VERSION ("6.0(Build 151103)")
+#define PANDORA_VERSION ("6.0(Build 151104)")
string pandora_path;
string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index e0b9a18d72..774b7b3f16 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
- VALUE "ProductVersion", "(6.0(Build 151103))"
+ VALUE "ProductVersion", "(6.0(Build 151104))"
VALUE "FileVersion", "1.0.0.0"
END
END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 3bf505ae27..5b7cde1e15 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-console
-Version: 6.0-151103
+Version: 6.0-151104
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index b951fc09cd..44462c04aa 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-pandora_version="6.0-151103"
+pandora_version="6.0-151104"
package_pear=0
package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 6032b9bb02..2ae5af385a 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
/**
* Pandora build version and version
*/
-$build_version = 'PC151103';
+$build_version = 'PC151104';
$pandora_version = 'v6.0';
// Do not overwrite default timezone set if defined.
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:
_event_text_severity_ : (Only event alerts) Text event (who fire the alert) severity (Maintenance, Informational, Normal Minor, Warning, Major, Critical).
_event_id_ : (Only event alerts) Id of the event that fired the alert.
_id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.
+_id_group_ : Id of agent group.
_id_alert_ : Numerical ID of the alert (unique), used to correlate on third party software
_policy_ : Name of the policy the module belongs to (if applies).
_interval_ : Execution interval of the module.
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:
_event_text_severity_: (Only event alerts) Text event (who fire the alert) severity (Maintenance, Informational, Normal Minor, Warning, Major, Critical).
_event_id_: (Only event alerts) Id of the event that fired the alert.
_id_agent_: Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.
+_id_group_ : Id of agent group.
_id_alert_: Numerical ID of the alert (unique), used to correlate on third party software.
_policy_: Name of the policy the module belongs to (if applies).
_interval_: Execution interval of the module
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:
_moduledescription_ : Description of the module.
_modulestatus_ : Status of the module.
_id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.
+_id_group_ : Id of agent group.
_policy_ : Name of the policy the module belongs to (if applies).
_interval_ : Execution interval of the module.
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_ (送信先アドレス)、
_event_text_severity_ : (イベントアラートのみ) イベント(アラートの発生元)のテキストでの重要度 (Maintenance, Informational, Normal Minor, Warning, Major, Critical)
_event_id_ : (イベントアラートのみ) アラート発生元のイベントID
_id_agent_ : エージェントのID / Webコンソールへのリンクを生成するのに便利です
+_id_group_ : エージェントグループのID
_id_alert_ : アラートの(ユニークな)ID / 他のソフトウエアパッケージとの連携に利用できます
_policy_ : モジュールが属するポリシー名 (存在する場合)
_interval_ : モジュールの実行間隔
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 @@
_event_text_severity_ : (イベントアラートのみ) イベント(アラートの発生元)のテキストでの重要度 (Maintenance, Informational, Normal Minor, Warning, Major, Critical)
_event_id_ : (イベントアラートのみ) アラート発生元のイベントID
_id_agent_ : エージェントのID / Webコンソールへのリンクを生成するのに便利です
+_id_group_ : エージェントグループのID
_id_alert_ : アラートの(ユニークな)ID / 他のソフトウエアパッケージとの連携に利用できます
_policy_ : モジュールが属するポリシー名 (存在する場合)
_interval_ : モジュールの実行間隔
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 @@
_moduledescription_ : モジュールの説明。
_modulestatus_ : モジュールの状態。
_id_agent_ : エージェントのID / Webコンソールへのリンクを生成するのに便利です。
+_id_group_ : エージェントグループのID
_policy_ : モジュールが属するポリシー名。(存在する場合)
_interval_ : モジュールの実行間隔。
diff --git a/pandora_console/install.php b/pandora_console/install.php
index a2c5c6bbbd..853de97e85 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -63,7 +63,7 @@
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'} : '',
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 4d4eab0630..21c29af5ac 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 6.0
-%define release 151103
+%define release 151104
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 81aa58d4f9..907651e302 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 6.0
-%define release 151103
+%define release 151104
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 2d6482e289..fcbe4dafcc 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
use PandoraFMS::DB;
# version: define current version
-my $version = "6.0 PS151103";
+my $version = "6.0 PS151104";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index ea9a7fb55f..4fa3afa21f 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -35,7 +35,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
-my $version = "6.0 PS151103";
+my $version = "6.0 PS151104";
# save program name for logging
my $progname = basename($0);