From b61f55264987fce5c1499e487f83bc06a8a35f4d Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 9 Mar 2017 00:01:19 +0100 Subject: [PATCH 01/14] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index ca8a66c3b7..65564c3b4f 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: NG_BETA-170308 +Version: NG_BETA-170309 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 e4cae3285e..6406308f11 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="NG_BETA-170308" +pandora_version="NG_BETA-170309" 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 b0bb178d2d..bb19f649ad 100755 --- 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 => 'NG_BETA'; -use constant AGENT_BUILD => '170308'; +use constant AGENT_BUILD => '170309'; # 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 88f84d6a01..f2c9059faa 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 NG_BETA -%define release 170308 +%define release 170309 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 afab84c1f5..1a0689262a 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 NG_BETA -%define release 170308 +%define release 170309 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 4ee88b5849..eaa738e408 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="NG_BETA" -PI_BUILD="170308" +PI_BUILD="170309" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 1ba963400e..88dfde1029 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170308} +{170309} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 64d6eea57b..a8c86c2fa6 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 ("NG_BETA(Build 170308)") +#define PANDORA_VERSION ("NG_BETA(Build 170309)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index da79779ad9..e44b3e6dd6 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", "(NG_BETA(Build 170308))" + VALUE "ProductVersion", "(NG_BETA(Build 170309))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 464eb76492..215c06dd07 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: NG_BETA-170308 +Version: NG_BETA-170309 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 bae96238cf..4ba2900e81 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="NG_BETA-170308" +pandora_version="NG_BETA-170309" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index e716317c1a..23b911520c 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 = 'PC170308'; +$build_version = 'PC170309'; $pandora_version = 'vNG_BETA'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 492717ab80..5acb62b86e 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Thu, 9 Mar 2017 08:10:20 +0100 Subject: [PATCH 02/14] Updated version string to 7.0NG_BETA to avoid problems with package managers. --- pandora_agents/pc/AIX/pandora_agent.conf | 2 +- pandora_agents/pc/FreeBSD/pandora_agent.conf | 2 +- pandora_agents/pc/HP-UX/pandora_agent.conf | 2 +- pandora_agents/pc/Linux/pandora_agent.conf | 2 +- pandora_agents/pc/NT4/pandora_agent.conf | 2 +- pandora_agents/pc/SunOS/pandora_agent.conf | 2 +- pandora_agents/pc/Win32/pandora_agent.conf | 2 +- pandora_agents/shellscript/aix/pandora_agent.conf | 2 +- pandora_agents/shellscript/bsd-ipso/pandora_agent.conf | 2 +- pandora_agents/shellscript/hp-ux/pandora_agent.conf | 2 +- pandora_agents/shellscript/linux/pandora_agent.conf | 2 +- pandora_agents/shellscript/mac_osx/pandora_agent.conf | 2 +- pandora_agents/shellscript/openWRT/pandora_agent.conf | 2 +- pandora_agents/shellscript/solaris/pandora_agent.conf | 2 +- pandora_agents/unix/AIX/pandora_agent.conf | 2 +- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/Darwin/pandora_agent.conf | 2 +- pandora_agents/unix/FreeBSD/pandora_agent.conf | 2 +- pandora_agents/unix/HP-UX/pandora_agent.conf | 2 +- pandora_agents/unix/Linux/pandora_agent.conf | 2 +- pandora_agents/unix/NT4/pandora_agent.conf | 2 +- pandora_agents/unix/NetBSD/pandora_agent.conf | 2 +- pandora_agents/unix/SunOS/pandora_agent.conf | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 4 ++-- pandora_agents/unix/pandora_agent.spec | 4 ++-- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/bin/pandora_agent.conf | 2 +- pandora_agents/win32/installer/pandora.mpi | 6 +++--- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 4 ++-- pandora_console/pandora_console.spec | 4 ++-- pandora_console/pandora_console_install | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/conf/pandora_server.conf.new | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 4 ++-- pandora_server/pandora_server.spec | 4 ++-- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 49 files changed, 57 insertions(+), 57 deletions(-) diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf index f32ec18561..1650643ec2 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 NG_BETA, AIX version +# Version 7.0NG_BETA, 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 6c7e89b18c..58e23b776b 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 NG_BETA, FreeBSD Version +# Version 7.0NG_BETA, 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 e1172bc30a..53dcf901a3 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 NG_BETA, HP-UX Version +# Version 7.0NG_BETA, 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 498a6244df..8d1db81737 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 NG_BETA, GNU/Linux +# Version 7.0NG_BETA, 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 7a3316fd56..75eef19ca9 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 NG_BETA, GNU/Linux +# Version 7.0NG_BETA, 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 5665475986..2823713fa4 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 NG_BETA, Solaris Version +# Version 7.0NG_BETA, 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 8768d6de78..2ff3089f44 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 NG_BETA +# Version 7.0NG_BETA # 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 71a73198f4..811d472baf 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 NG_BETA, AIX version +# Version 7.0NG_BETA, 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 c1de0a3e9c..b1c8d7406b 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 NG_BETA +# Version 7.0NG_BETA # 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 dc2778c576..175d3371ed 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 NG_BETA, HPUX Version +# Version 7.0NG_BETA, HPUX Version # General Parameters # ================== diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf index 7467e85381..b4d5db4d5a 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 NG_BETA +# Version 7.0NG_BETA # 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 6087df3af8..64f99a83c8 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 NG_BETA +# Version 7.0NG_BETA # 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 735998708e..cf58de39b5 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 NG_BETA +# Version 7.0NG_BETA # 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 8465b8f08d..737f9fcc5f 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 NG_BETA, Solaris version +# Version 7.0NG_BETA, Solaris version # General Parameters # ================== diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index b10c928bc2..a5d463a1fb 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 NG_BETA, AIX version +# Version 7.0NG_BETA, 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 65564c3b4f..b509aa7eaf 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: NG_BETA-170309 +Version: 7.0NG_BETA 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 6406308f11..37fca6f3e4 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="NG_BETA-170309" +pandora_version="7.0NG_BETA" 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 a13426b27c..44fab542ff 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 NG_BETA, GNU/Linux +# Version 7.0NG_BETA, 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 348d66cdc5..eb74108410 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 NG_BETA, FreeBSD Version +# Version 7.0NG_BETA, 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 de373248d6..2d7022b016 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 NG_BETA, HP-UX Version +# Version 7.0NG_BETA, 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 ec6376ba0b..8fac171864 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 NG_BETA, GNU/Linux +# Version 7.0NG_BETA, 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 3216e994db..b99f92ab59 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 NG_BETA, GNU/Linux +# Version 7.0NG_BETA, 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 b8ade9c00a..fba71c643a 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 NG_BETA, NetBSD Version +# Version 7.0NG_BETA, 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 998cd29f9c..744a778cc1 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 NG_BETA, Solaris Version +# Version 7.0NG_BETA, 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 bb19f649ad..576762afbe 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -40,7 +40,7 @@ my $Sem = undef; # Semaphore used to control the number of threads my $ThreadSem = undef; -use constant AGENT_VERSION => 'NG_BETA'; +use constant AGENT_VERSION => '7.0NG_BETA'; use constant AGENT_BUILD => '170309'; # Agent log default file size maximum and instances diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index f2c9059faa..161523ffec 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 NG_BETA -%define release 170309 +%define version 7.0NG_BETA +%define release 1 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 1a0689262a..ddfcb0d53b 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 NG_BETA -%define release 170309 +%define version 7.0NG_BETA +%define release 1 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 eaa738e408..d46adb6476 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -9,7 +9,7 @@ # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license. # ********************************************************************** -PI_VERSION="NG_BETA" +PI_VERSION="7.0NG_BETA" PI_BUILD="170309" OS_NAME=`uname -s` diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index 9ac8f91249..e59575f5c7 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 NG_BETA +# Version 7.0NG_BETA # 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 88dfde1029..5e6f1cf6cd 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 vNG_BETA} +{Pandora FMS Windows Agent v7.0NG_BETA} ApplicationID {17E3D2CF-CA02-406B-8A80-9D31C17BD08F} @@ -75,7 +75,7 @@ InstallPassword {} InstallVersion -{NG_BETA.0.0} +{7.0.0.0} Language,ca {No} @@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives {No} Windows,Executable -{<%AppName%>-<%Version%>-Setup<%Ext%>} +{<%AppName%>-Setup<%Ext%>} Windows,FileDescription {<%AppName%> <%Version%> Setup} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index a8c86c2fa6..9a540878b8 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 ("NG_BETA(Build 170309)") +#define PANDORA_VERSION ("7.0NG_BETA(Build 170309)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index e44b3e6dd6..43db2aa298 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", "(NG_BETA(Build 170309))" + VALUE "ProductVersion", "(7.0NG_BETA(Build 170309))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 215c06dd07..2cf0270dd3 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: NG_BETA-170309 +Version: 7.0NG_BETA 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 4ba2900e81..0a8a333017 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="NG_BETA-170309" +pandora_version="7.0NG_BETA" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 23b911520c..226f859be7 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -23,7 +23,7 @@ * Pandora build version and version */ $build_version = 'PC170309'; -$pandora_version = 'vNG_BETA'; +$pandora_version = 'v7.0NG_BETA'; // Do not overwrite default timezone set if defined. $script_tz = @date_default_timezone_get(); diff --git a/pandora_console/install.php b/pandora_console/install.php index 5acb62b86e..30a6d75cc2 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -70,7 +70,7 @@
Date: Thu, 9 Mar 2017 08:58:53 +0100 Subject: [PATCH 03/14] fixed errors in mail module_graph --- pandora_console/include/functions_api.php | 13 +++++++++---- pandora_server/lib/PandoraFMS/Core.pm | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 64533b7c82..03cc57036e 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -9553,10 +9553,15 @@ function api_set_delete_special_day($id_special_day, $thrash2, $thrash3, $thrash * @param $thrash4 Don't use. * * example: - * api.php?op=get&op2=module_graph&id=1&other=3600 + * http://localhost/pandora_console/include/ + * api.php?op=get&op2=module_graph&id=5&other=40000%7C1&other_mode=url_encode_separator_%7C&apipass=1234 + * &api=1&user=admin&pass=pandora * */ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) { + + global $config; + if (defined ('METACONSOLE')) { return; } @@ -9574,9 +9579,9 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) { } $graph_seconds = - (!empty($other) && isset($other['data'])) + (!empty($other) && isset($other['data'][0])) ? - $other['data'] + $other['data'][0] : SECONDS_1HOUR; // 1 hour by default @@ -9636,7 +9641,7 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) { // returnError('error_module_graph', __('')); } else { - if($other['data'] < 40000){ + if($other['data'][1]){ header('Content-type: text/html'); returnData('string', array('type' => 'string', 'data' => '')); } else { diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index dc788306dd..467d28723c 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -1103,8 +1103,8 @@ sub pandora_execute_action ($$$$$$$$$;$) { my $subst_func = sub { my $hours = shift; my $period = $hours * 3600; # Hours to seconds - $params->{"other"} = $period; - + $params->{"other"} = $period . '%7C0'; + $params->{"other_mode"} = 'url_encode_separator_%7C'; my $cid = 'module_graph_' . $hours . 'h'; if (! exists($module_graph_list->{$cid}) && defined $url) { From e7b14143ed9876c2da6ec9762e1f3c89704f42f7 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 9 Mar 2017 10:57:03 +0100 Subject: [PATCH 04/14] add new macro _homeurl_ --- pandora_server/lib/PandoraFMS/Config.pm | 3 +++ pandora_server/lib/PandoraFMS/Core.pm | 1 + 2 files changed, 4 insertions(+) diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 760ac38475..59ff267751 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -167,6 +167,9 @@ sub pandora_get_sharedconfig ($$) { $pa_config->{'replication_limit'} = pandora_get_tconfig_token ($dbh, 'replication_limit', 1000); $pa_config->{'include_agents'} = pandora_get_tconfig_token ($dbh, 'include_agents', 0); + #Public url + $pa_config->{'public_url'} = pandora_get_tconfig_token ($dbh, 'public_url', 'http://localhost/pandora_console'); + if ($pa_config->{'include_agents'} eq '') { $pa_config->{'include_agents'} = 0; } diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 467d28723c..92f213a9c9 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -985,6 +985,7 @@ sub pandora_execute_action ($$$$$$$$$;$) { _timezone_ => strftime ("%Z", localtime()), _data_ => $data, _prevdata_ => undef, + _homeurl_ => $pa_config->{'public_url'}, _alert_name_ => $alert->{'name'}, _alert_description_ => $alert->{'description'}, _alert_threshold_ => $alert->{'time_threshold'}, From b7d44c4c628a746ca019d390454b07564e64fda9 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 9 Mar 2017 11:14:58 +0100 Subject: [PATCH 05/14] add new macro in helps --- pandora_console/include/help/en/help_alert_config.php | 1 + pandora_console/include/help/es/help_alert_config.php | 1 + 2 files changed, 2 insertions(+) diff --git a/pandora_console/include/help/en/help_alert_config.php b/pandora_console/include/help/en/help_alert_config.php index 24082e6a74..1ce11e5ce3 100644 --- a/pandora_console/include/help/en/help_alert_config.php +++ b/pandora_console/include/help/en/help_alert_config.php @@ -61,6 +61,7 @@ Apart from the defined module macros, the following macros are also available:
  • _groupother_ : Other information about the group. Configured when the group is created.
  • _email_tag_ : Emails associated to the module tags.
  • _modulegraph_nh_: (Only for alerts that use the command eMail) Returns an image of a module graph with a period of n hours (eg. _modulegraph_24h_). A correct setup of the connection between the server and the console's api is required. This setup is done into the server's configuration file.
    • +
  • _homeurl_ : It is a link of the public URL this must be configured in the general options of the setup.

    • diff --git a/pandora_console/include/help/es/help_alert_config.php b/pandora_console/include/help/es/help_alert_config.php index 9540e75b86..483e494332 100644 --- a/pandora_console/include/help/es/help_alert_config.php +++ b/pandora_console/include/help/es/help_alert_config.php @@ -63,6 +63,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
  • _groupother_ : Otra información sobre el grupo. Se configura al crear el grupo.
  • _email_tag_ : Emails asociados a los tags de módulos.
  • _modulegraph_nh_: (Sólo para alertas que usen el comando eMail) Devuelve una imagen codificada en base64 de una gráfica del módulo con un período de n horas (eg. _modulegraph_24h_). Requiere de una configuración correcta de la conexión del servidor a la consola vía api, la cual se realiza en el fichero de configuración del servidor.
    • +
  • _homeurl_ : Es un link de la URL pública esta debe de estar configurada en las opciones generales del setup.

    • Ejemplo: Error en el agente _agent_: _alert_description_ From baf16db1549b5f98aff89aee929e0396a172264c Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Thu, 9 Mar 2017 11:40:32 +0100 Subject: [PATCH 06/14] Fixed problems with bulk delete alerts opertation. Gitlab: #492 --- pandora_console/include/javascript/pandora.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index 3c38c43a87..b46e6a4b18 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -329,13 +329,14 @@ function agent_changed_by_multiple_agents_with_alerts (event, id_agent, selected selection_mode = 'common'; } - template = $('#id_alert_template option:selected').attr("value"); + template = $('#id_alert_template option:selected').val(); + $('#module').attr ('disabled', 1); $('#module').empty (); $('#module').append ($('').html ("Loading...").attr ("value", 0)); jQuery.post ('ajax.php', {"page": "operation/agentes/ver_agente", - "get_agent_modules_alerts_json_for_multiple_agents": 1, + "get_agent_modules_multiple_alerts_json_for_multiple_agents": 1, "template": template, "id_agent[]": idAgents, "selection_mode": selection_mode From b0f600e9f086ba64d7d547fd97144389474b28af Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Thu, 9 Mar 2017 11:55:12 +0100 Subject: [PATCH 07/14] Add AW acl in network exteension tool. Gitlab: #498 --- pandora_console/extensions/net_tools.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/extensions/net_tools.php b/pandora_console/extensions/net_tools.php index fcd54fbfdc..f6736f366a 100644 --- a/pandora_console/extensions/net_tools.php +++ b/pandora_console/extensions/net_tools.php @@ -20,7 +20,7 @@ $id_agente = get_parameter ("id_agente"); $address = agents_get_address($id_agente); if (!empty($address) || empty($id_agente)) { - extensions_add_opemode_tab_agent ('network_tools','Network Tools','extensions/net_tools/nettool.png',"main_net_tools", "v1r1"); + extensions_add_opemode_tab_agent ('network_tools','Network Tools','extensions/net_tools/nettool.png',"main_net_tools", "v1r1", 'AW'); } function whereis_the_command ($command) { From 66e7d71858031cec2e4b5104a0ac4d36e278fbc1 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 9 Mar 2017 12:16:20 +0100 Subject: [PATCH 08/14] fixed errors in search tree view --- pandora_console/include/class/Tree.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php index 7d44dc1df4..902e964db8 100644 --- a/pandora_console/include/class/Tree.class.php +++ b/pandora_console/include/class/Tree.class.php @@ -234,7 +234,7 @@ class Tree { // Agent name filter $agent_search_filter = ""; if (!empty($this->filter['searchAgent'])) { - $agent_search_filter = " AND LOWER(ta.nombre) LIKE LOWER('%".$this->filter['searchAgent']."%') OR ta.alias LIKE '%".$this->filter['searchAgent']."%'"; + $agent_search_filter = " AND LOWER(ta.alias) LIKE LOWER('%".$this->filter['searchAgent']."%')"; } // Agent status filter From 54d2ee6790be027dd4267a944a94f4ea9958ccce Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Thu, 9 Mar 2017 12:41:16 +0100 Subject: [PATCH 09/14] Remove file --- pandora_console/include/constants.php.orig | 508 --------------------- 1 file changed, 508 deletions(-) delete mode 100644 pandora_console/include/constants.php.orig diff --git a/pandora_console/include/constants.php.orig b/pandora_console/include/constants.php.orig deleted file mode 100644 index 158e28fa9e..0000000000 --- a/pandora_console/include/constants.php.orig +++ /dev/null @@ -1,508 +0,0 @@ ->>>>>> develop -?> From cb2ff6e9f8a96968e798a072736a7ccf91247d3b Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Thu, 9 Mar 2017 12:50:51 +0100 Subject: [PATCH 10/14] Fixed problems with resize imgs when dont do it. Gitlab: #504 --- .../include/functions_visual_map.php | 32 +++++-------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index ad38e4a4e9..c4767a3e16 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -1160,11 +1160,7 @@ function visual_map_print_item($mode = "read", $layoutData, if (is_file($config['homedir'] . '/' . $img)) $infoImage = getimagesize($config['homedir'] . '/' . $img); - if ($height == 0 || $height == 0) { - $height = '70px'; - $width = '70px'; - } - else { + if ($height !== 0 || $height !== 0) { $height = (integer)($proportion['proportion_height'] * $height); $width = (integer)($proportion['proportion_width'] * $width); } @@ -1172,40 +1168,28 @@ function visual_map_print_item($mode = "read", $layoutData, $imgpos = ''; - if($layoutData['label_position']=='up'){ + if ($layoutData['label_position']=='up') { echo io_safe_output($text); } - if($layoutData['label_position']=='left'){ + if ($layoutData['label_position']=='left') { $imgpos = 'float:right'; } - else if($layoutData['label_position']=='right'){ + elseif ($layoutData['label_position']=='right') { $imgpos = 'float:left'; } - $varsize = getimagesize($img); + if ($width == 0 || $height == 0) { - if($varsize[0] > 150 || $varsize[1] > 150){ - echo html_print_image($img, true, - array("class" => "image", - "id" => "image_" . $id, - "width" => "70px", - "height" => "70px", - "title" => $img_style_title, - "style" => $borderStyle.$imgpos), false, - false, false, $isExternalLink); - } - else{ - echo html_print_image($img, true, + echo html_print_image($img, true, array("class" => "image", "id" => "image_" . $id, "title" => $img_style_title, "style" => $borderStyle.$imgpos), false, false, false, $isExternalLink); - } } else{ - echo html_print_image($img, true, - array("class" => "image", + echo html_print_image($img, true, + array("class" => "image", "id" => "image_" . $id, "width" => $width, "height" => $height, From 8de4984fafd8966395090883d1153dcf37a7dad5 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Thu, 9 Mar 2017 15:40:59 +0100 Subject: [PATCH 11/14] Fixed dialog of system warning alerts. Gitlab: #506 --- pandora_console/general/header.php | 2 -- .../include/javascript/jquery.pandora.js | 22 ++++++++++++++----- pandora_console/index.php | 1 + pandora_console/operation/system_alert.php | 14 ++++++------ 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index ace65271c6..a983ebafbd 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -242,8 +242,6 @@ config_check(); set_pandora_error_for_header('There are one or more minor releases waiting for update, there are required administrator permissions', 'minor release/s available'); } - echo '

    '; - if ($config["alert_cnt"] > 0) { $maintenance_link = 'javascript:'; $maintenance_title = __("System alerts detected - Please fix as soon as possible"); diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js index eb0ec04217..8e1973846c 100644 --- a/pandora_console/include/javascript/jquery.pandora.js +++ b/pandora_console/include/javascript/jquery.pandora.js @@ -59,14 +59,24 @@ $(document).ready (function () { }); $("a.show_systemalert_dialog").click (function () { - $('body').append( "
    " ); - jQuery.get ("ajax.php", + jQuery.get ("ajax.php", {"page": "operation/system_alert"}, function (data, status) { - $("#alert_messages").hide () - .empty () - .append (data) - .show (); + $("#alert_messages").html(data); + $("#alert_messages").dialog({ + resizable: false, + draggable: true, + width: 450, + modal: true, + overlay: { + opacity: 0.5, + background: "black" + }, + open: function (event, ui) { + dialog_open = this; + } + }); + $("#alert_messages").css('padding','0px'); }, "html" ); diff --git a/pandora_console/index.php b/pandora_console/index.php index 5b52479ac3..2765e56d8d 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -933,6 +933,7 @@ if ($config["pure"] == 0) { echo '
    '; } +echo ''; /// Clippy function require_once('include/functions_clippy.php'); clippy_start($sec2); diff --git a/pandora_console/operation/system_alert.php b/pandora_console/operation/system_alert.php index 85bbdf26c4..31334e159a 100644 --- a/pandora_console/operation/system_alert.php +++ b/pandora_console/operation/system_alert.php @@ -7,10 +7,10 @@ echo "
    "; -if(!enterprise_installed()){ +if (!enterprise_installed()) { echo "Community version"; } -else{ +else { echo "Enterprise version"; } @@ -18,10 +18,11 @@ echo "
    "; +echo "
    "; +echo get_pandora_error_for_header(); +echo "
    "; -echo get_pandora_error_for_header()." - -
    +echo "
    OK
    "; @@ -31,8 +32,7 @@ echo get_pandora_error_for_header()." From a06389b6522940fe51b6d1a9d57669e7ef95a670 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Thu, 9 Mar 2017 16:09:50 +0100 Subject: [PATCH 12/14] Change size of rows in bulk add alerts. Gitlab: #490 --- pandora_console/godmode/massive/massive_add_alerts.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/massive/massive_add_alerts.php b/pandora_console/godmode/massive/massive_add_alerts.php index 986de7fe5a..ba8bfa5ad4 100755 --- a/pandora_console/godmode/massive/massive_add_alerts.php +++ b/pandora_console/godmode/massive/massive_add_alerts.php @@ -142,9 +142,9 @@ $table->style[0] = 'font-weight: bold; vertical-align:top'; $table->style[2] = 'font-weight: bold; vertical-align:top'; $table->size = array (); $table->size[0] = '15%'; -$table->size[1] = '40%'; +$table->size[1] = '25%'; $table->size[2] = '15%'; -$table->size[3] = '40%'; +$table->size[3] = '30%'; $table->data = array (); From 94fceaaa5de3ddc8ea4ec3af931984fae57a07f6 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Thu, 9 Mar 2017 19:52:37 +0100 Subject: [PATCH 13/14] Fix printing elements in visual console (revert) - #90 --- .../include/functions_visual_map.php | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index c4767a3e16..ad38e4a4e9 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -1160,7 +1160,11 @@ function visual_map_print_item($mode = "read", $layoutData, if (is_file($config['homedir'] . '/' . $img)) $infoImage = getimagesize($config['homedir'] . '/' . $img); - if ($height !== 0 || $height !== 0) { + if ($height == 0 || $height == 0) { + $height = '70px'; + $width = '70px'; + } + else { $height = (integer)($proportion['proportion_height'] * $height); $width = (integer)($proportion['proportion_width'] * $width); } @@ -1168,28 +1172,40 @@ function visual_map_print_item($mode = "read", $layoutData, $imgpos = ''; - if ($layoutData['label_position']=='up') { + if($layoutData['label_position']=='up'){ echo io_safe_output($text); } - if ($layoutData['label_position']=='left') { + if($layoutData['label_position']=='left'){ $imgpos = 'float:right'; } - elseif ($layoutData['label_position']=='right') { + else if($layoutData['label_position']=='right'){ $imgpos = 'float:left'; } - + $varsize = getimagesize($img); if ($width == 0 || $height == 0) { - echo html_print_image($img, true, + if($varsize[0] > 150 || $varsize[1] > 150){ + echo html_print_image($img, true, + array("class" => "image", + "id" => "image_" . $id, + "width" => "70px", + "height" => "70px", + "title" => $img_style_title, + "style" => $borderStyle.$imgpos), false, + false, false, $isExternalLink); + } + else{ + echo html_print_image($img, true, array("class" => "image", "id" => "image_" . $id, "title" => $img_style_title, "style" => $borderStyle.$imgpos), false, false, false, $isExternalLink); + } } else{ - echo html_print_image($img, true, - array("class" => "image", + echo html_print_image($img, true, + array("class" => "image", "id" => "image_" . $id, "width" => $width, "height" => $height, From 67a31f8a70a731672be39210577edc78f1b033c0 Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 10 Mar 2017 00:01:21 +0100 Subject: [PATCH 14/14] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 4 ++-- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index b509aa7eaf..849a1f32b3 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG_BETA +Version: 7.0NG_BETA-170310 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 37fca6f3e4..a8791abf6b 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_BETA" +pandora_version="7.0NG_BETA-170310" 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 576762afbe..9f592d39b5 100755 --- 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 => '7.0NG_BETA'; -use constant AGENT_BUILD => '170309'; +use constant AGENT_BUILD => '170310'; # 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 161523ffec..18850e9c46 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 7.0NG_BETA -%define release 1 +%define release 170310 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 ddfcb0d53b..0886a43ca4 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 7.0NG_BETA -%define release 1 +%define release 170310 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 d46adb6476..3a8a6f269a 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG_BETA" -PI_BUILD="170309" +PI_BUILD="170310" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 5e6f1cf6cd..c00e06939c 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170309} +{170310} ViewReadme {Yes} @@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives {No} Windows,Executable -{<%AppName%>-Setup<%Ext%>} +{<%AppName%>-<%Version%>-Setup<%Ext%>} Windows,FileDescription {<%AppName%> <%Version%> Setup} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 9a540878b8..ace88cbec6 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_BETA(Build 170309)") +#define PANDORA_VERSION ("7.0NG_BETA(Build 170310)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 43db2aa298..00f4415f47 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_BETA(Build 170309))" + VALUE "ProductVersion", "(7.0NG_BETA(Build 170310))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 2cf0270dd3..fc6615ca0a 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG_BETA +Version: 7.0NG_BETA-170310 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 0a8a333017..9424cfdf65 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_BETA" +pandora_version="7.0NG_BETA-170310" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 226f859be7..82638648dc 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 = 'PC170309'; +$build_version = 'PC170310'; $pandora_version = 'v7.0NG_BETA'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 30a6d75cc2..3b390bdc26 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@