From c95b629776b2660e49780519e7906ec21eb13988 Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 30 Apr 2021 01:00:41 +0200 Subject: [PATCH 1/8] 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 5d3f7b7610..3c12722469 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.754-210429 +Version: 7.0NG.754-210430 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 b3a667efbb..22b84b4bd3 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.754-210429" +pandora_version="7.0NG.754-210430" 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 590bb20c79..eca6cd6387 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1015,7 +1015,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.754'; -use constant AGENT_BUILD => '210429'; +use constant AGENT_BUILD => '210430'; # 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 cec1503f46..c6a8318381 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.754 -%define release 210429 +%define release 210430 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 096a381658..506e75ef2f 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.754 -%define release 210429 +%define release 210430 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 e92d00fedd..ebb0cd59ce 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.754" -PI_BUILD="210429" +PI_BUILD="210430" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 54658484ab..4940acffc1 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210429} +{210430} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index ecc63c8fe6..9db2d86861 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.754(Build 210429)") +#define PANDORA_VERSION ("7.0NG.754(Build 210430)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 8ef58993d2..a60ee8dac5 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.754(Build 210429))" + VALUE "ProductVersion", "(7.0NG.754(Build 210430))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 7d4f90a639..786f4ca089 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.754-210429 +Version: 7.0NG.754-210430 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 1647bf5e6e..f3b84cd68e 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.754-210429" +pandora_version="7.0NG.754-210430" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 68ee2534d8..98f7459a0d 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210429'; +$build_version = 'PC210430'; $pandora_version = 'v7.0NG.754'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index d508dda087..ff5f414224 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index a533327318..a1eaf25c2b 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.754 -%define release 210429 +%define release 210430 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 50124cef27..e0c80696cb 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.754 -%define release 210429 +%define release 210430 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 18f3c08594..53756f8805 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.754" -PI_BUILD="210429" +PI_BUILD="210430" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index b3ab45cb6f..03b1f4c61f 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.754 PS210429"; +my $version = "7.0NG.754 PS210430"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 501fc1bcff..e5230ca983 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.754 PS210429"; +my $version = "7.0NG.754 PS210430"; # save program name for logging my $progname = basename($0); From f51ad335545170d005da72eace0bb991db084b55 Mon Sep 17 00:00:00 2001 From: vanessa gil Date: Fri, 30 Apr 2021 10:34:20 +0200 Subject: [PATCH 2/8] Updated version. --- pandora_console/pandoradb_data.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index de448f7dd9..bc3bb45d06 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -109,7 +109,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_report_front_logo', 'images/pandora_logo_white.jpg'), ('custom_report_front_header', ''), ('custom_report_front_footer', ''), -('MR', 45), +('MR', 46), ('identification_reminder', 1), ('identification_reminder_timestamp', 0), ('current_package_enterprise', 753), From c5fe67ddb5a96da6eaf17f31e87a856d414d7fb7 Mon Sep 17 00:00:00 2001 From: Marcos Alconada Date: Fri, 30 Apr 2021 10:43:22 +0000 Subject: [PATCH 3/8] fixed visual error black theme 754 LTS --- .../include/styles/pandora_black.css | 39 ++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index ed8fb5b514..49d669fd0d 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -441,6 +441,7 @@ ul.ui-tabs-nav.ui-corner-all.ui-helper-reset.ui-helper-clearfix.ui-widget-header .notification-item { background: #222; + border: none; } pre, @@ -522,13 +523,13 @@ div#form_activate_licence #code { margin-top: 10px; margin-bottom: 10px; padding: 0px 5px 5px 10px; - border-color: #e2e2e2; border-style: solid; border-width: 1px; width: 100%; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; + border-color: #707070; } div.data_container:not(:hover) { @@ -963,3 +964,39 @@ div.integria_details_description textarea { .invert_filter_important { filter: invert(100%) !important; } +fieldset { + border-color: #707070; +} + +input, +textarea, +select, +.selection { + border-color: #707070; +} + +.white_box, +.white-box-content { + border: 1px solid #707070; +} + +.white_table_graph_header { + border: 1px solid #707070; +} + +table.databox { + border-color: #707070; +} + +.info_table > tbody > tr { + border-bottom: 1px solid #303030; +} + +.status_tactical { + border-color: #707070; +} + +.status_tactical, +.tactical_set { + border-color: #707070; +} From 97e7e8c8cbfe294ae5a7d3cf5ac4ca020fbc2603 Mon Sep 17 00:00:00 2001 From: vanessa gil Date: Fri, 30 Apr 2021 13:57:00 +0200 Subject: [PATCH 4/8] Updated version. --- pandora_console/pandoradb_data.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index bc3bb45d06..6fe259d898 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -112,7 +112,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 46), ('identification_reminder', 1), ('identification_reminder_timestamp', 0), -('current_package_enterprise', 753), +('current_package_enterprise', 754), ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.00097656250000":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'), ('custom_docs_logo', 'default_docs.png'), ('custom_support_logo', 'default_support.png'), From 6b83deacdd8663765ddb91943cbcfcee49943f46 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 30 Apr 2021 14:34:10 +0200 Subject: [PATCH 5/8] Migrate old rules --- pandora_console/extras/mr/46.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora_console/extras/mr/46.sql b/pandora_console/extras/mr/46.sql index 315180102a..66cea5691c 100644 --- a/pandora_console/extras/mr/46.sql +++ b/pandora_console/extras/mr/46.sql @@ -20,12 +20,13 @@ ALTER TABLE `tevent_rule` MODIFY COLUMN `group_recursion` TEXT; ALTER TABLE `tevent_rule` MODIFY COLUMN `log_content` TEXT; ALTER TABLE `tevent_rule` MODIFY COLUMN `log_source` TEXT; ALTER TABLE `tevent_rule` MODIFY COLUMN `log_agent` TEXT; +ALTER TABLE tevent_filter ADD COLUMN `server_id` int(10) NOT NULL default 0; UPDATE `talert_commands` SET `fields_descriptions` = '[\"Event name\",\"Event type\",\"Source\",\"Agent name or _agent_\",\"Event severity\",\"ID extra\",\"Tags separated by commas\",\"Comments\",\"\",\"\"]' WHERE `name` = "Monitoring Event"; - UPDATE `tskin` SET `name` = 'Default theme' , `relative_path` = 'pandora.css' WHERE `id` = 1; UPDATE `tskin` SET `name` = 'Black theme' , `relative_path` = 'Black theme' , `description` = 'Black theme' WHERE `id` = 2; -ALTER TABLE tevent_filter ADD COLUMN `server_id` int(10) NOT NULL default 0; +UPDATE `tevent_rule` SET `criticity` = NULL, `operator_criticity` = NULL WHERE `criticity` = 99; +UPDATE `tevent_rule` SET `operator_criticity` = '==' WHERE `criticity` != 99 AND `criticity` IS NOT NULL; COMMIT; From 366e9a08d5a817f789d8e9cfd3a603943ce02740 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 30 Apr 2021 14:36:47 +0200 Subject: [PATCH 6/8] minor fix --- pandora_console/extras/mr/46.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/extras/mr/46.sql b/pandora_console/extras/mr/46.sql index 66cea5691c..802d4b1e63 100644 --- a/pandora_console/extras/mr/46.sql +++ b/pandora_console/extras/mr/46.sql @@ -27,6 +27,6 @@ UPDATE `tskin` SET `name` = 'Default theme' , `relative_path` = 'pandora.cs UPDATE `tskin` SET `name` = 'Black theme' , `relative_path` = 'Black theme' , `description` = 'Black theme' WHERE `id` = 2; UPDATE `tevent_rule` SET `criticity` = NULL, `operator_criticity` = NULL WHERE `criticity` = 99; -UPDATE `tevent_rule` SET `operator_criticity` = '==' WHERE `criticity` != 99 AND `criticity` IS NOT NULL; +UPDATE `tevent_rule` SET `operator_criticity` = '==' WHERE `criticity` != 99 AND `criticity` IS NOT NULL AND `criticity` != ''; COMMIT; From e179475663be2c2ced681fd684ef409f895cfc85 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 30 Apr 2021 14:54:14 +0200 Subject: [PATCH 7/8] Repaired group selector in rules --- pandora_console/include/functions_groups.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index 1a76ec059f..b15c6216a0 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -577,6 +577,14 @@ function groups_get_groups_tree_recursive($groups, $trash=0, $trash2=0) $group['parent'] = 0; } + if (is_array($tree[$group['parent']]) === false) { + $str = $tree[$group['parent']]; + $tree[$group['parent']] = [ + 'nombre' => $tree[$group['parent']], + 'id_grupo' => $group['parent'], + ]; + } + $tree[$group['parent']]['hash_branch'] = 1; $tree[$group['parent']]['branch'][$key] = &$tree[$key]; } From 34b02982e16e8f2fda4bc3825b071dae4335c45c Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 30 Apr 2021 15:01:43 +0200 Subject: [PATCH 8/8] Ensure valid values (alert correlation) for compat mode for criticity, id_group and id_tag --- pandora_console/extras/mr/46.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandora_console/extras/mr/46.sql b/pandora_console/extras/mr/46.sql index 802d4b1e63..04d2b030cd 100644 --- a/pandora_console/extras/mr/46.sql +++ b/pandora_console/extras/mr/46.sql @@ -27,6 +27,10 @@ UPDATE `tskin` SET `name` = 'Default theme' , `relative_path` = 'pandora.cs UPDATE `tskin` SET `name` = 'Black theme' , `relative_path` = 'Black theme' , `description` = 'Black theme' WHERE `id` = 2; UPDATE `tevent_rule` SET `criticity` = NULL, `operator_criticity` = NULL WHERE `criticity` = 99; +UPDATE `tevent_rule` SET `id_grupo` = NULL, `operator_id_grupo` = NULL WHERE `id_grupo` = 0; +UPDATE `tevent_rule` SET `id_tag` = NULL, `operator_id_tag` = NULL WHERE `id_tag` = 0; UPDATE `tevent_rule` SET `operator_criticity` = '==' WHERE `criticity` != 99 AND `criticity` IS NOT NULL AND `criticity` != ''; +UPDATE `tevent_rule` SET `operator_id_grupo` = '==' WHERE `id_grupo` != 0 AND `id_grupo` IS NOT NULL AND `id_grupo` != ''; +UPDATE `tevent_rule` SET `operator_id_tag` = '==' WHERE `id_tag` != 0 AND `id_tag` IS NOT NULL AND `id_tag` != ''; COMMIT;