diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf
index d0e53ebecd..02fd3c957c 100644
--- a/pandora_agents/pc/AIX/pandora_agent.conf
+++ b/pandora_agents/pc/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, AIX version
+# Version 7.0NG.719, AIX version
# Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf
index 0eb8f55178..628da69b4b 100644
--- a/pandora_agents/pc/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, FreeBSD Version
+# Version 7.0NG.719, FreeBSD Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf
index 7108651c8b..e11e409af7 100644
--- a/pandora_agents/pc/HP-UX/pandora_agent.conf
+++ b/pandora_agents/pc/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, HP-UX Version
+# Version 7.0NG.719, HP-UX Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf
index 21b8b41c06..965f1f6f34 100644
--- a/pandora_agents/pc/Linux/pandora_agent.conf
+++ b/pandora_agents/pc/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, GNU/Linux
+# Version 7.0NG.719, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf
index d79070cbf8..3654c93f80 100644
--- a/pandora_agents/pc/NT4/pandora_agent.conf
+++ b/pandora_agents/pc/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, GNU/Linux
+# Version 7.0NG.719, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/pc/SunOS/pandora_agent.conf b/pandora_agents/pc/SunOS/pandora_agent.conf
index 38d1a68066..bdc4b70c3c 100644
--- a/pandora_agents/pc/SunOS/pandora_agent.conf
+++ b/pandora_agents/pc/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, Solaris Version
+# Version 7.0NG.719, Solaris Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf
index 44a621e200..2a179f1c6d 100644
--- a/pandora_agents/pc/Win32/pandora_agent.conf
+++ b/pandora_agents/pc/Win32/pandora_agent.conf
@@ -1,6 +1,6 @@
# Base config file for Pandora FMS Windows Agent
# (c) 2006-2010 Artica Soluciones Tecnologicas
-# Version 7.0NG.718
+# Version 7.0NG.719
# This program is Free Software, you can redistribute it and/or modify it
# under the terms of the GNU General Public Licence as published by the Free Software
diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf
index cc91d44bed..c95b70a58d 100644
--- a/pandora_agents/shellscript/aix/pandora_agent.conf
+++ b/pandora_agents/shellscript/aix/pandora_agent.conf
@@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents
-# Version 7.0NG.718, AIX version
+# Version 7.0NG.719, AIX version
# General Parameters
# ==================
diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
index a3f71e626a..ce6d91f8ab 100644
--- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
+++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
@@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents
-# Version 7.0NG.718
+# Version 7.0NG.719
# FreeBSD/IPSO version
# Licenced under GPL licence, 2003-2007 Sancho Lerena
diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
index e57d9b8e72..483c8728bd 100644
--- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf
+++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
@@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents
-# Version 7.0NG.718, HPUX Version
+# Version 7.0NG.719, HPUX Version
# General Parameters
# ==================
diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf
index 9544190a1c..b47b7b0ef2 100644
--- a/pandora_agents/shellscript/linux/pandora_agent.conf
+++ b/pandora_agents/shellscript/linux/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718
+# Version 7.0NG.719
# Licensed under GPL license v2,
# (c) 2003-2010 Artica Soluciones Tecnologicas
# please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
index 0a635fe968..993be45b74 100644
--- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf
+++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718
+# Version 7.0NG.719
# Licensed under GPL license v2,
# (c) 2003-2009 Artica Soluciones Tecnologicas
# please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf
index 0bedcbadf7..0f703a7387 100644
--- a/pandora_agents/shellscript/openWRT/pandora_agent.conf
+++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718
+# Version 7.0NG.719
# Licensed under GPL license v2,
# please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf
index 5208129e75..c0439c7b96 100644
--- a/pandora_agents/shellscript/solaris/pandora_agent.conf
+++ b/pandora_agents/shellscript/solaris/pandora_agent.conf
@@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents
-# Version 7.0NG.718, Solaris version
+# Version 7.0NG.719, Solaris version
# General Parameters
# ==================
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index 5edd29b25a..0c7bbcef39 100644
--- a/pandora_agents/unix/AIX/pandora_agent.conf
+++ b/pandora_agents/unix/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, AIX version
+# Version 7.0NG.719, AIX version
# Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index d486a605e4..3a36057d8b 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-agent-unix
-Version: 7.0NG.718-180210
+Version: 7.0NG.719-180219
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 2e3f6c5373..16b4403c91 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="7.0NG.718-180210"
+pandora_version="7.0NG.719-180219"
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/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf
index 9fcd0e0ec3..07a8fa36ce 100644
--- a/pandora_agents/unix/Darwin/pandora_agent.conf
+++ b/pandora_agents/unix/Darwin/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, GNU/Linux
+# Version 7.0NG.719, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf
index 8c2a2e1519..40212d2098 100644
--- a/pandora_agents/unix/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, FreeBSD Version
+# Version 7.0NG.719, FreeBSD Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf
index e3bf99a391..04c521b395 100644
--- a/pandora_agents/unix/HP-UX/pandora_agent.conf
+++ b/pandora_agents/unix/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, HP-UX Version
+# Version 7.0NG.719, HP-UX Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 0e1f7b4e00..fda0d82f2d 100644
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, GNU/Linux
+# Version 7.0NG.719, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf
index 15a79c55ac..de203fa85c 100644
--- a/pandora_agents/unix/NT4/pandora_agent.conf
+++ b/pandora_agents/unix/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, GNU/Linux
+# Version 7.0NG.719, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf
index ec2b14b196..bca26835ce 100644
--- a/pandora_agents/unix/NetBSD/pandora_agent.conf
+++ b/pandora_agents/unix/NetBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, NetBSD Version
+# Version 7.0NG.719, NetBSD Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf
index 607da990a3..f7f6d4f192 100644
--- a/pandora_agents/unix/SunOS/pandora_agent.conf
+++ b/pandora_agents/unix/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
-# Version 7.0NG.718, Solaris Version
+# Version 7.0NG.719, Solaris Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 8eaa741f39..51f36aa14f 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -40,8 +40,8 @@ my $Sem = undef;
# Semaphore used to control the number of threads
my $ThreadSem = undef;
-use constant AGENT_VERSION => '7.0NG.718';
-use constant AGENT_BUILD => '180210';
+use constant AGENT_VERSION => '7.0NG.719';
+use constant AGENT_BUILD => '180219';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 7aad5339d5..2be6f5f42c 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -2,8 +2,8 @@
#Pandora FMS Linux Agent
#
%define name pandorafms_agent_unix
-%define version 7.0NG.718
-%define release 180210
+%define version 7.0NG.719
+%define release 180219
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 910d86b492..2a206c8d3a 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -2,8 +2,8 @@
#Pandora FMS Linux Agent
#
%define name pandorafms_agent_unix
-%define version 7.0NG.718
-%define release 180210
+%define version 7.0NG.719
+%define release 180219
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 253f1685e8..e03f6e87fb 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -9,8 +9,8 @@
# Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
# **********************************************************************
-PI_VERSION="7.0NG.718"
-PI_BUILD="180210"
+PI_VERSION="7.0NG.719"
+PI_BUILD="180219"
OS_NAME=`uname -s`
FORCE=0
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 3d921af535..77dc303572 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -1,6 +1,6 @@
# Base config file for Pandora FMS Windows Agent
# (c) 2006-2017 Artica Soluciones Tecnologicas
-# Version 7.0NG.718
+# Version 7.0NG.719
# This program is Free Software, you can redistribute it and/or modify it
# under the terms of the GNU General Public Licence as published by the Free Software
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 6b603e149c..dade15ebc9 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -3,7 +3,7 @@ AllowLanguageSelection
{Yes}
AppName
-{Pandora FMS Windows Agent v7.0NG.718}
+{Pandora FMS Windows Agent v7.0NG.719}
ApplicationID
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
-{180210}
+{180219}
ViewReadme
{Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 9d9c2180af..c500cd8239 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 ("7.0NG.718(Build 180210)")
+#define PANDORA_VERSION ("7.0NG.719(Build 180219)")
string pandora_path;
string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index c28fb062f8..8c70d0c0e0 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", "(7.0NG.718(Build 180210))"
+ VALUE "ProductVersion", "(7.0NG.719(Build 180219))"
VALUE "FileVersion", "1.0.0.0"
END
END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 3d95155c78..5cb7b438cf 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-console
-Version: 7.0NG.718-180210
+Version: 7.0NG.719-180219
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 b8869661dd..47dc94c672 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="7.0NG.718-180210"
+pandora_version="7.0NG.719-180219"
package_pear=0
package_pandora=1
diff --git a/pandora_console/extras/mr/12.sql b/pandora_console/extras/mr/12.sql
index 052ae9950e..7fda89efeb 100644
--- a/pandora_console/extras/mr/12.sql
+++ b/pandora_console/extras/mr/12.sql
@@ -6,39 +6,51 @@ ALTER TABLE tlayout_data ADD COLUMN `clock_animation` varchar(60) NOT NULL defau
ALTER TABLE tlayout_data ADD COLUMN `time_format` varchar(60) NOT NULL default "time";
ALTER TABLE tlayout_data ADD COLUMN `timezone` varchar(60) NOT NULL default "Europe/Madrid";
-create table IF NOT EXISTS tcluster(
- id int unsigned not null auto_increment,
- name tinytext not null default '',
- cluster_type enum('AA','AP') not null default 'AA',
- description text not null default '',
- group int(10) unsigned NOT NULL default '0',
- id_agent int(10) unsigned NOT NULL,
- PRIMARY KEY (id),
- FOREIGN KEY (id_agent) REFERENCES tagente(id_agente)
- ON UPDATE CASCADE
+-- ---------------------------------------------------------------------
+-- Table `tcluster`
+-- ---------------------------------------------------------------------
+
+create table IF NOT EXISTS `tcluster`(
+ `id` int unsigned not null auto_increment,
+ `name` tinytext not null default '',
+ `cluster_type` enum('AA','AP') not null default 'AA',
+ `description` text not null default '',
+ `group` int(10) unsigned NOT NULL default '0',
+ `id_agent` int(10) unsigned NOT NULL,
+ PRIMARY KEY (`id`),
+ FOREIGN KEY (`id_agent`) REFERENCES tagente(`id_agente`)
+ ON UPDATE CASCADE
) engine=InnoDB DEFAULT CHARSET=utf8;
-create table IF NOT EXISTS tcluster_item(
- id int unsigned not null auto_increment,
- name tinytext not null default '',
- item_type enum('AA','AP') not null default 'AA',
- critical_limit int unsigned NOT NULL default '0',
- warning_limit int unsigned NOT NULL default '0',
- is_critical tinyint(2) unsigned NOT NULL default '0',
- id_cluster int unsigned,
- PRIMARY KEY (id),
- FOREIGN KEY (id_cluster) REFERENCES tcluster(id)
- ON DELETE SET NULL ON UPDATE CASCADE
+-- ---------------------------------------------------------------------
+-- Table `tcluster_item`
+-- ---------------------------------------------------------------------
+
+create table IF NOT EXISTS `tcluster_item`(
+ `id` int unsigned not null auto_increment,
+ `name` tinytext not null default '',
+ `item_type` enum('AA','AP') not null default 'AA',
+ `critical_limit` int unsigned NOT NULL default '0',
+ `warning_limit` int unsigned NOT NULL default '0',
+ `is_critical` tinyint(2) unsigned NOT NULL default '0',
+ `id_cluster` int unsigned,
+ PRIMARY KEY (`id`),
+ FOREIGN KEY (`id_cluster`) REFERENCES tcluster(`id`)
+ ON DELETE SET NULL ON UPDATE CASCADE
) engine=InnoDB DEFAULT CHARSET=utf8;
-create table IF NOT EXISTS tcluster_agent(
- id_cluster int unsigned not null,
- id_agent int(10) unsigned not null,
- PRIMARY KEY (id_cluster,id_agent),
- FOREIGN KEY (id_agent) REFERENCES tagente(id_agente)
- ON UPDATE CASCADE,
- FOREIGN KEY (id_cluster) REFERENCES tcluster(id)
- ON UPDATE CASCADE
+-- ---------------------------------------------------------------------
+-- Table `tcluster_agent`
+-- ---------------------------------------------------------------------
+
+create table IF NOT EXISTS `tcluster_agent`(
+ `id_cluster` int unsigned not null,
+ `id_agent` int(10) unsigned not null,
+ PRIMARY KEY (`id_cluster`,`id_agent`),
+ FOREIGN KEY (`id_agent`) REFERENCES tagente(`id_agente`)
+ ON UPDATE CASCADE,
+ FOREIGN KEY (`id_cluster`) REFERENCES tcluster(`id`)
+ ON UPDATE CASCADE
) engine=InnoDB DEFAULT CHARSET=utf8;
COMMIT;
\ No newline at end of file
diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index 8b1e4fe35f..99837ca824 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -135,9 +135,6 @@ if ($update_agents) {
$result = false;
foreach ($id_agents as $id_agent) {
if (!empty($values)) {
- if ($config['metaconsole_agent_cache'] == 1) {
- $values['update_module_count'] = 1; // Force an update of the agent cache.
- }
$group_old = false;
if($values['id_grupo']){
$group_old = db_get_sql("SELECT id_grupo FROM tagente WHERE id_agente =" .$id_agent);
@@ -146,6 +143,12 @@ if ($update_agents) {
$result = db_process_sql_update ('tagente',
$values,
array ('id_agente' => $id_agent));
+
+ if ($result && $config['metaconsole_agent_cache'] == 1) {
+ $server_name['server_name'] = db_get_sql("SELECT server_name FROM tagente WHERE id_agente =" .$id_agent);
+ // Force an update of the agent cache.
+ $result_metaconsole = agent_update_from_cache($id_agent,$values,$server_name);
+ }
if($group_old || $result){
if ($group_old && $group_old != null) {
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 19253fd8c1..7130fa89e6 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -364,7 +364,7 @@ else {
$data[2] = db_get_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']);
// Fix: IW was the old ACL for report editing, now is RW
- if ($vconsole_write || $vconsole_manage) {
+ if ($vconsoles_write || $vconsoles_manage) {
if (!is_metaconsole()) {
$data[3] = '<a class="copy_visualmap" href="index.php?sec=network&sec2=godmode/reporting/map_builder&id_layout='.$map['id'].'&copy_layout=1">'.html_print_image ("images/copy.png", true).'</a>';
$data[4] = '<a class="delete_visualmap" href="index.php?sec=network&sec2=godmode/reporting/map_builder&id_layout='.$map['id'].'&delete_layout=1">'.html_print_image ("images/cross.png", true).'</a>';
diff --git a/pandora_console/images/icono-bad.png b/pandora_console/images/icono-bad.png
new file mode 100644
index 0000000000..c5cb10f71a
Binary files /dev/null and b/pandora_console/images/icono-bad.png differ
diff --git a/pandora_console/images/icono-not-init.png b/pandora_console/images/icono-not-init.png
new file mode 100644
index 0000000000..062331f871
Binary files /dev/null and b/pandora_console/images/icono-not-init.png differ
diff --git a/pandora_console/images/icono-ok.png b/pandora_console/images/icono-ok.png
new file mode 100644
index 0000000000..9424bdac9d
Binary files /dev/null and b/pandora_console/images/icono-ok.png differ
diff --git a/pandora_console/images/icono-refrescar.png b/pandora_console/images/icono-refrescar.png
new file mode 100644
index 0000000000..a2a2b92c58
Binary files /dev/null and b/pandora_console/images/icono-refrescar.png differ
diff --git a/pandora_console/images/icono-reloj-verde.png b/pandora_console/images/icono-reloj-verde.png
new file mode 100644
index 0000000000..df0ca40ec4
Binary files /dev/null and b/pandora_console/images/icono-reloj-verde.png differ
diff --git a/pandora_console/images/icono-unknown.png b/pandora_console/images/icono-unknown.png
new file mode 100644
index 0000000000..84d59be725
Binary files /dev/null and b/pandora_console/images/icono-unknown.png differ
diff --git a/pandora_console/images/icono-warning.png b/pandora_console/images/icono-warning.png
new file mode 100644
index 0000000000..1a38ace744
Binary files /dev/null and b/pandora_console/images/icono-warning.png differ
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index e22a4ca266..b267173f5a 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -781,6 +781,7 @@ if ($list_modules) {
$table->head[6] = __('Thresholds');
$table->head[7] = __('Data');
$table->head[8] = __('Graph');
+ $table->headstyle[8] = 'min-width: 60px';
$table->head[9] = __('Last contact') . ' ' .
'<a href="' . $url . '&sort_field=last_contact&sort=up&refr=&filter_monitors=1&status_filter_monitor=' .$status_filter_monitor.' &status_text_monitor='. $status_text_monitor.'&status_module_group= '.$status_module_group.'">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '</a>' .
'<a href="' . $url . '&sort_field=last_contact&sort=down&refr=&filter_monitors=1&status_filter_monitor=' .$status_filter_monitor.' &status_text_monitor='. $status_text_monitor.'&status_module_group= '.$status_module_group.'">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';
diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index e6861aa956..8a8dbaf5fd 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -83,7 +83,7 @@ function process_user_login ($login, $pass, $api = false) {
return process_user_login_local ($login, $pass, $api);
}
else {
- $login_remote = process_user_login_remote ($login, $pass, $api);
+ $login_remote = process_user_login_remote ($login, io_safe_output($pass), $api);
if ($login_remote == false && $config['fallback_local_auth'] == '1') {
return process_user_login_local ($login, $pass, $api);
}
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 6d1ce48f62..900e563b3e 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,8 +22,8 @@
/**
* Pandora build version and version
*/
-$build_version = 'PC180210';
-$pandora_version = 'v7.0NG.718';
+$build_version = 'PC180219';
+$pandora_version = 'v7.0NG.719';
// Do not overwrite default timezone set if defined.
$script_tz = @date_default_timezone_get();
diff --git a/pandora_console/include/functions_tags.php b/pandora_console/include/functions_tags.php
index 20238c8b23..08cfecf26e 100644
--- a/pandora_console/include/functions_tags.php
+++ b/pandora_console/include/functions_tags.php
@@ -1448,7 +1448,9 @@ function tags_checks_event_acl($id_user, $id_group, $access, $tags = array(), $c
if (!empty($tags)) {
foreach ($tags as $tag) {
$tag_id = tags_get_id($tag);
- $tags_aux[$tag_id] = $tag_id;
+ if (isset($tag_id)&& ($tag_id !== false)) {
+ $tags_aux[$tag_id] = $tag_id;
+ }
}
$tags_str = implode(',', $tags_aux);
}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 40f86f5e1a..28c6e3691d 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4375,8 +4375,6 @@ div#footer_help{
.route {
fill: none;
transition: all 2s ease-in-out;
-<<<<<<< HEAD
-=======
}
.limit_scroll{
@@ -4470,5 +4468,155 @@ form ul.form_flex li ul li{
.modal_module_list:hover{
cursor: pointer;
->>>>>>> develop
+
+}
+
+#main_cluster {
+ max-width:1770px;
+ margin:0 auto;
+}
+
+.sub_cluster_1 {
+ width:400px;
+ float: left;
+ margin-left: 30px;
+ margin-bottom: 25px;
+ vertical-align: top;
+ border:1px solid #e7e9ea;
+ height:150px;
+
+}
+
+.sub_cluster_2 {
+ width:833px;
+ float: left;
+ margin-left: 30px;
+ margin-bottom: 25px;
+ vertical-align: top;
+ border:1px solid #e7e9ea;
+ height:150px;
+}
+
+.sub_cluster_header {
+ width:100%;
+ height: 30px;
+ background-color: #373737;
+ color:white;
+ text-align:center;
+ font-size: 9pt;
+ display: flex;
+ justify-content: center;
+ align-content: center;
+ flex-direction: column;
+}
+
+.sub_cluster_body {
+ width:100%;
+ height: 120px;
+ background-color: #f9faf9;
+ display: flex;
+ justify-content: center;
+ align-content: center;
+ flex-direction: column;
+}
+
+.sub_cluster_body_3 {
+ width:100%;
+ height: 120px;
+ background-color: #f9faf9;
+ overflow-y: scroll;
+}
+
+#cluster_map {
+ border:1px solid lightgray;
+ width:900px;
+ height:500px;
+ float: left;
+ margin-bottom: 30px;
+}
+
+#cluster_status_content {
+ width: 90%;
+ height:30px;
+ margin:0px auto;
+}
+
+#cluster_status_bar {
+ width: 85%;
+ height:100%;
+ float:left;
+
+}
+
+.status_animation {
+ width: 1%;
+ height:100%;
+ left:0%;
+ background-color: red;
+ position:relative;
+}
+
+#cluster_status_button {
+ float:left;
+ width:10%;
+ margin-left:5%;;
+}
+
+#last_contact_content{
+ width: 90%;
+ height:60px;
+ margin:0px auto;
+}
+
+
+
+#last_contact_clock {
+ width: 15%;
+ height:100%;
+ float:left;
+
+}
+
+#last_contact_date {
+ float:left;
+ height:60px;
+ width:80%;
+ margin-left:5%;
+ text-align:center;
+ display: flex;
+ justify-content: center;
+ align-content: center;
+ flex-direction: column;
+}
+
+#last_contact_date_text {
+ font-size:14pt;
+}
+
+
+.balanced_module_item {
+ float:left;
+ margin-top: 11.5px;
+ margin-left: 5%;
+ height: 25px;
+ width:90%;
+}
+
+.module_icon {
+ float:left;
+ width:10%;
+}
+
+.modal_module_list {
+ float:left;
+ width: 90%;
+ height:100%;
+ display: flex;
+ justify-content: center;
+ align-content: center;
+ flex-direction: column;
+}
+
+.events_bar {
+ margin:0 auto;
}
\ No newline at end of file
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 454490e2bc..88696343b4 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -70,8 +70,8 @@
<body>
<div style='height: 10px'>
<?php
-$version = '7.0NG.718';
-$build = '180210';
+$version = '7.0NG.719';
+$build = '180219';
$banner = "v$version Build $build";
error_reporting(0);
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 1fbcde3ad4..a7e6523c7e 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -301,7 +301,7 @@ $tag_without = json_decode($tag_without_json_clean, true);
if (empty($tag_without)) $tag_without = array();
$tag_without = array_diff($tag_without, array(0 => 0));
-$search = io_safe_output(get_parameter ("search"));
+$search = get_parameter ("search");
users_get_groups ($config["id_user"], "ER");
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 7aaf356d24..0192b2d6ef 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -2,8 +2,8 @@
# Pandora FMS Console
#
%define name pandorafms_console
-%define version 7.0NG.718
-%define release 180210
+%define version 7.0NG.719
+%define release 180219
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 0651e12af7..5942563668 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -2,8 +2,8 @@
# Pandora FMS Console
#
%define name pandorafms_console
-%define version 7.0NG.718
-%define release 180210
+%define version 7.0NG.719
+%define release 180219
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_console/pandora_console_install b/pandora_console/pandora_console_install
index cf392e1c4f..8a638949db 100644
--- a/pandora_console/pandora_console_install
+++ b/pandora_console/pandora_console_install
@@ -9,7 +9,7 @@
# This code is licensed under GPL 2.0 license.
# **********************************************************************
-PI_VERSION="7.0NG.718"
+PI_VERSION="7.0NG.719"
FORCE=0
DESTDIR=""
LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 1dfc1123fb..2e7ab3f5b5 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0NG.718-180210
+Version: 7.0NG.719-180219
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index f31b156e87..11d5ad3348 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/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="7.0NG.718-180210"
+pandora_version="7.0NG.719-180219"
package_cpan=0
package_pandora=1
diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 03ff4ac0fe..1f13627cb3 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -293,7 +293,7 @@ sub pandora_server_tasks ($) {
if (($counter % 30) == 0) {
# Update module status and fired alert counts
- my @agents = get_db_rows ($dbh, 'SELECT id_agente, nombre, update_module_count, update_alert_count FROM tagente WHERE (update_module_count=1 OR update_alert_count=1)');
+ my @agents = get_db_rows ($dbh, 'SELECT id_agente, nombre, update_module_count, update_alert_count FROM tagente WHERE disabled = 0 AND (update_module_count=1 OR update_alert_count=1)');
foreach my $agent (@agents) {
logger ($pa_config, "Updating module status and fired alert counts for agent " . $agent->{'nombre'}, 10);
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index a002d4b91c..e15c4d3a37 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -1,7 +1,7 @@
#############################################################################
# Pandora FMS Server Parameters
# Pandora FMS, the Flexible Monitoring System.
-# Version 7.0NG.718
+# Version 7.0NG.719
# Licensed under GPL license v2,
# (c) 2003-2017 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 202e5bb6ca..950c7c027f 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -42,8 +42,8 @@ our @EXPORT = qw(
);
# version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.718";
-my $pandora_build = "180210";
+my $pandora_version = "7.0NG.719";
+my $pandora_build = "180219";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index d0188ced6c..1d3784348c 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -5155,7 +5155,7 @@ sub pandora_update_agent_module_count ($$$) {
}; # Module counts by status.
# Retrieve and hash module status counts.
- my @rows = get_db_rows ($dbh, 'SELECT estado, COUNT(*) AS total FROM tagente_modulo, tagente_estado WHERE tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=?GROUP BY estado', $agent_id);
+ my @rows = get_db_rows ($dbh, 'SELECT estado, COUNT(*) AS total FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=?GROUP BY estado', $agent_id);
foreach my $row (@rows) {
$counts->{$row->{'estado'}} = $row->{'total'};
$total += $row->{'total'};
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 8f1877349e..fe85e64c67 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -30,8 +30,8 @@ use base 'Exporter';
our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.718";
-my $pandora_build = "180210";
+my $pandora_version = "7.0NG.719";
+my $pandora_build = "180219";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index d2c82dcd44..fe528042b8 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -349,7 +349,9 @@ sub pandora_trash_ascii {
########################################################################
sub safe_input($) {
my $value = shift;
-
+
+ return "" unless defined($value);
+
$value =~ s/([\x00-\xFF])/$CHR2ENT{$1}||$1/ge;
return $value;
@@ -360,7 +362,9 @@ sub safe_input($) {
########################################################################
sub safe_output($) {
my $value = shift;
-
+
+ return "" unless defined($value);
+
_decode_entities ($value, \%ENT2CHR);
return $value;
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 865a33bd1a..91414f97c2 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -2,8 +2,8 @@
# Pandora FMS Server
#
%define name pandorafms_server
-%define version 7.0NG.718
-%define release 180210
+%define version 7.0NG.719
+%define release 180219
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 3d320c7ef1..e816d81824 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -2,8 +2,8 @@
# Pandora FMS Server
#
%define name pandorafms_server
-%define version 7.0NG.718
-%define release 180210
+%define version 7.0NG.719
+%define release 180219
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index bbd7369eac..ec2ff0e352 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -8,8 +8,8 @@
# This code is licensed under GPL 2.0 license.
# **********************************************************************
-PI_VERSION="7.0NG.718"
-PI_BUILD="180210"
+PI_VERSION="7.0NG.719"
+PI_BUILD="180219"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index abd7e70604..daf9b2575c 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 = "7.0NG.718 PS180210";
+my $version = "7.0NG.719 PS180219";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f0e2fe85ba..5372438029 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
-my $version = "7.0NG.718 PS180210";
+my $version = "7.0NG.719 PS180219";
# save program name for logging
my $progname = basename($0);