From e3c3fafa434cca5dab083e2cf1b702fedbe067a7 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Fri, 17 Feb 2017 15:39:28 +0100 Subject: [PATCH 01/17] Fixed problems with agent name in visual consoles. Gitlab #257 --- pandora_console/include/functions_visual_map.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 08d06ec4a5..896202dbdb 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -123,7 +123,8 @@ function visual_map_print_item($mode = "read", $layoutData, } $agentname = agents_get_name(agents_get_module_id ($id_module)); - $label = str_replace($agentname,ui_print_truncate_text($agentname, 'agent_small', false, true, false, '…', false),$label); + $label = str_replace(ui_print_truncate_text($agentname, + 'agent_small', false, true, false, '…', false), $agentname, $label); $text = '' . $label .''; if($height == 0){ From 1021655e4378c2ba4595a6ffdb6dbbe6ac697e52 Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 18 Feb 2017 00:01:16 +0100 Subject: [PATCH 02/17] 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 312fb84353..0f6eeabdd1 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0dev-170217 +Version: 7.0dev-170218 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 ae65e48020..d12928e87a 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.0dev-170217" +pandora_version="7.0dev-170218" 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 370d236d11..00536d2125 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0dev'; -use constant AGENT_BUILD => '170217'; +use constant AGENT_BUILD => '170218'; # 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 bbff59f0e8..78d5a964b1 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.0dev -%define release 170217 +%define release 170218 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 9b5eb7dd47..1eaf60d885 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.0dev -%define release 170217 +%define release 170218 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 b68fec7b75..1c7ff5782b 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0dev" -PI_BUILD="170217" +PI_BUILD="170218" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index c5ee8772ae..f023135364 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170217} +{170218} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index d85a2176c7..0ec954729f 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.0dev(Build 170217)") +#define PANDORA_VERSION ("7.0dev(Build 170218)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 927fe1896e..bfa731ffea 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.0dev(Build 170217))" + VALUE "ProductVersion", "(7.0dev(Build 170218))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index d4c29ef620..a65cffc270 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0dev-170217 +Version: 7.0dev-170218 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 9a3f14b765..ebdc0111c5 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.0dev-170217" +pandora_version="7.0dev-170218" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 477675f848..86d55d6077 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 = 'PC170217'; +$build_version = 'PC170218'; $pandora_version = 'v7.0dev'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 868ab19bc0..30a2f77f33 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Sun, 19 Feb 2017 00:01:14 +0100 Subject: [PATCH 03/17] 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 0f6eeabdd1..6113c23407 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0dev-170218 +Version: 7.0dev-170219 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 d12928e87a..31ced43fd3 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.0dev-170218" +pandora_version="7.0dev-170219" 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 00536d2125..83476e721d 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0dev'; -use constant AGENT_BUILD => '170218'; +use constant AGENT_BUILD => '170219'; # 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 78d5a964b1..57bf8b23ef 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.0dev -%define release 170218 +%define release 170219 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 1eaf60d885..ea57d4b0cf 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.0dev -%define release 170218 +%define release 170219 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 1c7ff5782b..e3dfb41227 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0dev" -PI_BUILD="170218" +PI_BUILD="170219" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index f023135364..2d9a968854 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170218} +{170219} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 0ec954729f..be874553a7 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.0dev(Build 170218)") +#define PANDORA_VERSION ("7.0dev(Build 170219)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index bfa731ffea..485f1a2fbf 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.0dev(Build 170218))" + VALUE "ProductVersion", "(7.0dev(Build 170219))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index a65cffc270..938f03e4d2 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0dev-170218 +Version: 7.0dev-170219 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 ebdc0111c5..a43da31f1e 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.0dev-170218" +pandora_version="7.0dev-170219" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 86d55d6077..a1b385caf3 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 = 'PC170218'; +$build_version = 'PC170219'; $pandora_version = 'v7.0dev'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 30a2f77f33..c38af536da 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Mon, 20 Feb 2017 00:01:14 +0100 Subject: [PATCH 04/17] 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 6113c23407..eb1de96bd4 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0dev-170219 +Version: 7.0dev-170220 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 31ced43fd3..edf659ae29 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.0dev-170219" +pandora_version="7.0dev-170220" 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 83476e721d..2fac534783 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0dev'; -use constant AGENT_BUILD => '170219'; +use constant AGENT_BUILD => '170220'; # 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 57bf8b23ef..b9a5b97d47 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.0dev -%define release 170219 +%define release 170220 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 ea57d4b0cf..a0122070e2 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.0dev -%define release 170219 +%define release 170220 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 e3dfb41227..78fac42146 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0dev" -PI_BUILD="170219" +PI_BUILD="170220" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 2d9a968854..4ba564ff88 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170219} +{170220} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index be874553a7..f59f308df1 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.0dev(Build 170219)") +#define PANDORA_VERSION ("7.0dev(Build 170220)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 485f1a2fbf..e7fbd3bedf 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.0dev(Build 170219))" + VALUE "ProductVersion", "(7.0dev(Build 170220))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 938f03e4d2..f89f91db02 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0dev-170219 +Version: 7.0dev-170220 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 a43da31f1e..a02710ef58 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.0dev-170219" +pandora_version="7.0dev-170220" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index a1b385caf3..5a752f1f23 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 = 'PC170219'; +$build_version = 'PC170220'; $pandora_version = 'v7.0dev'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index c38af536da..105c8c1be6 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Mon, 20 Feb 2017 09:50:57 +0100 Subject: [PATCH 05/17] Added data precision to events. Ticket #288 --- pandora_server/lib/PandoraFMS/Config.pm | 4 ++++ pandora_server/lib/PandoraFMS/Core.pm | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index d83a4b6bb8..10867803cf 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -200,6 +200,7 @@ sub pandora_load_config { $pa_config->{"umask"} = "0007"; # environment settings umask applied over chmod (A & (not B)) $pa_config->{"server_threshold"} = 30; $pa_config->{"alert_threshold"} = 60; + $pa_config->{"graph_precision"} = 1; $pa_config->{"log_file"} = "/var/log/pandora_server.log"; $pa_config->{"errorlog_file"} = "/var/log/pandora_server.error"; $pa_config->{"networktimeout"} = 5; # By default, not in config file yet @@ -692,6 +693,9 @@ sub pandora_load_config { elsif ($parametro =~ m/^alert_threshold\s+([0-9]*)/i) { $pa_config->{"alert_threshold"} = clean_blank($1); } + elsif ($parametro =~ m/^graph_precision\s+([0-9]*)/i) { + $pa_config->{"graph_precision"} = clean_blank($1); + } elsif ($parametro =~ m/^network_timeout\s+([0-9]*)/i) { $pa_config->{'networktimeout'}= clean_blank($1); } diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 7a182dfa33..9995dee9dd 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -947,6 +947,13 @@ sub pandora_execute_action ($$$$$$$$$;$) { $group = get_db_single_row ($dbh, 'SELECT * FROM tgrupo WHERE id_grupo = ?', $agent->{'id_grupo'}); } + if (is_numeric($data)) { + my $data_precision = $pa_config->{'graph_precision'}; + $data = sprintf("%.$data_precision" . "f", $data); + $data =~ s/0+$//; + $data =~ s/\.+$//; + } + # Thanks to people of Cordoba univ. for the patch for adding module and # id_agent macros to the alert. @@ -3965,6 +3972,13 @@ sub generate_status_event ($$$$$$$$) { return; } + if (is_numeric($data)) { + my $data_precision = $pa_config->{'graph_precision'}; + $data = sprintf("%.$data_precision" . "f", $data); + $data =~ s/0+$//; + $data =~ s/\.+$//; + } + # Replace macros my %macros = ( _module_ => safe_output($module->{'nombre'}), From f9eb76295178b449864dcba9689a8fa39e310793 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Mon, 20 Feb 2017 10:32:07 +0100 Subject: [PATCH 06/17] Changed license url and update url. Ticket #299 --- pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql | 2 +- pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql | 2 +- pandora_console/include/config_process.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql index f6d63ffb84..f2be7ee94f 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql @@ -157,7 +157,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge 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', 0); -UPDATE tconfig SET value = 'https://firefly.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; +UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; -- --------------------------------------------------------------------- -- Table `tplanned_downtime_agents` diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql index 8147a67416..adbd512800 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql @@ -80,7 +80,7 @@ INSERT INTO tconfig (token, value) VALUES ('big_operation_step_datos_purge', '10 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', 0); -UPDATE tconfig SET value = 'https://firefly.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; +UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; -- --------------------------------------------------------------------- -- Table `tplanned_downtime_agents` diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 5a752f1f23..ef4254ebce 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -166,7 +166,7 @@ if (!isset($config['inventory_changes_blacklist'])) { //NEW UPDATE MANAGER URL if (!isset($config['url_update_manager'])) { config_update_value('url_update_manager', - 'https://firefly.artica.es/pandoraupdate7/server.php'); + 'https://licensing.artica.es/pandoraupdate7/server.php'); } if (defined('METACONSOLE')) { From 40ee2cce0a3f1db3d31f7f08301891b087eb4bc0 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 20 Feb 2017 11:13:47 +0100 Subject: [PATCH 07/17] fixed errors in graphs --- .../images/logo_vertical_water.png | Bin 1866 -> 1110 bytes pandora_console/include/functions_graph.php | 8 ++++---- .../include/graphs/flot/pandora.flot.js | 14 +++++++------- .../include/graphs/functions_flot.php | 1 - 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pandora_console/images/logo_vertical_water.png b/pandora_console/images/logo_vertical_water.png index 2238c38be72113c91e8a981eef89049fca5791cd..11b80755da6219e7226d48b6702782dc197e5e9c 100644 GIT binary patch delta 1088 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 diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 41dbf2d362..93a62c1c05 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -755,12 +755,12 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events, . __('Avg') . ': ' . remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])) . ($unit ? ' ' . $unit : ''); } else if (!$avg_only) { - $legend['max'.$series_suffix] = __('Max').$series_suffix_str.': '.__('Last').': '.remove_right_zeros(number_format($graph_stats['max']['last'], $config['graph_precision'])).' '.$unit.' ; '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['max']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['max']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['max']['min'], $config['graph_precision'])).' '.$unit; - $legend['sum'.$series_suffix] = __('Avg').$series_suffix_str.': '.__('Last').': '.remove_right_zeros(number_format($graph_stats['sum']['last'], $config['graph_precision'])).' '.$unit.' ; '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['sum']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['sum']['min'], $config['graph_precision'])).' '.$unit; - $legend['min'.$series_suffix] = __('Min').$series_suffix_str.': '.__('Last').': '.remove_right_zeros(number_format($graph_stats['min']['last'], $config['graph_precision'])).' '.$unit.' ; '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['min']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['min']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['min']['min'], $config['graph_precision'])).' '.$unit; + $legend['max'.$series_suffix] = __('Max').$series_suffix_str.': '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['max']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['max']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['max']['min'], $config['graph_precision'])).' '.$unit; + $legend['sum'.$series_suffix] = __('Avg').$series_suffix_str.': '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['sum']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['sum']['min'], $config['graph_precision'])).' '.$unit; + $legend['min'.$series_suffix] = __('Min').$series_suffix_str.': '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['min']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['min']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['min']['min'], $config['graph_precision'])).' '.$unit; } else { - $legend['sum'.$series_suffix] = __('Avg').$series_suffix_str.': '.__('Last').': '.remove_right_zeros(number_format($graph_stats['sum']['last'], $config['graph_precision'])).' '.$unit.' ; '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['sum']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['sum']['min'], $config['graph_precision'])).' '.$unit; + $legend['sum'.$series_suffix] = __('Avg').$series_suffix_str.': '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['sum']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['sum']['min'], $config['graph_precision'])).' '.$unit; } //Baseline was replaced by compare graph feature /*if ($baseline) { diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 4c7a47e136..05f55b99e0 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -1537,7 +1537,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, hoverable: true, clickable: true, borderWidth:1, - borderColor: '#666', + borderColor: '#C1C1C1', tickColor: background_color, markings: markings, color: legend_color @@ -2198,10 +2198,10 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, set_watermark(graph_id, plot, $('#watermark_image_'+graph_id).attr('src')); } - adjust_menu(graph_id, plot, parent_height); + adjust_menu(graph_id, plot, parent_height, width); } -function adjust_menu(graph_id, plot, parent_height) { +function adjust_menu(graph_id, plot, parent_height, width) { if ($('#'+graph_id+' .xAxis .tickLabel').eq(0).css('width') != undefined) { left_ticks_width = $('#'+graph_id+' .xAxis .tickLabel').eq(0).css('width').split('px')[0]; } @@ -2234,7 +2234,7 @@ function adjust_menu(graph_id, plot, parent_height) { //$('#legend_' + graph_id).css('width',plot.width()); $('#menu_' + graph_id) - .css('left',plot.width() - $('#menu_'+graph_id).width() + 10); + .css('left',width - $('#menu_'+graph_id).width()); $('#menu_' + graph_id).show(); } @@ -2251,10 +2251,10 @@ function set_watermark(graph_id, plot, watermark_src) { if ($('#'+graph_id+' .yAxis .tickLabel').eq(0).css('height') != undefined) { down_ticks_height = $('#'+graph_id+' .yAxis .tickLabel').eq(0).css('height').split('px')[0]; } - //var left_pos = parseInt(context.canvas.width - 3) - $('#watermark_image_'+graph_id)[0].width; - //var top_pos = parseInt(context.canvas.height - down_ticks_height - 10) - $('#watermark_image_'+graph_id)[0].height; - var left_pos = 380; + var left_pos = parseInt(context.canvas.width - 3) - $('#watermark_image_'+graph_id)[0].width; var top_pos = 6; + //var top_pos = parseInt(context.canvas.height - down_ticks_height - 10) - $('#watermark_image_'+graph_id)[0].height; + //var left_pos = 380; context.drawImage(this, left_pos, top_pos); }, false); diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php index 952ac1717b..87f8e5fb42 100644 --- a/pandora_console/include/graphs/functions_flot.php +++ b/pandora_console/include/graphs/functions_flot.php @@ -246,7 +246,6 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend, "style='display: none; " . "text-align: center; " . "width: " . $menu_width . "px; ". - "border: solid 1px #666; ". "border-bottom: 0px; " . "padding: 4px 4px 4px 4px;margin-bottom:5px;'> ".__("; From 58ea653e059cc15ab9b975b61e33fcae12b47ba0 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Mon, 20 Feb 2017 11:20:59 +0100 Subject: [PATCH 08/17] Fixed multiple delete in events filter. Ticket #303 --- .../godmode/events/event_filter.php | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pandora_console/godmode/events/event_filter.php b/pandora_console/godmode/events/event_filter.php index d2018c459a..2b054d1ef1 100644 --- a/pandora_console/godmode/events/event_filter.php +++ b/pandora_console/godmode/events/event_filter.php @@ -147,28 +147,26 @@ foreach ($filters as $filter) { href='index.php?sec=geventos&sec2=godmode/events/events§ion=filter&delete=1&id=".$filter['id_filter']."&offset=0&pure=".$config['pure']."'>" . html_print_image('images/cross.png', true, array('title' => __('Delete'))) . "" . html_print_checkbox_extended ('delete_multiple[]', $filter['id_filter'], false, false, '', 'class="check_delete"', true); - + array_push ($table->data, $data); } if (isset($data)) { - html_print_table ($table); + echo "
"; + html_print_input_hidden('multiple_delete', 1); + html_print_table ($table); + if(!is_metaconsole()) + echo "
"; + else + echo "
"; + html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"'); + echo "
"; + echo ""; } else { ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no defined filters') ) ); } -if (isset($data)) { - echo "
"; - html_print_input_hidden('multiple_delete', 1); - if(!is_metaconsole()) - echo "
"; - else - echo "
"; - html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"'); - echo "
"; - echo ""; -} if(!defined("METACONSOLE")) echo "
"; else @@ -181,11 +179,11 @@ echo "
"; From b915a1034b2fe37d11fd9b38dce4872f6a3f7a9d Mon Sep 17 00:00:00 2001 From: enriquecd Date: Mon, 20 Feb 2017 12:06:30 +0100 Subject: [PATCH 09/17] Not limit 300px agent and module comboboxes in graph builder - #40 --- .../godmode/reporting/graph_builder.graph_editor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/reporting/graph_builder.graph_editor.php b/pandora_console/godmode/reporting/graph_builder.graph_editor.php index beb35503fc..8e5d8b5d48 100644 --- a/pandora_console/godmode/reporting/graph_builder.graph_editor.php +++ b/pandora_console/godmode/reporting/graph_builder.graph_editor.php @@ -149,7 +149,7 @@ echo "".__('Modules').""; echo ""; echo "".html_print_select (agents_get_group_agents(), 'id_agents[]', 0, false, '', '', true, true, true, '', false, '').""; echo "" . html_print_image("images/darrowright.png", true) . ""; -echo "".html_print_select (array (), 'module[]', 0, false, '', 0, true, true, true, '', false, 'width:300px;').""; +echo "".html_print_select (array (), 'module[]', 0, false, '', 0, true, true, true, '', false, '').""; echo ""; echo ""; echo ""; From 651e7ea8e6e17ef6602e9e0dedabd8e442d3918a Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Mon, 20 Feb 2017 12:35:52 +0100 Subject: [PATCH 10/17] Changed migration file name. Ticket #297 --- ....0_to_6.1.mysql.sql => pandoradb_migrate_6.0_to_7.0.mysql.sql} | 0 ..._to_6.1.oracle.sql => pandoradb_migrate_6.0_to_7.0.oracle.sql} | 0 ...postgreSQL.sql => pandoradb_migrate_6.0_to_7.0.postgreSQL.sql} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename pandora_console/extras/{pandoradb_migrate_6.0_to_6.1.mysql.sql => pandoradb_migrate_6.0_to_7.0.mysql.sql} (100%) rename pandora_console/extras/{pandoradb_migrate_6.0_to_6.1.oracle.sql => pandoradb_migrate_6.0_to_7.0.oracle.sql} (100%) rename pandora_console/extras/{pandoradb_migrate_6.0_to_6.1.postgreSQL.sql => pandoradb_migrate_6.0_to_7.0.postgreSQL.sql} (100%) diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql similarity index 100% rename from pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql rename to pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.oracle.sql similarity index 100% rename from pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql rename to pandora_console/extras/pandoradb_migrate_6.0_to_7.0.oracle.sql diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.postgreSQL.sql similarity index 100% rename from pandora_console/extras/pandoradb_migrate_6.0_to_6.1.postgreSQL.sql rename to pandora_console/extras/pandoradb_migrate_6.0_to_7.0.postgreSQL.sql From e8a765876b0c6c1cb497c6aea422029f5afa366c Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Mon, 20 Feb 2017 12:53:53 +0100 Subject: [PATCH 11/17] Fixed multiple delete button and form structure in messages section. Ticket #301 --- .../operation/messages/message_list.php | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/pandora_console/operation/messages/message_list.php b/pandora_console/operation/messages/message_list.php index 229a770363..a1e3a22c9c 100644 --- a/pandora_console/operation/messages/message_list.php +++ b/pandora_console/operation/messages/message_list.php @@ -202,38 +202,39 @@ else { } array_push ($table->data, $data); } - html_print_table($table); + } -echo "
"; - echo ""; - echo ""; - echo ""; -echo "
"; - echo "
"; - if (!empty($messages)) { - if ($show_sent) - echo '
'; - else - echo ''; - html_print_submit_button(__('Delete'), 'delete_btn', - false, 'class="sub delete"'); - echo "
"; - } - echo '
'; - html_print_submit_button (__('Create message'), 'create', false, 'class="sub next" style="margin-right:5px;"'); - echo "
"; - echo "
"; - echo "
"; +if (!empty($messages)) { + if ($show_sent) { + echo '
'; + } + else { + echo ''; + } + html_print_input_hidden('multiple_delete', 1); + html_print_table($table); + echo "
"; + html_print_submit_button(__('Delete'), 'delete_btn', + false, 'class="sub delete"'); + echo "
"; + echo "
"; +} + +echo "
"; + echo '
'; + html_print_submit_button (__('Create message'), 'create', false, 'class="sub next" style="margin-right:5px;"'); + echo "
"; +echo "
"; ?> From 9a3e6931372299e229dcc9500343b0b88e615efb Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Mon, 20 Feb 2017 12:56:29 +0100 Subject: [PATCH 12/17] Fixed problems with change size of visual console when this size is very small. And add message when this size is very small. --- .../reporting/visual_console_builder.data.php | 57 +++++++------ .../visual_console_builder.editor.js | 81 +++++++++++++------ .../visual_console_builder.editor.php | 1 + 3 files changed, 83 insertions(+), 56 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php index 6507f3d02a..aaf1249ae9 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.data.php +++ b/pandora_console/godmode/reporting/visual_console_builder.data.php @@ -125,35 +125,40 @@ $table->data[3][0] = __('Background image'); $table->data[3][1] = html_print_input_file('background_image',true); $table->data[4][0] = __('Background color'); -if($action == 'new'){ -$table->data[4][1] .= html_print_input_text ('background_color', 'white', '', 8, 8, true); +if ($action == 'new') { + $table->data[4][1] .= html_print_input_text ('background_color', + 'white', '', 8, 8, true); } -else{ - $table->data[4][1] .= html_print_input_text ('background_color', $background_color, '', 8, 8, true); +else { + $table->data[4][1] .= html_print_input_text ('background_color', + $background_color, '', 8, 8, true); } - $table->data[5][0] = __('Size - (Width x Height)'); -if($action == 'new'){ -$table->data[5][1] = ''; -} -else{ -$table->data[5][1] = ''; -} +$table->data[5][1] = ''; -$table->data[5][1] .= '
"; @@ -563,7 +587,7 @@ extensions_add_main_function('mainAgentsModules'); ); }); - $("#id_agents2").change (function(){ + $("#id_agents2").click (function(){ selection_agent_module(); }); @@ -591,7 +615,6 @@ extensions_add_main_function('mainAgentsModules'); }); selection_agent_module(); - }); function selection_agent_module() { @@ -614,6 +637,6 @@ extensions_add_main_function('mainAgentsModules'); } }, "json" - ); + ); } \ No newline at end of file diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 134f13c5b7..e00d39f123 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -1403,7 +1403,9 @@ function reporting_html_agent_module($table, $item) { $row['agent_name']), true, array('width' => '20px', 'height' => '20px')); break; - case AGENT_STATUS_ALERT_FIRED: + case AGENT_MODULE_STATUS_NORMAL_ALERT: + case AGENT_MODULE_STATUS_WARNING_ALERT: + case AGENT_MODULE_STATUS_CRITICAL_ALERT: $table_data .= ui_print_status_image( 'module_alertsfired.png', __("%s in %s : ALERTS FIRED", @@ -1411,6 +1413,14 @@ function reporting_html_agent_module($table, $item) { $row['agent_name']), true, array('width' => '20px', 'height' => '20px')); break; + case 4: + $table_data .= ui_print_status_image( + 'module_no_data.png', + __("%s in %s : Not initialize", + $module_name, + $row['agent_name']), + true, array('width' => '20px', 'height' => '20px')); + break; } $table_data .= ""; } @@ -1429,6 +1439,7 @@ function reporting_html_agent_module($table, $item) { $table_data .= "
" . __("Yellow cell when the module has a warning status") . ""; $table_data .= "
" . __("Green cell when the module has a normal status") . ""; $table_data .= "
" . __("Grey cell when the module has an unknown status") . ""; + $table_data .= "
" . __("Cell turns grey when the module is in 'not initialize' status") . ""; $table_data .= ""; $table_data .= "
"; diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index c52fa845d0..c899be82d6 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -126,7 +126,7 @@ if (is_ajax ()) { $id_group = (int) get_parameter('id_module_group'); $id_agents = get_parameter('id_agents'); $selection = get_parameter('selection'); - if(!isset($id_agents)){ + if(isset($id_agents)){ $agents = implode(",", $id_agents); } From 03f2250ffa7f6b30a746285d9875b2f6a00a395d Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Mon, 20 Feb 2017 16:35:32 +0100 Subject: [PATCH 17/17] Removed weird alerts in networkmap. --- .../include/javascript/functions_pandora_networkmap.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js index 290fc3836d..a69a74bbf5 100644 --- a/pandora_console/include/javascript/functions_pandora_networkmap.js +++ b/pandora_console/include/javascript/functions_pandora_networkmap.js @@ -1560,7 +1560,7 @@ function show_menu(item, data) { var selection = d3.selectAll('.node_selected'); selection = selection[0]; if (selection.length > 1) { - alert("Yo no tengo dedo, por eso no poido trabajo, una ayuda, amorfa"); + alert("Only one-one relations (one father, one son)"); } else { add_interface_link(data); @@ -1603,7 +1603,7 @@ function show_menu(item, data) { var selection = d3.selectAll('.node_selected'); selection = selection[0]; if (selection.length > 1) { - alert("Yo no tengo dedo, por eso no poido trabajo"); + alert("Only one-one relations (one father, one son)"); } else { set_parent(data);