diff --git a/index.pot b/index.pot
index f4a20c7dda..8f8ca875e0 100644
--- a/index.pot
+++ b/index.pot
@@ -127094,7 +127094,7 @@ msgstr ""
#: ../../Documentos/Pandoras/pandorafms_develop/pandora_console/godmode/setup/setup_ehorus.php:87
#: ../../Documentos/COPIA SEG/godmode/setup/setup_ehorus.php:87
#: ../../code/pandorafms/pandora_console/godmode/setup/setup_ehorus.php:87
-msgid "e.g., switch.ehorus.com"
+msgid "e.g., portal.ehorus.com"
msgstr ""
#: ../../Documentos/Pandoras/pandorafms_develop/pandora_console/godmode/setup/setup_ehorus.php:92
diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf
index aef55f8e67..4ec24dd4fc 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.705, AIX version
+# Version 7.0NG.708, AIX version
# Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
@@ -15,8 +15,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default, agent takes machine name
diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf
index af531588eb..5b84348657 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.705, FreeBSD Version
+# Version 7.0NG.708, FreeBSD Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
@@ -17,8 +17,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default, agent takes machine name
diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf
index 67846d2798..67368fc92d 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.705, HP-UX Version
+# Version 7.0NG.708, HP-UX Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
@@ -17,8 +17,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default, agent takes machine name
diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf
index b1fc942ef7..67cedc9d0a 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.705, GNU/Linux
+# Version 7.0NG.708, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
@@ -17,8 +17,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# Optional. UDP Server to receive orders from outside
diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf
index d1490e3902..1922741fd4 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.705, GNU/Linux
+# Version 7.0NG.708, 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 8db5b78a5a..b9314d2a5a 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.705, Solaris Version
+# Version 7.0NG.708, Solaris Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
@@ -17,8 +17,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default, agent takes machine name
diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf
index 31f05a2abd..90d17489d0 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.705
+# Version 7.0NG.708
# 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
@@ -11,109 +11,109 @@
# Edit this file to change your parameters or/and add your own modules
# Any line with a # character at the first column will be ignored (comment)
-
-# General Parameters
-# ==================
-
+
+# General Parameters
+# ==================
+
# NOTE: The variables $*$ will be substituted in the installation wizard
-server_ip $ServerIP$
-server_path $ServerPath$
-temporal $AgentTemp$
-logfile $AgentLog$
-
+server_ip $ServerIP$
+server_path $ServerPath$
+temporal $AgentTemp$
+logfile $AgentLog$
+
#include "C:\Archivos de programa\pandora_agent\pandora_agent_alt.conf"
#broker_agent name_agent
-
+
# Agent uses your hostname automatically, if you need to change agent name
# use directive agent_name (do not use blank spaces, please).
# This parameter is CASE SENSITIVE.
-
-# agent_name My_Custom_Agent_name
-
-#Parent agent_name
-#parent_agent_name caprica
-
-# address: Enforce to server a ip address to this agent
-# You can also try to detect the first IP using "auto", for example
-#address auto
-# or setting a fixed IP address, like for example:
-#address 192.168.36.73
-
+# agent_name My_Custom_Agent_name
+
+#Parent agent_name
+#parent_agent_name caprica
+
+# address: Enforce to server a ip address to this agent
+# You can also try to detect the first IP using "auto", for example
+
+#address auto
+# or setting a fixed IP address, like for example:
+#address 192.168.36.73
+
# Group assigned for this agent (descriptive, p.e: Servers)
group $AgentGroup$
-
+
# This limits operation if temporal dir has not enough free disk.
#temporal_min_size 1024
-
+
# Delay start execution X second before start to minonitoring nothing
#startup_delay 30
-
+
# Interval is defined in seconds
interval 300
-
+
# tranfer_modes: Possible values are local, tentacle (default), ftp and ssh.
-transfer_mode tentacle
+transfer_mode tentacle
server_port 41121
-
+
# In case of using FTP or tentacle with password. User is always "pandora"
#server_pwd pandora
-
-# Debug mode do not copy XML data files to server.
+
+# Debug mode renames XML in the temp folder and continues running
# debug 1
-
+
# ODBC connections. Check documentation for more information.
# Configuring "ExampleDSN" DSN. Notice that this DSN connection must be configured
# under Control panel -> Administrative tools -> ODBC -> DSN
# odbc_ExampleDSN_username UserNameForDsn
# odbc_ExampleDSN_password Password1234
-
+
# If set to 1 allows the agent to be configured via the web console
# (only works on enterprise version).
# remote_config 1
-
+
# Set XML encoding (ISO-8859-1 by default).
#encoding ISO-8859-1
-
-# If set to 1 start Drone Agent's Proxy Mode
-# proxy_mode 1
-
-# Max number of simmultaneus connection for proxy (by default 10)
-# proxy_max_connection 10
-
-# Proxy timeout (by default 1s)
-# proxy_timeout 1
-
+
+# If set to 1 start Drone Agent's Proxy Mode
+# proxy_mode 1
+
+# Max number of simmultaneus connection for proxy (by default 10)
+# proxy_max_connection 10
+
+# Proxy timeout (by default 1s)
+# proxy_timeout 1
+
# Enable or disable XML buffer.
xml_buffer 0
# WMI by default. Set to NT if you don't want to use WMI.
win32_monitoring_lib NT
-
-# Secondary server configuration
-# ==============================
-
-# If secondary_mode is set to on_error, data files are copied to the secondary
-# server only if the primary server fails. If set to always, data files are
-# always copied to the secondary server.
+
+# Secondary server configuration
+# ==============================
+
+# If secondary_mode is set to on_error, data files are copied to the secondary
+# server only if the primary server fails. If set to always, data files are
+# always copied to the secondary server.
#secondary_mode on_error
#secondary_server_ip localhost
-#secondary_server_path /var/spool/pandora/data_in
-#secondary_server_port 41121
-#secondary_transfer_mode tentacle
-#secondary_server_pwd mypassword
-#secondary_server_ssl no
-#secondary_server_opts
-
-# Module Definition
+#secondary_server_path /var/spool/pandora/data_in
+#secondary_server_port 41121
+#secondary_transfer_mode tentacle
+#secondary_server_pwd mypassword
+#secondary_server_ssl no
+#secondary_server_opts
+
+# Module Definition
# Check online documentation and module library at http://pandorafms.org
-# =================
-
+# =================
+
# CPU Load using WMI
module_begin
module_name CPU Load
-module_type generic_data
+module_type generic_data
module_wmiquery SELECT LoadPercentage FROM Win32_Processor
module_wmicolumn LoadPercentage
module_description CPU Load (%)
@@ -121,8 +121,8 @@ module_min_warning 80
module_max_warning 90
module_min_critical 91
module_max_critical 100
-module_end
-
+module_end
+
# Number processes
module_begin
module_name Number processes
diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf
index 942a2f4274..d624a8d66d 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.705, AIX version
+# Version 7.0NG.708, AIX version
# General Parameters
# ==================
@@ -11,7 +11,7 @@ pandora_path /usr/share/pandora_agent
temporal /var/spool/pandora/data_out
interval 300
checksum 0
-#agent_name adama
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default is 22 (for ssh)
#server_port 22
diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
index 8677ad5d67..9edc972282 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.705
+# Version 7.0NG.708
# FreeBSD/IPSO version
# Licenced under GPL licence, 2003-2007 Sancho Lerena
@@ -13,6 +13,7 @@ pandora_path /opt/pandora_agent
temporal /var/spool/pandora/data_out
interval 600
agent_name nokia
+# Debug mode renames XML in the temp folder and continues running
debug 0
checksum 0
harmless_mode 1
diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
index df0cf2d32c..f77b766dab 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.705, HPUX Version
+# Version 7.0NG.708, HPUX Version
# General Parameters
# ==================
@@ -11,6 +11,7 @@ temporal /var/spool/pandora/data_out
interval 300
#agent_name satellite_system
checksum 1
+# Debug mode renames XML in the temp folder and continues running
debug 0
# Module Definition
diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf
index 51d2bb1af8..d37678b502 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.705
+# Version 7.0NG.708
# Licensed under GPL license v2,
# (c) 2003-2010 Artica Soluciones Tecnologicas
# please visit http://pandora.sourceforge.net
@@ -15,8 +15,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default, agent takes machine name
diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
index f3370b0916..da67ed5470 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.705
+# Version 7.0NG.708
# Licensed under GPL license v2,
# (c) 2003-2009 Artica Soluciones Tecnologicas
# please visit http://pandora.sourceforge.net
@@ -15,8 +15,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default, agent takes machine name
diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf
index bf44df9b35..d8a9d19ee3 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.705
+# Version 7.0NG.708
# Licensed under GPL license v2,
# please visit http://pandora.sourceforge.net
@@ -14,8 +14,7 @@ logfile /opt/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 30
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default, agent takes machine name
diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf
index 04933fbf78..1b4a021236 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.705, Solaris version
+# Version 7.0NG.708, Solaris version
# General Parameters
# ==================
@@ -11,6 +11,7 @@ temporal /var/spool/pandora/data_out
interval 300
#agent_name satellite_system
checksum 0
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default is 22 (for ssh)
#server_port 22
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index f566855881..dfdc519a04 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.705, AIX version
+# Version 7.0NG.708, AIX version
# Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
@@ -15,8 +15,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default, agent takes machine name
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 8809e73f00..34b9a6c8c6 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-agent-unix
-Version: 7.0NG.705-170629
+Version: 7.0NG.708-170728
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 e9393a5f2d..3c966af5cf 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.705-170629"
+pandora_version="7.0NG.708-170728"
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/DEBIAN/prerm b/pandora_agents/unix/DEBIAN/prerm
index 847c25f593..35682fa3c5 100755
--- a/pandora_agents/unix/DEBIAN/prerm
+++ b/pandora_agents/unix/DEBIAN/prerm
@@ -14,3 +14,4 @@ if [ -x `command -v systemctl` ]; then
else
update-rc.d -f pandora_agent_daemon remove
fi
+exit 0
diff --git a/pandora_agents/unix/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf
index 05d24eb45e..81ce878b4e 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.705, GNU/Linux
+# Version 7.0NG.708, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
@@ -17,8 +17,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# Optional. UDP Server to receive orders from outside
diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf
index 68c96e4ba5..535a637421 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.705, FreeBSD Version
+# Version 7.0NG.708, FreeBSD Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
@@ -18,8 +18,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# Optional. UDP Server to receive orders from outside
diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf
index 3ad599e216..962d1a4047 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.705, HP-UX Version
+# Version 7.0NG.708, HP-UX Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
@@ -17,8 +17,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default, agent takes machine name
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 02baa0729f..efaa9ac0bc 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.705, GNU/Linux
+# Version 7.0NG.708, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
@@ -18,8 +18,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# Optional. UDP Server to receive orders from outside
diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf
index 5872b70e91..8a153581e2 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.705, GNU/Linux
+# Version 7.0NG.708, 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 26d63448ce..8cb4f47058 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.705, NetBSD Version
+# Version 7.0NG.708, NetBSD Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
@@ -17,8 +17,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default, agent takes machine name
diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf
index 11911ed676..290d3614a3 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.705, Solaris Version
+# Version 7.0NG.708, Solaris Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
@@ -17,8 +17,7 @@ logfile /var/log/pandora/pandora_agent.log
# Interval in seconds, 300 by default
interval 300
-# Debug mode only generate XML, and stop after first execution,
-# and does not copy XML to server.
+# Debug mode renames XML in the temp folder and continues running
debug 0
# By default, agent takes machine name
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 97a8853540..ab53784cf9 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.705';
-use constant AGENT_BUILD => '170629';
+use constant AGENT_VERSION => '7.0NG.708';
+use constant AGENT_BUILD => '170728';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;
@@ -906,14 +906,13 @@ sub fix_directory ($) {
################################################################################
# Sends a file to the server.
################################################################################
-#sub send_file ($;$) {
+#sub send_file ($;$$$) {
sub send_file {
- my ($file, $secondary) = @_;
+ my ($file, $secondary, $rc_primary, $flag_always) = @_;
my $output;
-
my $pid = fork();
return 1 unless defined $pid;
-
+
if ($pid == 0) {
# execute the transfer program by child process.
eval {
@@ -942,14 +941,14 @@ sub send_file {
};
if ($@) {
- log_message ('error', "Error sending file '$file': File transfer command is not responding.");
+ log_message ('error', "Error sending file '$file' to '" . $Conf{'server_ip'} . ":" . $Conf{'server_port'}. "': File transfer command is not responding.");
exit 1;
}
# Get the errorlevel
my $rc = $? >> 8;
if ($rc != 0) {
- log_message ('error', "Error sending file '$file': $output");
+ log_message ('error', "Error sending file '$file' to '" . $Conf{'server_ip'} . ":" . $Conf{'server_port'}. "': $output");
}
exit $rc;
}
@@ -958,39 +957,104 @@ sub send_file {
waitpid ($pid, 0);
my $rc = $? >> 8;
- return $rc unless (defined ($secondary));
+ if( ($Conf{'secondary_mode'} eq 'always') && ( !defined($flag_always) ) ){
+ # Send the file to the secondary server
+ return $rc unless ($Conf{'secondary_mode'} eq 'always');
+
+ if(defined ($secondary)){
+ if( ($rc != 0 && ($file =~ /\.data/)) ){
+ $rc_primary = 1;
+ }
+ swap_servers ();
+ $rc = send_file ($file, undef, $rc_primary);
+ swap_servers ();
- # Send the file to the secondary server
- return $rc unless ($Conf{'secondary_mode'} eq 'always' || ($Conf{'secondary_mode'} eq 'on_error' && $rc != 0));
-
- swap_servers ();
- $rc = send_file ($file);
- swap_servers ();
- return $rc;
+ return $rc;
+ }
+ else{
+ my $rc_secondary = 0;
+ if( ($rc != 0) && ($file =~ /\.data/)){
+ $rc_secondary = 1;
+ }
+
+ if ( $rc_secondary == 1 && defined($rc_primary) ){
+ return 1;
+ }
+
+ if ( $rc_secondary == 1 ){
+ if (! -d "$Conf{'temporal'}/secondary"){
+ mkdir "$Conf{'temporal'}/secondary";
+ }
+ eval {
+ copy("$file", "$Conf{'temporal'}/secondary/");
+ };
+ if ($@) {
+ # We shouldn't reach this point...
+ die ("Cannot write on $Conf{'temporal'}/secondary/");
+ }
+ return 0;
+ }
+
+ if ( defined($rc_primary) ){
+ if (! -d "$Conf{'temporal'}/primary"){
+ mkdir "$Conf{'temporal'}/primary";
+ }
+ eval {
+ copy("$file", "$Conf{'temporal'}/primary/");
+ };
+ if ($@) {
+ # We shouldn't reach this point...
+ die ("Cannot write on $Conf{'temporal'}/primary/");
+ }
+ return 0;
+ }
+
+ if ( $rc_secondary == 0 && !defined($rc_primary) ){
+ return 0;
+ }
+ }
+ }
+ elsif ( ($Conf{'secondary_mode'} eq 'always') && defined($flag_always) ){
+ return $rc;
+ }
+ else{
+ return $rc unless (defined ($secondary));
+
+ # Send the file to the secondary server
+ return $rc unless ($Conf{'secondary_mode'} eq 'always' || ($Conf{'secondary_mode'} eq 'on_error' && $rc != 0));
+
+ swap_servers ();
+ $rc = send_file ($file);
+ swap_servers ();
+ return $rc;
+ }
}
################################################################################
# Send buffered XML files.
################################################################################
-sub send_buffered_xml_files () {
-
+sub send_buffered_xml_files ($;$) {
+ my ($temporal_file, $flag_always) = @_;
# Read XML files from the temporal directory
- opendir(TEMPORAL, $Conf{'temporal'}) or return;
- while (my $xml_file = readdir(TEMPORAL)) {
-
+ opendir(TEMPORAL, $temporal_file) or return;
+ if (defined($flag_always) && ($flag_always == 2)){
+ swap_servers ();
+ }
+ while (my $xml_file = readdir(TEMPORAL)) {
# Skip non data files and symlinks
- next if ($xml_file !~ m/^$Conf{'agent_name'}\.[0-9]+\.data$/ || -l "$Conf{'temporal'}/$xml_file");
-
- my $rc = send_file ("$Conf{'temporal'}/$xml_file", 1);
-
+ next if ($xml_file !~ m/^$Conf{'agent_name'}\.[0-9]+\.data$/ || -l "$temporal_file/$xml_file");
+ my $rc = send_file ("$temporal_file/$xml_file", 1, undef, $flag_always);
if ($rc == 0) {
if ($Conf{'debug'} eq '1') {
- rename "$Conf{'temporal'}/$xml_file", "$Conf{'temporal'}/$xml_file". "sent";
+ rename "$temporal_file/$xml_file", "$temporal_file/$xml_file". "sent";
} else {
- unlink ("$Conf{'temporal'}/$xml_file");
+ unlink ("$temporal_file/$xml_file");
}
}
}
+ if (defined($flag_always) && ($flag_always == 2)){
+ swap_servers ();
+ }
}
################################################################################
@@ -2769,7 +2833,20 @@ while (1) {
# Send buffered XML data files
if ($Conf{'xml_buffer'} == 1) {
- send_buffered_xml_files ();
+ if($Conf{'secondary_mode'} eq 'always'){
+ $Conf{'__temporal_primary'} = "$Conf{'temporal'}/primary";
+ $Conf{'__temporal_secondary'} = "$Conf{'temporal'}/secondary";
+ if (-d "$Conf{'__temporal_primary'}"){
+ send_buffered_xml_files ($Conf{'__temporal_primary'}, 1);
+ }
+ if (-d "$Conf{'__temporal_secondary'}"){
+ send_buffered_xml_files ($Conf{'__temporal_secondary'}, 2);
+ }
+ send_buffered_xml_files ($Conf{'temporal'});
+ }
+ else{
+ send_buffered_xml_files ($Conf{'temporal'});
+ }
}
}
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 342ffc877a..3dba4fdd04 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.705
-%define release 170629
+%define version 7.0NG.708
+%define release 170728
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 ef028febc6..2eeae4c183 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.705
-%define release 170629
+%define version 7.0NG.708
+%define release 170728
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 fb451f2032..2aa06d73ec 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.705"
-PI_BUILD="170629"
+PI_VERSION="7.0NG.708"
+PI_BUILD="170728"
OS_NAME=`uname -s`
FORCE=0
@@ -150,6 +150,13 @@ uninstall () {
rm /Library/LaunchDaemons/com.pandorafms.pandorafms.plist 2> /dev/null
fi
+ # Stops the agent on uninstall
+ if [ -f $PANDORA_BASE/etc/init.d/pandora_agent_daemon ]; then
+ $PANDORA_BASE/etc/init.d/pandora_agent_daemon stop 12> /dev/null
+ else
+ echo "$PANDORA_BASE/etc/init.d/pandora_agent_daemon not found to stop agent"
+ fi
+
echo "Removing Pandora FMS Agent..."
rm -Rf $PANDORA_BASE$PANDORA_BIN 2> /dev/null
rm -Rf $PANDORA_BASE$PANDORA_EXEC_BIN 2> /dev/null
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 93ba47c6cf..288e42e3a7 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-2014 Artica Soluciones Tecnologicas
-# Version 7.0NG.705
+# Version 7.0NG.708
# 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
@@ -36,7 +36,7 @@ temporal "%ProgramFiles%\pandora_agent\temp"
# If set to __rand__ the agent will generate a random name.
#agent_name_cmd cscript.exe //B "%ProgramFiles%\Pandora_Agent\util\agentname.vbs"
agent_name_cmd __rand__
-
+
#Parent agent_name
#parent_agent_name caprica
@@ -77,7 +77,7 @@ server_port 41121
# If set to 1 disables log writing into pandora_agent.log
#disable_logfile 1
-# Debug mode do not copy XML data files to server.
+# Debug mode renames XML in the temp folder and continues running
# debug 1
# If set to 1 allows the agent to be configured via the web console
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 5006cee278..7791ee6337 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.705}
+{Pandora FMS Windows Agent v7.0NG.708}
ApplicationID
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
-{170629}
+{170728}
ViewReadme
{Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index b9b7df32b0..bc5b0fbfee 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.705(Build 170629)")
+#define PANDORA_VERSION ("7.0NG.708(Build 170728)")
string pandora_path;
string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 858c230a6b..0ed14aaa07 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.705(Build 170629))"
+ VALUE "ProductVersion", "(7.0NG.708(Build 170728))"
VALUE "FileVersion", "1.0.0.0"
END
END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 5d80c99ce8..80dd9486d9 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-console
-Version: 7.0NG.705-170629
+Version: 7.0NG.708-170728
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 10fb7c6135..d5b24dfee2 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.705-170629"
+pandora_version="7.0NG.708-170728"
package_pear=0
package_pandora=1
diff --git a/pandora_console/extensions/agents_alerts.php b/pandora_console/extensions/agents_alerts.php
index 91dc8a630c..97f1bc7589 100755
--- a/pandora_console/extensions/agents_alerts.php
+++ b/pandora_console/extensions/agents_alerts.php
@@ -93,7 +93,7 @@ function mainAgentsAlerts() {
$groups = users_get_groups ();
$filter_groups .= ''.__('Group').'';
- $filter_groups .= html_print_select_groups(false, "AR", true, 'group_id', $group_id, false, '', '', true, false, true, '', false , 'width: 100px; margin-right: 10px;; margin-top: 5px;');
+ $filter_groups .= html_print_select_groups(false, "AR", true, 'group_id', $group_id, false, '', '', true, false, true, '', false , 'margin-right: 10px; margin-top: 5px;');
$check = ''.__('Show modules without alerts').'';
$check .= html_print_checkbox('slides_ids[]', $d['id'], $show_modules, true, false, '', true);
diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php
index 2c7a9147b8..cb6fe8cd42 100644
--- a/pandora_console/extensions/agents_modules.php
+++ b/pandora_console/extensions/agents_modules.php
@@ -528,24 +528,24 @@ function mainAgentsModules() {
echo '';
switch ($status) {
case AGENT_MODULE_STATUS_NORMAL:
- ui_print_status_image ('module_ok.png', modules_get_last_value($module_id), false, array('width' => '20px', 'height' => '20px'));
+ ui_print_status_image ('module_ok.png', modules_get_last_value($module_id), false);
break;
case AGENT_MODULE_STATUS_CRITICAL_BAD:
- ui_print_status_image ('module_critical.png', modules_get_last_value($module_id), false, array('width' => '20px', 'height' => '20px'));
+ ui_print_status_image ('module_critical.png', modules_get_last_value($module_id), false);
break;
case AGENT_MODULE_STATUS_WARNING:
- ui_print_status_image ('module_warning.png', modules_get_last_value($module_id), false, array('width' => '20px', 'height' => '20px'));
+ ui_print_status_image ('module_warning.png', modules_get_last_value($module_id), false);
break;
case AGENT_MODULE_STATUS_UNKNOWN:
- ui_print_status_image ('module_unknown.png', modules_get_last_value($module_id), false, array('width' => '20px', 'height' => '20px'));
+ ui_print_status_image ('module_unknown.png', modules_get_last_value($module_id), false);
break;
case AGENT_MODULE_STATUS_NORMAL_ALERT:
case AGENT_MODULE_STATUS_WARNING_ALERT:
case AGENT_MODULE_STATUS_CRITICAL_ALERT:
- ui_print_status_image ('module_alertsfired.png', modules_get_last_value($module_id), false, array('width' => '20px', 'height' => '20px'));
+ ui_print_status_image ('module_alertsfired.png', modules_get_last_value($module_id), false);
break;
case 4:
- ui_print_status_image ('module_no_data.png', modules_get_last_value($module_id), false, array('width' => '20px', 'height' => '20px'));
+ ui_print_status_image ('module_no_data.png', modules_get_last_value($module_id), false);
break;
}
echo '';
diff --git a/pandora_console/extensions/db_status.php b/pandora_console/extensions/db_status.php
index ca69e0282b..e5e1d84331 100755
--- a/pandora_console/extensions/db_status.php
+++ b/pandora_console/extensions/db_status.php
@@ -127,7 +127,7 @@ function extension_db_status_execute_checks($db_user, $db_password, $db_host, $d
ui_print_error_message(
__('Unsuccessful installed tables into the testing DB'));
}
- else {
+ else {/*
if (enterprise_installed()) {
$install_tables_enterprise =
extension_db_status_execute_sql_file(
@@ -139,7 +139,7 @@ function extension_db_status_execute_checks($db_user, $db_password, $db_host, $d
__('Unsuccessful installed enterprise tables into the testing DB'));
}
}
-
+ */
extension_db_check_tables_differences(
$connection_test,
$connection_system,
@@ -159,6 +159,7 @@ function extension_db_check_tables_differences($connection_test,
global $config;
+
// --------- Check the tables --------------------------------------
mysql_select_db($db_name_test, $connection_test);
$result = mysql_query("SHOW TABLES", $connection_test);
@@ -170,9 +171,8 @@ function extension_db_check_tables_differences($connection_test,
//~ $tables_test = array_merge($tables_test,
//~ extension_db_status_extension_tables());
-
- mysql_select_db($db_name_system, $connection_system);
- $result = mysql_query("SHOW TABLES", $connection_system);
+ mysql_select_db($db_name_system, $connection_test);
+ $result = mysql_query("SHOW TABLES", $connection_test);
$tables_system = array();
while ($row = mysql_fetch_array ($result)) {
$tables_system[] = $row[0];
@@ -227,8 +227,8 @@ function extension_db_check_tables_differences($connection_test,
- mysql_select_db($db_name_system, $connection_system);
- $result = mysql_query("EXPLAIN " . $table, $connection_system);
+ mysql_select_db($db_name_system, $connection_test);
+ $result = mysql_query("EXPLAIN " . $table, $connection_test);
$fields_system = array();
if (!empty($result)) {
while ($row = mysql_fetch_array ($result)) {
diff --git a/pandora_console/extras/mr/4.sql b/pandora_console/extras/mr/4.sql
new file mode 100644
index 0000000000..f189cbce3c
--- /dev/null
+++ b/pandora_console/extras/mr/4.sql
@@ -0,0 +1,17 @@
+START TRANSACTION;
+
+alter table tusuario add autorefresh_white_list text not null default '';
+ALTER TABLE tserver_export MODIFY name varchar(600) BINARY NOT NULL default '';
+
+CREATE TABLE IF NOT EXISTS `tpolicy_groups` (
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `id_policy` int(10) unsigned default '0',
+ `id_group` int(10) unsigned default '0',
+ `policy_applied` tinyint(1) unsigned default '0',
+ `pending_delete` tinyint(1) unsigned default '0',
+ `last_apply_utimestamp` int(10) unsigned NOT NULL default 0,
+ PRIMARY KEY (`id`),
+ UNIQUE (`id_policy`, `id_group`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+COMMIT;
\ No newline at end of file
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 4d8634346c..a629abc0ad 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -181,6 +181,20 @@ CREATE TABLE IF NOT EXISTS `tpolicy_agents` (
UNIQUE (`id_policy`, `id_agent`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+-- -----------------------------------------------------
+-- Table `tpolicy_groups`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tpolicy_groups` (
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `id_policy` int(10) unsigned default '0',
+ `id_group` int(10) unsigned default '0',
+ `policy_applied` tinyint(1) unsigned default '0',
+ `pending_delete` tinyint(1) unsigned default '0',
+ `last_apply_utimestamp` int(10) unsigned NOT NULL default 0,
+ PRIMARY KEY (`id`),
+ UNIQUE (`id_policy`, `id_group`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
-- ---------------------------------------------------------------------
-- Table `tdashboard`
-- ---------------------------------------------------------------------
@@ -710,6 +724,7 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` (
`module_names` TEXT,
`module_free_text` TEXT,
`each_agent` tinyint(1) default 1,
+ `historical_db` tinyint(1) UNSIGNED NOT NULL default 0,
PRIMARY KEY(`id_rc`)
) ENGINE = InnoDB DEFAULT CHARSET=utf8;
@@ -1135,10 +1150,10 @@ ALTER TABLE titem MODIFY `source_data` int(10) unsigned;
INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
-INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 1);
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 4);
UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
-INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '704');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '708');
-- ---------------------------------------------------------------------
-- Table `tplanned_downtime_agents`
@@ -1167,6 +1182,7 @@ ALTER TABLE tevent_filter ADD COLUMN `date_to` date DEFAULT NULL;
ALTER TABLE tusuario ADD COLUMN `id_filter` int(10) UNSIGNED NULL DEFAULT NULL;
ALTER TABLE tusuario ADD CONSTRAINT `fk_id_filter` FOREIGN KEY (`id_filter`) REFERENCES tevent_filter(`id_filter`) ON DELETE SET NULL;
ALTER TABLE tusuario ADD COLUMN `session_time` int(10) signed NOT NULL default '0';
+alter table tusuario add autorefresh_white_list text not null default '';
-- ---------------------------------------------------------------------
-- Table `tagente_modulo`
@@ -1335,6 +1351,16 @@ CREATE TABLE IF NOT EXISTS `tcontainer` (
INSERT INTO `tcontainer` SET `name` = 'Default graph container';
+-- ----------------------------------------------------------------------
+-- Table `treset_pass_history`
+-- ----------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `treset_pass_history` (
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `id_user` varchar(60) NOT NULL,
+ `reset_moment` date default NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
-- ---------------------------------------------------------------------
-- Table `tcontainer_item`
-- ---------------------------------------------------------------------
@@ -1371,6 +1397,12 @@ UPDATE tgis_map_connection SET conection_data = '{"type":"OSM","url":"http://til
ALTER TABLE tpolicy_modules MODIFY post_process double(24,15) default 0;
+-- ---------------------------------------------------------------------
+-- Table `tserver_export`
+-- ---------------------------------------------------------------------
+
+ALTER TABLE tserver_export MODIFY `name` varchar(600) BINARY NOT NULL default '';
+
-- ---------------------------------------------------------------------
-- Table `tgraph_source` column 'id_server'
-- ---------------------------------------------------------------------
@@ -1387,4 +1419,4 @@ PREPARE pr_oum707 FROM @st_oum707;
EXECUTE pr_oum707;
DEALLOCATE PREPARE pr_oum707;
-COMMIT;
+COMMIT;
\ No newline at end of file
diff --git a/pandora_console/general/check_image_module.php b/pandora_console/general/check_image_module.php
new file mode 100644
index 0000000000..422b1de7ba
--- /dev/null
+++ b/pandora_console/general/check_image_module.php
@@ -0,0 +1,25 @@
+
+
+
diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php
index 64564d300a..99cebe8f2d 100644
--- a/pandora_console/general/footer.php
+++ b/pandora_console/general/footer.php
@@ -32,13 +32,18 @@ if (!$config["MR"]) {
echo '