From 69b573e266a03b2ac9d651300aa61c3aad640d59 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 23 Mar 2023 14:43:13 +0100 Subject: [PATCH 01/39] #10441 added version in import files js and css --- pandora_console/include/functions_ui.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 8eebebe339..c8de84f65d 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -2032,7 +2032,7 @@ function ui_process_page_head($string, $bitfield) array_push($loaded, $name); $url_css = ui_get_full_url($filename, false, false, false); - $output .= ''."\n\t"; + $output .= ''."\n\t"; } /* @@ -2089,7 +2089,7 @@ function ui_process_page_head($string, $bitfield) array_push($loaded, $name); $url_js = ui_get_full_url($filename, false, false, false); - $output .= ''."\n\t"; + $output .= ''."\n\t"; } /* @@ -2134,7 +2134,7 @@ function ui_process_page_head($string, $bitfield) array_push($loaded, $name); $url_js = ui_get_full_url($filename, false, false, false); - $output .= ''."\n\t"; + $output .= ''."\n\t"; } /* From 62d4fd717b84f9005ecfe7f84dfa9bfd8e23c517 Mon Sep 17 00:00:00 2001 From: Calvo Date: Thu, 23 Mar 2023 19:04:43 +0100 Subject: [PATCH 02/39] Added ssl connect error logging to tentacle --- tentacle/tentacle_server | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tentacle/tentacle_server b/tentacle/tentacle_server index 4458237003..1ba58c3d62 100755 --- a/tentacle/tentacle_server +++ b/tentacle/tentacle_server @@ -899,8 +899,11 @@ sub serve_client() { serve_proxy_connection (); } else { serve_connection (); - } + } }; + if($@) { + print_info($@); + } $t_client_socket->shutdown (2); $t_client_socket->close (); From da742bc15ea903db87c4852fd09279fc244af8ea Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Fri, 24 Mar 2023 09:13:22 +0100 Subject: [PATCH 03/39] #10441 added version file in js --- .../extensions/realtime_graphs.php | 4 +- .../agentes/module_manager_editor_network.php | 2 +- pandora_console/include/chart_generator.php | 48 +++++++++---------- .../agentes/interface_traffic_graph_win.php | 10 ++-- .../operation/agentes/realtime_win.php | 10 ++-- .../operation/agentes/snapshot_view.php | 2 +- .../operation/agentes/stat_win.php | 12 ++--- 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php index 133af5b3f8..7f79b1ea2f 100644 --- a/pandora_console/extensions/realtime_graphs.php +++ b/pandora_console/extensions/realtime_graphs.php @@ -280,8 +280,8 @@ function pandora_realtime_graphs() ); html_print_input_hidden('incremental_base', '0'); - echo ''; - echo ''; + echo ''; + echo ''; if ($config['style'] !== 'pandora_black') { echo ''; } diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php index f9c1117377..445c5fe976 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_network.php +++ b/pandora_console/godmode/agentes/module_manager_editor_network.php @@ -33,7 +33,7 @@ $snmp_browser_path = (is_metaconsole() === true) ? '../../' : ''; $snmp_browser_path .= 'include/javascript/pandora_snmp_browser.js'; $array_credential_identifier = CredentialStore::getKeys('CUSTOM'); -echo ""; +echo ''; // Define a custom action to save the OID selected // in the SNMP browser to the form. diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php index 2e9ec50479..ea11402488 100644 --- a/pandora_console/include/chart_generator.php +++ b/pandora_console/include/chart_generator.php @@ -79,9 +79,9 @@ if (check_login(false) === false) { - - - + + +

Access is not granted

@@ -141,27 +141,27 @@ if (file_exists('languages/'.$user_language.'.mo') === true) { - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + ;'> 0) { - - - - - + + + + + - - - - - + + + + + <?php echo __('%s Snapshot data view for module (%s)', get_product_name(), $label); ?> - + - - - - - - + + + + + + Date: Fri, 24 Mar 2023 12:06:40 +0100 Subject: [PATCH 04/39] #10441 added version file in css --- pandora_console/extensions/realtime_graphs.php | 2 +- pandora_console/general/pandora_help.php | 2 +- pandora_console/include/chart_generator.php | 16 ++++++++-------- pandora_console/include/functions_html.php | 8 ++++---- pandora_console/include/functions_ui.php | 6 +++--- .../agentes/interface_traffic_graph_win.php | 8 ++++---- .../operation/agentes/realtime_win.php | 6 +++--- .../operation/agentes/snapshot_view.php | 4 ++-- pandora_console/operation/agentes/stat_win.php | 12 ++++++------ .../operation/events/sound_events.php | 4 ++-- .../visual_console/legacy_public_view.php | 4 ++-- .../operation/visual_console/public_view.php | 2 +- .../update_manager_client/views/offline.php | 8 ++++---- .../update_manager_client/views/online.php | 6 +++--- .../update_manager_client/views/register.php | 5 +++-- 15 files changed, 47 insertions(+), 46 deletions(-) diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php index 7f79b1ea2f..d0b5ef5e95 100644 --- a/pandora_console/extensions/realtime_graphs.php +++ b/pandora_console/extensions/realtime_graphs.php @@ -283,7 +283,7 @@ function pandora_realtime_graphs() echo ''; echo ''; if ($config['style'] !== 'pandora_black') { - echo ''; + echo ''; } // Store servers timezone offset to be retrieved from js. diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php index c78c006a9f..e9dc0e0398 100644 --- a/pandora_console/general/pandora_help.php +++ b/pandora_console/general/pandora_help.php @@ -25,7 +25,7 @@ echo __('%s help system', get_product_name()); -'; ?> +'; ?> Access denied - - - - + + + + @@ -137,10 +137,10 @@ if (file_exists('languages/'.$user_language.'.mo') === true) { Pandora FMS Graph - - - - + + + + diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index c475a44207..672dfa6937 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -515,7 +515,7 @@ function html_print_select_groups( false, false ); - $output .= '" type="text/javascript">'; + $output .= '?v='.$config['current_package'].'" type="text/javascript">'; $output .= ''; + $output .= '?v='.$config['current_package'].'"/>'; } else { ui_require_css_file($select2_css); ui_require_javascript_file('select2.min'); @@ -977,7 +977,7 @@ function html_print_select( false, false ); - $output .= '" type="text/javascript">'; + $output .= '?v='.$config['current_package'].'" type="text/javascript">'; $output .= ''; + $output .= '?v='.$config['current_package'].'"/>'; } else { ui_require_css_file($select2); ui_require_javascript_file('select2.min'); diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index c8de84f65d..5de808d094 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -4102,7 +4102,7 @@ function ui_print_datatable(array $parameters) false, false ); - $output .= '"/>'; + $output .= '?v='.$config['current_package'].'"/>'; // Load tables.css. $output .= ''; + $output .= '?v='.$config['current_package'].'"/>'; if (is_metaconsole() === true) { // Load meta_tables.css. $output .= ''; + $output .= '?v='.$config['current_package'].'"/>'; } // Load datatables.js. diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php index be2b1a5236..afac72db09 100644 --- a/pandora_console/operation/agentes/interface_traffic_graph_win.php +++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php @@ -67,7 +67,7 @@ if (file_exists('../../include/languages/'.$user_language.'.mo')) { $l10n->load_tables(); } -echo ''; +echo ''; if ($config['style'] === 'pandora_black' && !is_metaconsole()) { ui_require_css_file('pandora_black', 'include/styles/', true); } @@ -93,9 +93,9 @@ if ($refresh > 0) { ?> <?php echo __('%s Interface Graph', get_product_name()).' ('.agents_get_alias($agent_id).' - '.$interface_name; ?>) - - - + + + diff --git a/pandora_console/operation/agentes/realtime_win.php b/pandora_console/operation/agentes/realtime_win.php index 1295c06079..de04abf4ee 100644 --- a/pandora_console/operation/agentes/realtime_win.php +++ b/pandora_console/operation/agentes/realtime_win.php @@ -68,7 +68,7 @@ if ($config['style'] === 'pandora_black' && !is_metaconsole()) { ui_require_css_file('pandora_black', 'include/styles/', true); } -echo ''; +echo ''; ?> @@ -83,8 +83,8 @@ echo ' <?php echo __('%s Realtime Module Graph', get_product_name()); ?> - - + + diff --git a/pandora_console/operation/agentes/snapshot_view.php b/pandora_console/operation/agentes/snapshot_view.php index 1de1582b8f..23d7f10a26 100644 --- a/pandora_console/operation/agentes/snapshot_view.php +++ b/pandora_console/operation/agentes/snapshot_view.php @@ -80,9 +80,9 @@ if (!check_acl_one_of_groups($config['id_user'], $all_groups, 'AR')) { $query = ui_get_url_refresh(false); echo ''; if ($config['style'] === 'pandora_black' && !is_metaconsole()) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } } ?> diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index d8822235ae..07dd78a297 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -65,10 +65,10 @@ if (file_exists('../../include/languages/'.$user_language.'.mo')) { } global $config; -echo ''; +echo ''; if ($config['style'] === 'pandora_black' && !is_metaconsole()) { - echo ''; + echo ''; } @@ -114,10 +114,10 @@ ui_print_message_dialog( ?> <?php echo __('%s Graph', get_product_name()).' ('.$alias.' - '.$label; ?>) - - - - + + + + diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php index 956282b045..f2a8c62432 100644 --- a/pandora_console/operation/events/sound_events.php +++ b/pandora_console/operation/events/sound_events.php @@ -154,9 +154,9 @@ ui_require_css_file('discovery'); '; if ($config['style'] === 'pandora_black' && !is_metaconsole()) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } echo ''; diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php index e8edbae7db..d5321b7a1b 100644 --- a/pandora_console/operation/visual_console/legacy_public_view.php +++ b/pandora_console/operation/visual_console/legacy_public_view.php @@ -45,12 +45,12 @@ ob_start('ui_process_page_head'); enterprise_include('index.php'); $url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false); -echo ''; +echo ''; html_print_input_hidden('homeurl', $config['homeurl']); $url_css_modal = ui_get_full_url('include/styles/register.css', false, false, false); -echo ''; +echo ''; // Connection lost alert. ui_require_javascript_file('connection_check', 'include/javascript/', true); set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false)); diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php index 496a34f3a6..605395316b 100644 --- a/pandora_console/operation/visual_console/public_view.php +++ b/pandora_console/operation/visual_console/public_view.php @@ -56,7 +56,7 @@ ob_start('ui_process_page_head'); enterprise_include('index.php'); $url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false); -echo ''; +echo ''; require_once 'include/functions_visual_map.php'; diff --git a/pandora_console/update_manager_client/views/offline.php b/pandora_console/update_manager_client/views/offline.php index ae64d92fde..5d8027725c 100644 --- a/pandora_console/update_manager_client/views/offline.php +++ b/pandora_console/update_manager_client/views/offline.php @@ -27,7 +27,7 @@ * GNU General Public License for more details. * ============================================================================ */ - +global $config; ?> @@ -39,12 +39,12 @@ document.write(' - - + + - +
diff --git a/pandora_console/update_manager_client/views/online.php b/pandora_console/update_manager_client/views/online.php index d588fa8e6e..f60b0f5e52 100644 --- a/pandora_console/update_manager_client/views/online.php +++ b/pandora_console/update_manager_client/views/online.php @@ -27,11 +27,11 @@ * GNU General Public License for more details. * ============================================================================ */ - +global $config; ?> - - + + diff --git a/pandora_console/update_manager_client/views/register.php b/pandora_console/update_manager_client/views/register.php index 4fffc0f88f..d93d25045a 100644 --- a/pandora_console/update_manager_client/views/register.php +++ b/pandora_console/update_manager_client/views/register.php @@ -28,6 +28,7 @@ * ============================================================================ */ +global $config; $product_name = get_product_name(); ?> @@ -39,8 +40,8 @@ $product_name = get_product_name(); ?> } - - + +
'; +echo ''; echo ' - '; + '; // Chartjs. $output .= ''; From e9fcfe74490065bd989204ef6c12dd55e4383605 Mon Sep 17 00:00:00 2001 From: slerena Date: Wed, 29 Mar 2023 18:24:18 +0000 Subject: [PATCH 07/39] Improved legibility for warning messages (warning class). --- pandora_console/include/styles/pandora.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index b4d57e1c79..9759a24306 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -1648,7 +1648,7 @@ table.info_box.warning { } .warning * { - color: #f3b200; + color: #8d4100; } .help { From 711b75247ff1e3bc57fa4e77ca95fe4fa06d1c01 Mon Sep 17 00:00:00 2001 From: slerena Date: Wed, 29 Mar 2023 18:25:00 +0000 Subject: [PATCH 08/39] Change header copyright and other details --- pandora_console/include/styles/pandora.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 9759a24306..d8eec9b1b1 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -15,8 +15,8 @@ * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| * * ============================================================================ - * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas - * Please see http://pandorafms.org for full contribution list + * Copyright (c) 2005-2023 Pandora FMS + * Please see https://pandorafms.com for full contribution list * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation for version 2. From 00ec0dee25b322bca0c5f64799a3248d5a2736a7 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 30 Mar 2023 01:00:16 +0200 Subject: [PATCH 09/39] 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 74e0af2009..ce7f261fb8 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.770-230329 +Version: 7.0NG.770-230330 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 b811cd3723..01499b516c 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.770-230329" +pandora_version="7.0NG.770-230330" 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 dab99b4711..ba2d92f954 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1023,7 +1023,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.770'; -use constant AGENT_BUILD => '230329'; +use constant AGENT_BUILD => '230330'; # 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 df2f094194..37260dc4ea 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.770 -%define release 230329 +%define release 230330 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 06fe72b342..6b0c9c4c19 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.770 -%define release 230329 +%define release 230330 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 fbcef5e8ad..25f4bbff8b 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.770" -PI_BUILD="230329" +PI_BUILD="230330" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 30df9148e5..f8a720b9a0 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230329} +{230330} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 3b69dd0af1..d330ab6c9e 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.770 Build 230329") +#define PANDORA_VERSION ("7.0NG.770 Build 230330") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 9786f5bb3a..2b8c5c52c2 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.770(Build 230329))" + VALUE "ProductVersion", "(7.0NG.770(Build 230330))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 2035eda646..2132e41504 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.770-230329 +Version: 7.0NG.770-230330 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 884edecb5b..09dea86864 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.770-230329" +pandora_version="7.0NG.770-230330" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index bd150fc852..a98acabbf4 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 = 'PC230329'; +$build_version = 'PC230330'; $pandora_version = 'v7.0NG.770'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 1ae3824e7a..04954a578d 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index d2b00dd849..e5402e4baf 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.770 -%define release 230329 +%define release 230330 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 95323c1fe4..e23d4a759b 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.770 -%define release 230329 +%define release 230330 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 70be237d28..21f86ebcd7 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.770" -PI_BUILD="230329" +PI_BUILD="230330" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 8995679d6f..2346b270a7 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.770 Build 230329"; +my $version = "7.0NG.770 Build 230330"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 8266fd883d..728b705371 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.770 Build 230329"; +my $version = "7.0NG.770 Build 230330"; # save program name for logging my $progname = basename($0); From 1262fee2e8fb5226b35879deb0fb159dd9bf4ee7 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 30 Mar 2023 08:43:23 +0200 Subject: [PATCH 10/39] fixed styles --- .../godmode/agentes/inventory_manager.php | 2 +- .../godmode/servers/servers.build_table.php | 4 ++-- .../godmode/wizards/DiscoveryTaskList.class.php | 2 +- .../godmode/wizards/HostDevices.class.php | 5 +---- pandora_console/include/ajax/module.php | 2 +- .../include/class/CustomNetScan.class.php | 5 +---- pandora_console/include/functions_cron.php | 16 ++++++++-------- pandora_console/include/functions_events.php | 4 ++-- pandora_console/views/cluster/view.php | 2 +- 9 files changed, 18 insertions(+), 24 deletions(-) diff --git a/pandora_console/godmode/agentes/inventory_manager.php b/pandora_console/godmode/agentes/inventory_manager.php index 59a7a869a5..4b6a53df47 100644 --- a/pandora_console/godmode/agentes/inventory_manager.php +++ b/pandora_console/godmode/agentes/inventory_manager.php @@ -267,7 +267,7 @@ if (db_get_num_rows($sql) == 0) { $data[5] .= '  '; // Force refresh module $data[5] .= ''; - $data[5] .= html_print_image('images/change-active.svg', true, ['border' => '0', 'title' => __('Force'), 'class' => 'main_menu_icon invert_filter']).''; + $data[5] .= html_print_image('images/force@svg.svg', true, ['border' => '0', 'title' => __('Force'), 'class' => 'main_menu_icon invert_filter']).''; array_push($table->data, $data); } diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php index a010e5d26a..64e7bc0332 100644 --- a/pandora_console/godmode/servers/servers.build_table.php +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -208,7 +208,7 @@ foreach ($servers as $server) { if ($server['type'] === 'data') { $data[8] .= ''; $data[8] .= html_print_image( - 'images/change-active.svg', + 'images/force@force.svg', true, [ 'title' => __('Reset module status and fired alert counts'), @@ -219,7 +219,7 @@ foreach ($servers as $server) { } else if ($server['type'] === 'enterprise snmp') { $data[8] .= ''; $data[8] .= html_print_image( - 'images/change-active.svg', + 'images/force@force.svg', true, [ 'title' => __('Claim back SNMP modules'), diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index 120eeda293..12e557de87 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -673,7 +673,7 @@ class DiscoveryTaskList extends HTML $data[0] .= ');" >'; $data[0] .= html_print_image( - 'images/change-active.svg', + 'images/force@svg.svg', true, [ 'title' => __('Force'), diff --git a/pandora_console/godmode/wizards/HostDevices.class.php b/pandora_console/godmode/wizards/HostDevices.class.php index 2f7c5cd692..a2836b0d72 100755 --- a/pandora_console/godmode/wizards/HostDevices.class.php +++ b/pandora_console/godmode/wizards/HostDevices.class.php @@ -810,10 +810,7 @@ class HostDevices extends Wizard 'name' => 'interval_manual_defined', 'return' => true, ], - 'extra' => '
'.ui_print_help_tip( - __('The minimum recomended interval for Recon Task is 5 minutes'), - true - ).html_print_extended_select_for_time( + 'extra' => '
'.html_print_extended_select_for_time( 'interval', $this->task['interval_sweep'], '', diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 296971bfc5..450faa0e9a 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -1279,7 +1279,7 @@ if (check_login()) { if ((int) $module['flag'] === 0) { $additionalLinkAction = '&flag=1'; $linkCaption = __('Force checks'); - $imgaction = 'images/target.png'; + $imgaction = 'images/force@svg.svg'; } else { $additionalLinkAction = ''; $linkCaption = __('Refresh'); diff --git a/pandora_console/include/class/CustomNetScan.class.php b/pandora_console/include/class/CustomNetScan.class.php index e0fd3708ac..2fec9d8b9a 100644 --- a/pandora_console/include/class/CustomNetScan.class.php +++ b/pandora_console/include/class/CustomNetScan.class.php @@ -524,7 +524,7 @@ class CustomNetScan extends Wizard // Schedule. $form['inputs'][] = [ 'label' => __('Interval').ui_print_help_tip( - __('Manual interval means that it will be executed only On-demand'), + __('Manual interval means that it will be executed only On-demand').', '.__('The minimum recomended interval for Recon Task is 5 minutes'), true ), 'class' => 'input-interval', @@ -549,9 +549,6 @@ class CustomNetScan extends Wizard true, false, false - ).ui_print_help_tip( - __('The minimum recomended interval for Recon Task is 5 minutes'), - true ).'', ]; diff --git a/pandora_console/include/functions_cron.php b/pandora_console/include/functions_cron.php index 3467ff9184..5e47040449 100644 --- a/pandora_console/include/functions_cron.php +++ b/pandora_console/include/functions_cron.php @@ -530,7 +530,7 @@ function cron_list_table() $task['id'] ), 'content' => html_print_image( - 'images/change-active.svg', + 'images/force@svg.svg', true, [ 'title' => __('Force run'), @@ -568,7 +568,7 @@ function cron_list_table() $task['id'] ), 'content' => html_print_image( - 'images/change-active.svg', + 'images/force@svg.svg', true, [ 'title' => __('Force run'), @@ -623,7 +623,7 @@ function cron_list_table() $task['id'] ), 'content' => html_print_image( - 'images/change-active.svg', + 'images/force@svg.svg', true, [ 'title' => __('Force run'), @@ -715,7 +715,7 @@ function cron_list_table() $task['id'] ), 'content' => html_print_image( - 'images/change-active.svg', + 'images/force@svg.svg', true, [ 'title' => __('Force run'), @@ -751,7 +751,7 @@ function cron_list_table() $task['id'] ), 'content' => html_print_image( - 'images/change-active.svg', + 'images/force@svg.svg', true, [ 'title' => __('Force run'), @@ -797,7 +797,7 @@ function cron_list_table() $task['id'] ), 'content' => html_print_image( - 'images/change-active.svg', + 'images/force@svg.svg', true, [ 'title' => __('Force run'), @@ -839,7 +839,7 @@ function cron_list_table() $task['id'] ), 'content' => html_print_image( - 'images/change-active.svg', + 'images/force@svg.svg', true, [ 'title' => __('Force run'), @@ -873,7 +873,7 @@ function cron_list_table() $task['id'] ), 'content' => html_print_image( - 'images/change-active.svg', + 'images/force@svg.svg', true, [ 'title' => __('Force run'), diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 8afc257399..9616634adb 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -4560,7 +4560,7 @@ function events_page_details($event, $server_id=0) true, [ 'title' => __('Go to data overview'), - 'class' => 'invert_filter', + 'class' => 'invert_filter main_menu_icon', ] ); } else { @@ -4569,7 +4569,7 @@ function events_page_details($event, $server_id=0) true, [ 'title' => __('Go to data overview'), - 'class' => 'invert_filter', + 'class' => 'invert_filter main_menu_icon', 'style' => 'opacity: .5', ] ); diff --git a/pandora_console/views/cluster/view.php b/pandora_console/views/cluster/view.php index a6b10313b1..9bc0532abd 100644 --- a/pandora_console/views/cluster/view.php +++ b/pandora_console/views/cluster/view.php @@ -216,7 +216,7 @@ $table_agent_header .= '
'.$status_img.'
'; $table_agent_header .= '  '; $table_agent_header .= ''.html_print_image( - 'images/change-active.svg', + 'images/force@svg.svg', true, [ 'title' => __('Force cluster status calculation'), From 2c1301f542fef53285b6f761b66e18d4c88e7a1e Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 30 Mar 2023 08:59:40 +0200 Subject: [PATCH 11/39] fixed styles --- pandora_console/godmode/servers/servers.build_table.php | 4 ++-- pandora_console/include/styles/pandora_black.css | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php index 64e7bc0332..57569ac956 100644 --- a/pandora_console/godmode/servers/servers.build_table.php +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -208,7 +208,7 @@ foreach ($servers as $server) { if ($server['type'] === 'data') { $data[8] .= ''; $data[8] .= html_print_image( - 'images/force@force.svg', + 'images/force@svg.svg', true, [ 'title' => __('Reset module status and fired alert counts'), @@ -219,7 +219,7 @@ foreach ($servers as $server) { } else if ($server['type'] === 'enterprise snmp') { $data[8] .= ''; $data[8] .= html_print_image( - 'images/force@force.svg', + 'images/force@svg.svg', true, [ 'title' => __('Claim back SNMP modules'), diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index f716688e75..1bf1e91029 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -1600,3 +1600,7 @@ a.pandora_pagination, .info_table > tbody > tr > td { border-bottom: 1px solid #3f3f3f; } + +.font-title-font { + color: #fff; +} From da08d4e802292f7153b61928b4ec184f99ee0b47 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 30 Mar 2023 10:26:29 +0200 Subject: [PATCH 12/39] SNMP Wizard visual changes --- .../include/class/AgentWizard.class.php | 22 ++++++++----------- .../include/functions_snmp_browser.php | 2 +- pandora_console/include/styles/pandora.css | 4 ++++ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php index 2580d17371..00b9de46f0 100644 --- a/pandora_console/include/class/AgentWizard.class.php +++ b/pandora_console/include/class/AgentWizard.class.php @@ -4132,10 +4132,10 @@ class AgentWizard extends HTML $table->width = '100%'; $table->class = 'info_table'; // Subheaders for Warning and Critical columns. - $subheaders = 'Min.'; - $subheaders .= 'Max.'; - $subheaders .= 'Inv.'; - $subheaders .= '%.'; + $subheaders = 'Min.'; + $subheaders .= 'Max.'; + $subheaders .= 'Inv.'; + $subheaders .= '%.'; // Warning header. $warning_header = html_print_div( @@ -4352,8 +4352,7 @@ class AgentWizard extends HTML ); $data_warning .= html_print_div( [ - 'class' => 'wizard-column-levels-check', - 'style' => 'margin-top: 0.3em;', + 'class' => 'wizard-column-levels-check mrgn_top_10px', 'content' => html_print_checkbox( 'module-warning-inv-'.$uniqueId, $module['inv_warning'], @@ -4369,8 +4368,7 @@ class AgentWizard extends HTML ); $data_warning .= html_print_div( [ - 'class' => 'wizard-column-levels-check', - 'style' => 'margin-top: 0.3em;', + 'class' => 'wizard-column-levels-check mrgn_top_10px', 'content' => html_print_checkbox( 'module-warning-perc-'.$uniqueId, $module['perc_warning'], @@ -4436,8 +4434,7 @@ class AgentWizard extends HTML $data[4] .= html_print_div( [ - 'class' => 'wizard-column-levels-check', - 'style' => 'margin-top: 0.3em;', + 'class' => 'wizard-column-levels-check mrgn_top_10px', 'content' => html_print_checkbox( 'module-critical-inv-'.$uniqueId, $module['inv_critical'], @@ -4454,8 +4451,7 @@ class AgentWizard extends HTML $data[4] .= html_print_div( [ - 'class' => 'wizard-column-levels-check', - 'style' => 'margin-top: 0.3em;', + 'class' => 'wizard-column-levels-check mrgn_top_10px', 'content' => html_print_checkbox( 'module-critical-perc-'.$uniqueId, $module['perc_critical'], @@ -4490,7 +4486,7 @@ class AgentWizard extends HTML '', true, '', - 'pdd_0px' + 'pdd_0px mrgn_top-8px' ); } else { // WIP. Current value of this module. diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php index 0e51faa66c..1d7fffd922 100644 --- a/pandora_console/include/functions_snmp_browser.php +++ b/pandora_console/include/functions_snmp_browser.php @@ -97,7 +97,7 @@ function snmp_browser_get_html_tree( // Id used to expand leafs. $sub_id = time().rand(0, getrandmax()); // Display the branch. - $output .= '
  • '; + $output .= '
  • '; // Indent sub branches. for ($i = 1; $i <= $depth; $i++) { diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index d8eec9b1b1..d3b9d8d6ac 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -7002,6 +7002,10 @@ div.graph div.legend table { margin-top: -2px !important; } +.mrgn_top-8px { + margin-top: -8px !important; +} + .mrgn_top-10px { margin-top: -10px; } From 27e13c26c66d51ee249c8cd4866ae171101c660b Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 30 Mar 2023 11:40:32 +0200 Subject: [PATCH 13/39] fixed styles --- .../include/functions_inventory.php | 4 + .../operation/agentes/agent_inventory.php | 109 ++- .../operation/inventory/inventory.php | 637 ++++++++---------- 3 files changed, 369 insertions(+), 381 deletions(-) diff --git a/pandora_console/include/functions_inventory.php b/pandora_console/include/functions_inventory.php index f15f888bf6..dc0c23a31c 100644 --- a/pandora_console/include/functions_inventory.php +++ b/pandora_console/include/functions_inventory.php @@ -814,6 +814,10 @@ function get_data_basic_info_sql($params, $count=false) $where .= sprintf(' AND id_agente = %d', $params['id_agent']); } + if ($params['id_group'] > 0) { + $where .= sprintf(' AND id_grupo = %d', $params['id_group']); + } + if ($params['search'] > 0) { $where .= sprintf( ' AND ( alias LIKE "%%%s%%" )', diff --git a/pandora_console/operation/agentes/agent_inventory.php b/pandora_console/operation/agentes/agent_inventory.php index e1ba0a7d88..22db47b2fc 100644 --- a/pandora_console/operation/agentes/agent_inventory.php +++ b/pandora_console/operation/agentes/agent_inventory.php @@ -109,44 +109,93 @@ $utimestampSelectValues = array_reduce( // Inventory module select. $table = new stdClass(); $table->width = '100%'; -$table->class = 'databox filters'; $table->size = []; -$table->data = []; +$table->size[0] = '33%'; +$table->size[1] = '33%'; +$table->size[2] = '33%'; +$table->class = 'filter-table-adv'; -$table->data[0][0] = __('Module'); -$table->data[0][1] = html_print_select_from_sql( - $sqlModuleInventoryAgentView, - 'module_inventory_agent_view', - $module, - 'javascript:this.form.submit();', - __('All'), - 0, +$table->data[0][0] = html_print_label_input_block( + __('Module'), + html_print_select_from_sql( + $sqlModuleInventoryAgentView, + 'module_inventory_agent_view', + $module, + 'javascript:this.form.submit();', + __('All'), + 0, + true, + false, + true, + false, + 'width:100%;' + ) +); + +$table->data[0][1] = html_print_label_input_block( + __('Date'), + html_print_select( + $utimestampSelectValues, + 'utimestamp', + $utimestamp, + 'javascript:this.form.submit();', + __('Now'), + 0, + true, + false, + true, + '', + false, + 'width:100%;' + ) +); + +$table->data[0][2] = html_print_label_input_block( + __('Search'), + html_print_input_text( + 'search_string', + $search_string, + '', + 25, + 0, + true + ) +); + +$buttons = html_print_submit_button( + __('Filter'), + 'search_button', + false, + [ + 'icon' => 'search', + 'mode' => 'mini', + ], true ); -$table->data[0][2] = __('Date'); -$table->data[0][3] = html_print_select( - $utimestampSelectValues, - 'utimestamp', - $utimestamp, - 'javascript:this.form.submit();', - __('Now'), - 0, +$searchForm = '
    '; +$searchForm .= html_print_table($table, true); +$searchForm .= html_print_div( + [ + 'class' => 'action-buttons', + 'content' => $buttons, + ], true ); +$searchForm .= '
    '; -$table->data[0][4] = __('Search'); -$table->data[0][5] = html_print_input_text('search_string', $search_string, '', 25, 0, true); -$table->data[0][6] = html_print_submit_button(__('Search'), 'search_button', false, 'class="sub wand"', true); - -// Show filters table. -echo sprintf( - '
    %s
    ', - $id_agente, - html_print_table($table, true) +ui_toggle( + $searchForm, + ''.__('Filters').'', + 'filter_form', + '', + true, + false, + '', + 'white-box-content', + 'box-flat white_table_graph fixed_filter_bar' ); -unset($table); $idModuleInventory = null; $rowTable = 1; @@ -181,7 +230,7 @@ foreach ($rows as $row) { $table->align = []; $table->cellpadding = 4; $table->cellspacing = 4; - $table->class = 'databox filters'; + $table->class = 'info_table'; $table->head = []; $table->head[0] = $row['name'].' - ('.date($config['date_format'], $row['utimestamp']).')'; @@ -210,7 +259,7 @@ foreach ($rows as $row) { foreach ($subHeadTitles as $titleData) { $table->data[0][$iterator] = $titleData; - $table->cellstyle[0][$iterator] = 'background: #373737; color: #FFF;'; + $table->cellstyle[0][$iterator] = 'background: var(--primary-color); color: #FFF;'; $iterator++; } diff --git a/pandora_console/operation/inventory/inventory.php b/pandora_console/operation/inventory/inventory.php index 8b846d9494..a373ad86ea 100755 --- a/pandora_console/operation/inventory/inventory.php +++ b/pandora_console/operation/inventory/inventory.php @@ -119,6 +119,7 @@ if (is_ajax() === true) { $length = (int) get_parameter('length', $config['block_size']); $order = get_datatable_order(); $id_agent = (int) get_parameter('id_agent', 0); + $id_group = (int) get_parameter('id_group', 0); $params = [ 'search' => $filter['value'], @@ -126,6 +127,7 @@ if (is_ajax() === true) { 'length' => $length, 'order' => $order, 'id_agent' => $id_agent, + 'id_group' => $id_group, ]; $data = get_data_basic_info_sql($params); @@ -753,295 +755,8 @@ if (is_metaconsole() === true) { $filteringFunction = ''; } -if ($is_metaconsole === false) { - // Single agent selected. - if ($inventory_id_agent > 0 && isset($agents[$inventory_id_agent]) === true) { - $agents = [$inventory_id_agent => $agents[$inventory_id_agent]]; - } - - $agents_ids = array_keys($agents); - if (count($agents_ids) > 0) { - $rows = inventory_get_datatable( - $agents_ids, - $inventory_module, - $utimestamp, - $inventory_search_string, - $export, - false, - $order_by_agent - ); - } - - if (count($agents_ids) === 0 || (int) $rows === ERR_NODATA) { - ui_print_info_message(['no_close' => true, 'message' => __('No data found.') ]); - echo ' '; - - return; - } - - echo "'; - ?> - - $row) { - $columns = explode(';', io_safe_output($row['data_format'])); - array_push($columns, 'Timestamp'); - - $data_rows = explode(PHP_EOL, $row['data']); - foreach ($data_rows as $data_row) { - // Exclude results don't match filter. - if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($data_row)) == 0) { - continue; - } - - $column_data = explode(';', io_safe_output($data_row)); - - if ($column_data[0] !== '') { - $row_tmp = []; - foreach ($column_data as $key => $value) { - $row_tmp[$columns[$key]] = $value; - } - - $row_tmp['Timestamp'] = $row['timestamp']; - array_push($data, (object) $row_tmp); - } - } - - $id_table = 'id_'.$key_row.'_'.$row['id_module_inventory'].'_'.$row['id_agente']; - - $table = ui_print_datatable( - [ - 'id' => $id_table, - 'class' => 'info_table w100p', - 'style' => 'width: 99%', - 'columns' => $columns, - 'column_names' => $columns, - 'no_sortable_columns' => [], - 'data_element' => $data, - 'searching' => true, - 'dom_elements' => 'ftip', - 'order' => [ - 'field' => $columns[0], - 'direction' => 'asc', - ], - 'zeroRecords' => __('No inventory found'), - 'emptyTable' => __('No inventory found'), - 'return' => true, - 'default_pagination' => 10, - 'no_sortable_columns' => [-1], - ] - ); - - $modules .= ui_toggle( - $table, - ''.$row['name'].'', - '', - '', - true, - true, - '', - 'white-box-content w100p', - 'box-shadow white_table_graph w100p', - 'images/arrow_down_green.png', - 'images/arrow_right_green.png', - false, - false, - false, - '', - '', - null, - null, - false, - $id_table - ); - } - - ui_toggle( - $modules, - $agent_rows['agent'], - '', - '', - false, - false - ); - } - } else { - $count_rows = count($rows); - foreach ($rows as $module_rows) { - $agent = ''; - $data = []; - - foreach ($module_rows as $row) { - $columns = explode(';', io_safe_output($row['data_format'])); - array_push($columns, 'Timestamp'); - array_push($columns, 'Agent'); - - // Exclude results don't match filter. - if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($row['data'])) == 0) { - continue; - } - - $data_tmp = []; - if ($row['data'] !== '') { - $values_explode = explode(';', io_safe_output($row['data'])); - - foreach ($values_explode as $key => $value) { - $data_tmp[$columns[$key]] = $value; - } - - $data_tmp['Timestamp'] = $row['timestamp']; - $data_tmp['Agent'] = $row['name_agent']; - array_push($data, $data_tmp); - } - - - $id_table = 'id_'.$row['id_module_inventory']; - } - - $table = ui_print_datatable( - [ - 'id' => $id_table, - 'class' => 'info_table w100p', - 'style' => 'width: 99%', - 'columns' => $columns, - 'column_names' => $columns, - 'no_sortable_columns' => [], - 'data_element' => $data, - 'searching' => true, - 'dom_elements' => 'ftip', - 'order' => [ - 'field' => $columns[0], - 'direction' => 'asc', - ], - 'zeroRecords' => __('No inventory found'), - 'emptyTable' => __('No inventory found'), - 'return' => true, - 'no_sortable_columns' => [], - ] - ); - - if ($count_rows > 1) { - ui_toggle( - $table, - array_shift($module_rows)['name'], - '', - '', - false, - false - ); - } else { - echo $table; - - html_print_action_buttons( - '', - ['type' => 'form_action'] - ); - } - } - } - } else { - $id_agente = $inventory_id_agent; - $agentes = []; - $data = []; - $class = 'info_table'; - $style = 'width: 99%'; - $ordering = true; - $searching = false; - - $columns = [ - 'alias', - 'ip', - 'secondoaryIp', - 'group', - 'secondaryGroups', - 'description', - 'os', - 'interval', - 'lastContact', - 'lastStatusChange', - 'customFields', - 'valuesCustomFields', - ]; - - $columns_names = [ - __('Alias'), - __('IP'), - __('Secondary IP'), - __('Group'), - __('Secondary groups'), - __('Description'), - __('OS'), - __('Interval'), - __('Last contact'), - __('Last status change'), - __('Custom fields'), - __('Values Custom Fields'), - ]; - - ui_print_datatable( - [ - 'id' => 'basic_info', - 'class' => $class, - 'style' => $style, - 'columns' => $columns, - 'column_names' => $columns_names, - 'ordering' => $ordering, - 'searching' => $searching, - 'order' => [ - 'field' => $columns[0], - 'direction' => 'asc', - ], - 'ajax_url' => 'operation/inventory/inventory', - 'ajax_data' => [ - 'get_data_basic_info' => 1, - 'id_agent' => $id_agente, - ], - 'zeroRecords' => __('Agent info not found'), - 'emptyTable' => __('Agent info not found'), - 'return' => false, - ] - ); - - html_print_action_buttons( - '', - ['type' => 'form_action'] - ); - } -} else { - // Metaconsole. - if ($inventory_module !== 'basic') { +if ($inventory_module !== 'basic') { + if (is_metaconsole() === true) { if ($order_by_agent === true) { $count_nodos_tmp = []; foreach ($nodos as $count_value) { @@ -1266,73 +981,293 @@ if ($is_metaconsole === false) { } } } else { - $id_agente = $inventory_id_agent; - $agentes = []; - $data = []; - $class = 'info_table'; - $style = 'width: 99%'; - $ordering = true; - $searching = false; + // Single agent selected. + if ($inventory_id_agent > 0 && isset($agents[$inventory_id_agent]) === true) { + $agents = [$inventory_id_agent => $agents[$inventory_id_agent]]; + } - $columns = [ - 'alias', - 'ip', - 'secondoaryIp', - 'group', - 'secondaryGroups', - 'description', - 'os', - 'interval', - 'lastContact', - 'lastStatusChange', - 'customFields', - 'valuesCustomFields', - ]; + $agents_ids = array_keys($agents); + if (count($agents_ids) > 0) { + $rows = inventory_get_datatable( + $agents_ids, + $inventory_module, + $utimestamp, + $inventory_search_string, + $export, + false, + $order_by_agent + ); + } - $columns_names = [ - __('Alias'), - __('IP'), - __('Secondary IP'), - __('Group'), - __('Secondary groups'), - __('Description'), - __('OS'), - __('Interval'), - __('Last contact'), - __('Last status change'), - __('Custom fields'), - __('Values Custom Fields'), - ]; + if (count($agents_ids) === 0 || (int) $rows === ERR_NODATA) { + ui_print_info_message( + [ + 'no_close' => true, + 'message' => __('No data found.'), + ] + ); + return; + } - ui_print_datatable( - [ - 'id' => 'basic_info', - 'class' => $class, - 'style' => $style, - 'columns' => $columns, - 'column_names' => $columns_names, - 'ordering' => $ordering, - 'searching' => $searching, - 'order' => [ - 'field' => $columns[0], - 'direction' => 'asc', - ], - 'ajax_url' => 'operation/inventory/inventory', - 'ajax_data' => [ - 'get_data_basic_info' => 1, - 'id_agent' => $id_agente, - ], - 'zeroRecords' => __('Agent info not found'), - 'emptyTable' => __('Agent info not found'), - 'return' => false, - ] - ); + echo "'; + ?> + + $row) { + $columns = explode(';', io_safe_output($row['data_format'])); + array_push($columns, 'Timestamp'); - html_print_action_buttons( - '', - ['type' => 'form_action'] - ); + $data_rows = explode(PHP_EOL, $row['data']); + foreach ($data_rows as $data_row) { + // Exclude results don't match filter. + if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($data_row)) == 0) { + continue; + } + + $column_data = explode(';', io_safe_output($data_row)); + + if ($column_data[0] !== '') { + $row_tmp = []; + foreach ($column_data as $key => $value) { + $row_tmp[$columns[$key]] = $value; + } + + $row_tmp['Timestamp'] = $row['timestamp']; + array_push($data, (object) $row_tmp); + } + } + + $id_table = 'id_'.$key_row.'_'.$row['id_module_inventory'].'_'.$row['id_agente']; + + $table = ui_print_datatable( + [ + 'id' => $id_table, + 'class' => 'info_table w100p', + 'style' => 'width: 99%', + 'columns' => $columns, + 'column_names' => $columns, + 'no_sortable_columns' => [], + 'data_element' => $data, + 'searching' => true, + 'dom_elements' => 'ftip', + 'order' => [ + 'field' => $columns[0], + 'direction' => 'asc', + ], + 'zeroRecords' => __('No inventory found'), + 'emptyTable' => __('No inventory found'), + 'return' => true, + 'default_pagination' => 10, + 'no_sortable_columns' => [-1], + ] + ); + + $modules .= ui_toggle( + $table, + ''.$row['name'].'', + '', + '', + true, + true, + '', + 'white-box-content w100p', + 'box-shadow white_table_graph w100p', + 'images/arrow_down_green.png', + 'images/arrow_right_green.png', + false, + false, + false, + '', + '', + null, + null, + false, + $id_table + ); + } + + ui_toggle( + $modules, + $agent_rows['agent'], + '', + '', + false, + false + ); + } + } else { + $count_rows = count($rows); + foreach ($rows as $module_rows) { + $agent = ''; + $data = []; + + foreach ($module_rows as $row) { + $columns = explode(';', io_safe_output($row['data_format'])); + array_push($columns, 'Timestamp'); + array_push($columns, 'Agent'); + + // Exclude results don't match filter. + if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($row['data'])) == 0) { + continue; + } + + $data_tmp = []; + if ($row['data'] !== '') { + $values_explode = explode(';', io_safe_output($row['data'])); + + foreach ($values_explode as $key => $value) { + $data_tmp[$columns[$key]] = $value; + } + + $data_tmp['Timestamp'] = $row['timestamp']; + $data_tmp['Agent'] = $row['name_agent']; + array_push($data, $data_tmp); + } + + + $id_table = 'id_'.$row['id_module_inventory']; + } + + $table = ui_print_datatable( + [ + 'id' => $id_table, + 'class' => 'info_table w100p', + 'style' => 'width: 99%', + 'columns' => $columns, + 'column_names' => $columns, + 'no_sortable_columns' => [], + 'data_element' => $data, + 'searching' => true, + 'dom_elements' => 'ftip', + 'order' => [ + 'field' => $columns[0], + 'direction' => 'asc', + ], + 'zeroRecords' => __('No inventory found'), + 'emptyTable' => __('No inventory found'), + 'return' => true, + 'no_sortable_columns' => [], + ] + ); + + if ($count_rows > 1) { + ui_toggle( + $table, + array_shift($module_rows)['name'], + '', + '', + false, + false + ); + } else { + echo $table; + + html_print_action_buttons( + '', + ['type' => 'form_action'] + ); + } + } + } } +} else { + $id_agente = $inventory_id_agent; + $agentes = []; + $data = []; + $class = 'info_table'; + $style = 'width: 99%'; + $ordering = true; + $searching = false; + + $columns = [ + 'alias', + 'ip', + 'secondoaryIp', + 'group', + 'secondaryGroups', + 'description', + 'os', + 'interval', + 'lastContact', + 'lastStatusChange', + 'customFields', + 'valuesCustomFields', + ]; + + $columns_names = [ + __('Alias'), + __('IP'), + __('Secondary IP'), + __('Group'), + __('Secondary groups'), + __('Description'), + __('OS'), + __('Interval'), + __('Last contact'), + __('Last status change'), + __('Custom fields'), + __('Values Custom Fields'), + ]; + + ui_print_datatable( + [ + 'id' => 'basic_info', + 'class' => $class, + 'style' => $style, + 'columns' => $columns, + 'column_names' => $columns_names, + 'ordering' => $ordering, + 'searching' => $searching, + 'order' => [ + 'field' => $columns[0], + 'direction' => 'asc', + ], + 'ajax_url' => 'operation/inventory/inventory', + 'ajax_data' => [ + 'get_data_basic_info' => 1, + 'id_agent' => $id_agente, + 'id_group' => $inventory_id_group, + ], + 'zeroRecords' => __('Agent info not found'), + 'emptyTable' => __('Agent info not found'), + 'return' => false, + ] + ); + + html_print_action_buttons( + '', + ['type' => 'form_action'] + ); } ui_require_jquery_file('pandora.controls'); From ae58add6a961e232232c8186255953357a169024 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 30 Mar 2023 12:18:16 +0200 Subject: [PATCH 14/39] Dashboard pure fix options --- pandora_console/include/styles/dashboards.css | 10 +++++++--- pandora_console/views/dashboard/header.php | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css index 3ac49172d4..df35299d27 100644 --- a/pandora_console/include/styles/dashboards.css +++ b/pandora_console/include/styles/dashboards.css @@ -22,7 +22,7 @@ } #menu_tab { - margin: 0px; + margin: 0; } #menu_tab li.nomn.tab_operation img, @@ -426,12 +426,16 @@ li#search_input_widget { top: 2px; } +.select2-search--dropdown .select2-search__field { + width: auto; +} + div#dashboard-controls { position: fixed; z-index: 1; top: 10px; right: 10px; - width: 800px; + width: 450px; height: 70px; display: flex; flex-direction: row; @@ -444,7 +448,7 @@ div#dashboard-controls { } div#dashboard-controls div { - flex: 0.5; + margin-left: 10px; text-align: center; } diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php index 93fa76bc29..5166780981 100644 --- a/pandora_console/views/dashboard/header.php +++ b/pandora_console/views/dashboard/header.php @@ -159,7 +159,7 @@ if ($public_dashboard_hash !== false) { } $comboRefreshCountdown['text'] = '
    '; -$comboRefresh['text'] = '
    '; +$comboRefresh['text'] = ''; $comboRefresh['text'] .= __('Refresh').':'; $comboRefresh['text'] .= html_print_select( \get_refresh_time_array(), @@ -284,7 +284,7 @@ if (isset($config['public_dashboard']) === true } } -if ($publicLink === false) { +if ($config['pure'] === false) { ui_print_standard_header( $dashboardName, '', From 5e24706f71ff091124581c6e954a8b454ab6b2dc Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Thu, 30 Mar 2023 12:25:45 +0200 Subject: [PATCH 15/39] Style fix --- .../godmode/agentes/modificar_agente.php | 6 +- .../agentes/status_monitor_custom_fields.php | 28 ++- pandora_console/godmode/consoles/consoles.php | 12 +- pandora_console/include/ajax/heatmap.ajax.php | 161 +++++++++++------- .../include/class/AgentsAlerts.class.php | 5 +- pandora_console/include/styles/pandora.css | 9 + .../operation/agentes/status_monitor.php | 3 + pandora_console/operation/heatmap.php | 8 +- pandora_console/views/consoles/list.php | 17 +- 9 files changed, 159 insertions(+), 90 deletions(-) diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 27f81b1f43..6056935be4 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -776,7 +776,7 @@ if ($agents !== false) { } if ((bool) $agent['disabled'] === true) { - $additionalDataAgentName[] = ui_print_help_tip(__('Disabled')); + $additionalDataAgentName[] = ui_print_help_tip(__('Disabled'), true); } if ((bool) $agent['quiet'] === true) { @@ -903,12 +903,12 @@ if ($agents !== false) { if ((bool) $agent['disabled'] === true) { $agentDisableEnableTitle = __('Enable agent'); - $agentDisableEnableAction = 'enable_agent'; + $agentDisableEnableAction = 'enable'; $agentDisableEnableCaption = __('You are going to enable a cluster agent. Are you sure?'); $agentDisableEnableIcon = 'change-active.svg'; } else { $agentDisableEnableTitle = __('Disable agent'); - $agentDisableEnableAction = 'disable_agent'; + $agentDisableEnableAction = 'disable'; $agentDisableEnableCaption = __('You are going to disable a cluster agent. Are you sure?'); $agentDisableEnableIcon = 'change-pause.svg'; } diff --git a/pandora_console/godmode/agentes/status_monitor_custom_fields.php b/pandora_console/godmode/agentes/status_monitor_custom_fields.php index a960c32bf2..2dfb79185d 100644 --- a/pandora_console/godmode/agentes/status_monitor_custom_fields.php +++ b/pandora_console/godmode/agentes/status_monitor_custom_fields.php @@ -30,6 +30,26 @@ if (! check_acl($config['id_user'], 0, 'AR') $update = get_parameter('upd_button', ''); $default = (int) get_parameter('default', 0); +// Header. +ui_print_standard_header( + __('Monitor detail').$subpage, + 'images/agent.png', + false, + '', + true, + $buttons, + [ + [ + 'link' => '', + 'label' => __('Monitoring'), + ], + [ + 'link' => '', + 'label' => __('Views'), + ], + ], + (empty($fav_menu) === true) ? [] : $fav_menu +); if ($default != 0) { $fields_selected = explode(',', $config['status_monitor_fields']); @@ -161,11 +181,11 @@ foreach ($fields_available as $key => $available) { // General title. $generalTitleContent = []; -$generalTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true); +// $generalTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true); $generalTitleContent[] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Show monitor detail fields')], true); $titledata[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $generalTitleContent) ], true); $table->data['general_title'] = $titledata; -$table->data[0][0] = ''.__('Fields available').''; +$table->data[0][0] = ''.__('Fields available').''; $table->data[1][0] = html_print_select($fields_available, 'fields_available[]', true, '', '', 0, true, true, false, '', false, 'width: 300px'); $table->data[1][1] = ''.html_print_image( 'images/darrowright.png', @@ -187,7 +207,7 @@ $table->data[1][1] .= '



    '.html_print_image( ).''; $table->data[0][1] = ''; -$table->data[0][2] = ''.__('Fields selected').''; +$table->data[0][2] = ''.__('Fields selected').''; $table->data[1][2] = html_print_select( $result_selected, 'fields_selected[]', @@ -203,7 +223,7 @@ $table->data[1][2] = html_print_select( 'width: 300px' ); -echo ''; +echo ''; html_print_table($table); html_print_action_buttons( diff --git a/pandora_console/godmode/consoles/consoles.php b/pandora_console/godmode/consoles/consoles.php index 02bbe981aa..0158dfe14c 100644 --- a/pandora_console/godmode/consoles/consoles.php +++ b/pandora_console/godmode/consoles/consoles.php @@ -54,12 +54,6 @@ $results = db_get_all_rows_in_table('tconsole'); $message = ''; -if ($results === false) { - $message = ui_print_info_message( - __('If you want to have your consoles registered, you must define them by editing config.php in each individual console and wait for cron to run in order to be registered.') - ); -} - View::render( 'consoles/list', [ @@ -67,3 +61,9 @@ View::render( 'message' => $message, ] ); + +if ($results === false) { + $message = ui_print_info_message( + __('If you want to have your consoles registered, you must define them by editing config.php in each individual console and wait for cron to run in order to be registered.') + ); +} diff --git a/pandora_console/include/ajax/heatmap.ajax.php b/pandora_console/include/ajax/heatmap.ajax.php index dd22fcdfef..37806fb4a4 100644 --- a/pandora_console/include/ajax/heatmap.ajax.php +++ b/pandora_console/include/ajax/heatmap.ajax.php @@ -45,73 +45,101 @@ if (is_ajax() === true) { $group = get_parameter('group', true); echo ''; - echo '
    '; - echo '

    '.__('Refresh').'

    '; - echo html_print_select( + echo html_print_label_input_block( + __('Refresh'), + html_print_select( + [ + '30' => __('30 seconds'), + (string) SECONDS_1MINUTE => __('1 minute'), + '180' => __('3 minutes'), + (string) SECONDS_5MINUTES => __('5 minutes'), + ], + 'refresh', + $refresh, + '', + '', + 0, + true, + false, + false, + '', + false, + 'width: 100%; margin-top: 10px;' + ), [ - '30' => __('30 seconds'), - (string) SECONDS_1MINUTE => __('1 minute'), - '180' => __('3 minutes'), - (string) SECONDS_5MINUTES => __('5 minutes'), - ], - 'refresh', - $refresh, - '', - '', - 0, - true, - false, - false, - '', - false, - 'margin-top: 3px;' + 'label_class' => 'font-title-font', + 'div_class' => 'mrgn_top_10px', + ] ); - echo '
    '; - echo '
    '; - echo '

    '.__('Search').'

    '; - echo html_print_input_text('search', $search, '', 30, 255, true); - echo '
    '; - - echo '
    '; - echo '

    '.__('Type').'

    '; - echo html_print_select( + echo html_print_label_input_block( + __('Search'), + html_print_input_text( + 'search', + $search, + '', + 30, + 255, + true, + false, + false, + '', + 'w100p' + ), [ - 0 => __('Group agents'), - 1 => __('Group modules by tag'), - 2 => __('Group modules by module group'), - 3 => __('Group modules by agents'), - ], - 'type', - $type, - '', - '', - 0, - true, - false, - false, - '', - false, - 'margin-top: 3px;width:70%' + 'label_class' => 'font-title-font', + 'div_class' => 'mrgn_top_10px', + ] ); - echo '
    '; - echo '
    '; - echo '

    '.__('Show groups').'

    '; - echo html_print_checkbox('group', 1, $group, true); - echo '
    '; + echo html_print_label_input_block( + __('Type'), + html_print_select( + [ + 0 => __('Group agents'), + 1 => __('Group modules by tag'), + 2 => __('Group modules by module group'), + 3 => __('Group modules by agents'), + ], + 'type', + $type, + '', + '', + 0, + true, + false, + false, + '', + false, + 'width: 100%; margin-top: 10px;' + ), + [ + 'label_class' => 'font-title-font', + 'div_class' => 'mrgn_top_10px', + ] + ); + + echo html_print_label_input_block( + __('Show groups'), + '
    '.html_print_checkbox('group', 1, $group, true).'
    ', + [ + 'label_class' => 'font-title-font', + 'div_class' => 'mrgn_top_10px', + ] + ); echo '
    '; } if ($getFilterType === true) { $filter = get_parameter('filter', 0); - echo '
    '; + $label = ' '; + switch ($type) { case 0: default: - echo '

    '.__('Group').'

    '; - echo html_print_input( + $label = __('Group'); + $input = html_print_input( [ 'type' => 'select_groups', 'returnAllGroup' => true, @@ -126,9 +154,9 @@ if (is_ajax() === true) { break; case 1: - echo '

    '.__('Tag').'

    '; + $label = __('Tag'); if (tags_has_user_acl_tags($config['id_user']) === false) { - echo html_print_select_from_sql( + $input = html_print_select_from_sql( 'SELECT id_tag, name FROM ttag WHERE id_tag @@ -142,7 +170,7 @@ if (is_ajax() === true) { true, false, false, - 'width: 200px', + 'width: 100%', '5' ); } else { @@ -150,7 +178,7 @@ if (is_ajax() === true) { if (!empty($user_tags)) { $id_user_tags = array_keys($user_tags); - echo html_print_select_from_sql( + $input = html_print_select_from_sql( 'SELECT id_tag, name FROM ttag WHERE id_tag IN ('.implode(',', $id_user_tags).') @@ -164,11 +192,11 @@ if (is_ajax() === true) { true, false, false, - 'width: 200px', + 'width: 100%', '5' ); } else { - echo html_print_select_from_sql( + $input = html_print_select_from_sql( 'SELECT id_tag, name FROM ttag WHERE id_tag @@ -182,7 +210,7 @@ if (is_ajax() === true) { true, false, false, - 'width: 200px', + 'width: 100%', '5' ); } @@ -190,8 +218,8 @@ if (is_ajax() === true) { break; case 2: - echo '

    '.__('Module group').'

    '; - echo html_print_select_from_sql( + $label = __('Module group'); + $input = html_print_select_from_sql( 'SELECT id_mg, name FROM tmodule_group ORDER BY name', 'filter[]', $filter, @@ -202,7 +230,7 @@ if (is_ajax() === true) { true, true, false, - 'width: 200px', + 'width: 100%', '5' ); break; @@ -212,7 +240,14 @@ if (is_ajax() === true) { break; } - echo '
    '; + echo html_print_label_input_block( + $label, + $input, + [ + 'label_class' => 'font-title-font', + 'div_class' => 'mrgn_top_10px', + ] + ); } if ($getInfo === true) { diff --git a/pandora_console/include/class/AgentsAlerts.class.php b/pandora_console/include/class/AgentsAlerts.class.php index 379b595d5a..1e3dc705b8 100644 --- a/pandora_console/include/class/AgentsAlerts.class.php +++ b/pandora_console/include/class/AgentsAlerts.class.php @@ -771,7 +771,7 @@ class AgentsAlerts extends HTML $headerInputs = []; $headerInputs[] = [ - 'label' => __('Group'), + 'label' => ''.__('Group').'', 'id' => 'select-group-id', 'arguments' => [ 'name' => 'group-id', @@ -788,8 +788,9 @@ class AgentsAlerts extends HTML ]; $headerInputs[] = [ - 'label' => __('Show modules without alerts'), + 'label' => ''.__('Show modules without alerts').'', 'id' => 'txt-use-agent-ip', + 'class' => 'display-grid mrgn_lft_15px mrgn_btn_5px', 'arguments' => [ 'name' => 'show-modules-without-alerts', 'checked' => $this->showWithoutAlertModules, diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index b4d57e1c79..0edbb6bb0c 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -805,6 +805,11 @@ select:-internal-list-box { max-height: 400px; } +.mx_height85 { + height: 85px !important; + max-height: 85px !important; +} + .no-text-imp { font-size: 0 !important; } @@ -11853,3 +11858,7 @@ li.input-interval .extra-container-input .select2 { .scale-0-8 { transform: scale(0.8); } + +label:has(span.label-alert-agent) { + margin-bottom: 10px; +} diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 473337011e..5e86d78853 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -907,6 +907,9 @@ $tableFilter->data['second_line'][1] = html_print_label_input_block( true, '', [], + true, + 0, + '30', true ) ); diff --git a/pandora_console/operation/heatmap.php b/pandora_console/operation/heatmap.php index 1e063d3c3d..a982bffb9a 100644 --- a/pandora_console/operation/heatmap.php +++ b/pandora_console/operation/heatmap.php @@ -149,13 +149,13 @@ if ($is_ajax === false && $pure === false) { if ($is_ajax === false && $pure === true) { // Floating menu - Start. - echo '
    '; + echo '
    '; echo ''; attachActionButton('edit_users', 'update', '100%', false, $SelectAction); diff --git a/pandora_console/godmode/massive/massive_enable_disable_alerts.php b/pandora_console/godmode/massive/massive_enable_disable_alerts.php index 78d84d6b57..120fae61b2 100644 --- a/pandora_console/godmode/massive/massive_enable_disable_alerts.php +++ b/pandora_console/godmode/massive/massive_enable_disable_alerts.php @@ -249,6 +249,8 @@ $table->data[5][1] .= ''; html_print_table($table); +html_print_action_buttons('', ['right_content' => $SelectAction, 'class' => 'pdd_b_10px_important pdd_t_10px_important']); + echo ''; ui_require_jquery_file('form'); diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php index fb2331a5dd..b4d4474c20 100755 --- a/pandora_console/godmode/massive/massive_operations.php +++ b/pandora_console/godmode/massive/massive_operations.php @@ -448,7 +448,9 @@ if ($option === 'edit_agents' || $option === 'edit_modules') { $tip = ui_print_help_tip(__('The blank fields will not be updated'), true); } -$SelectAction = '
    '; +global $SelectAction; + +$SelectAction = ''; $SelectAction .= ''._('Action').''; $SelectAction .= html_print_select( $options, diff --git a/pandora_console/godmode/massive/massive_standby_alerts.php b/pandora_console/godmode/massive/massive_standby_alerts.php index 704f17bfc8..9de731f40e 100644 --- a/pandora_console/godmode/massive/massive_standby_alerts.php +++ b/pandora_console/godmode/massive/massive_standby_alerts.php @@ -277,6 +277,8 @@ $table->data[5][1] .= '
    '; html_print_table($table); +html_print_action_buttons('', ['right_content' => $SelectAction, 'class' => 'pdd_b_10px_important pdd_t_10px_important']); + echo ''; ui_require_jquery_file('form'); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 508daaca8a..4bad6cf027 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -7546,6 +7546,10 @@ div.graph div.legend table { padding-bottom: 10px; } +.pdd_b_10px_important { + padding-bottom: 10px !important; +} + .pdd_b_20px { padding-bottom: 20px; } @@ -7616,6 +7620,10 @@ div.graph div.legend table { padding-top: 10px; } +.pdd_t_10px_important { + padding-top: 10px !important; +} + .pdd_t_15px { padding-top: 15px; } From 07dcc57a5bc6deea8e2ed35fa97a73c1ca944b33 Mon Sep 17 00:00:00 2001 From: slerena Date: Fri, 31 Mar 2023 12:27:08 +0000 Subject: [PATCH 34/39] Styles for events in default (white) style --- pandora_console/include/styles/pandora.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 64d0d9cae4..3035ac0321 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -11888,3 +11888,7 @@ li.input-interval .extra-container-input .select2 { label:has(span.label-alert-agent) { margin-bottom: 10px; } + +.info_table.events > tbody > tr > td { + border-bottom: 1px solid #dedede !important; +} From 484c4d4d0380ffd4a1e287938cb075a9a1dad29d Mon Sep 17 00:00:00 2001 From: slerena Date: Fri, 31 Mar 2023 12:28:52 +0000 Subject: [PATCH 35/39] Update event row style (removed duped line) --- pandora_console/include/styles/pandora_black.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 1bf1e91029..f657e9d910 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -1234,10 +1234,6 @@ a.pandora_pagination:hover { box-shadow: 0px 3px 6px #111; } -.info_table.events > tbody > tr > td { - border-bottom: 2px solid #707070; -} - .info_table tr th, .databox.data > tbody > tr > td { border-bottom: 1px solid #707070 !important; @@ -1560,7 +1556,7 @@ a.autorefresh_txt, } .info_table.events > tbody > tr > td { - border-bottom: 1px solid #333; + border-bottom: 1px solid #333 !important; } .info_table, From 20df35e399fb9ba32dd02b275c6493e3f8979c4e Mon Sep 17 00:00:00 2001 From: slerena Date: Fri, 31 Mar 2023 12:29:35 +0000 Subject: [PATCH 36/39] Removed border conflicting with white/black styles. --- pandora_console/include/styles/events.css | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css index c3f91a1588..e4dfbe428d 100644 --- a/pandora_console/include/styles/events.css +++ b/pandora_console/include/styles/events.css @@ -124,7 +124,6 @@ td > input[id^="checkbox-multi"] { padding-right: 9px; padding-top: 7px; padding-bottom: 7px; - border-bottom: 2px solid #dedede; word-break: break-all; } From 070105c7668661d8992fbf979e88df0749cb0d29 Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 1 Apr 2023 01:00:17 +0200 Subject: [PATCH 37/39] 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 8ded19869c..cb7e73abbd 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.770-230331 +Version: 7.0NG.770-230401 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 57992ca3b4..113bbc4295 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.770-230331" +pandora_version="7.0NG.770-230401" 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 62137aff06..902b45df51 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1023,7 +1023,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.770'; -use constant AGENT_BUILD => '230331'; +use constant AGENT_BUILD => '230401'; # 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 667866396d..718bce3f70 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.770 -%define release 230331 +%define release 230401 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 b0377aa0a5..c047adfd82 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.770 -%define release 230331 +%define release 230401 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 5addb64b2f..472585509f 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.770" -PI_BUILD="230331" +PI_BUILD="230401" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 389a17a13f..de2ddec511 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230331} +{230401} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index f1938ebc0e..639563c773 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.770 Build 230331") +#define PANDORA_VERSION ("7.0NG.770 Build 230401") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 82649a0112..7c5aad19a3 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.770(Build 230331))" + VALUE "ProductVersion", "(7.0NG.770(Build 230401))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 0e72a599e7..f296b51a30 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.770-230331 +Version: 7.0NG.770-230401 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 13ac984604..53724a9439 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.770-230331" +pandora_version="7.0NG.770-230401" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index c018e753f7..109d9be48f 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 = 'PC230331'; +$build_version = 'PC230401'; $pandora_version = 'v7.0NG.770'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index f46d0f2898..17eea611aa 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 4ed6471ef1..697b1ae776 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.770 -%define release 230331 +%define release 230401 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index b8384f1386..4c1d6fc120 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.770 -%define release 230331 +%define release 230401 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index b60b80ced9..3560aad93e 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.770" -PI_BUILD="230331" +PI_BUILD="230401" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 4a540bbce0..0861f04d44 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.770 Build 230331"; +my $version = "7.0NG.770 Build 230401"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 476e34f3fa..688d2d1583 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.770 Build 230331"; +my $version = "7.0NG.770 Build 230401"; # save program name for logging my $progname = basename($0); From 2bcd4de201c9fc5ff055600d7f59c11c28c8cb3c Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 2 Apr 2023 01:00:09 +0200 Subject: [PATCH 38/39] 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 cb7e73abbd..7c62699329 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.770-230401 +Version: 7.0NG.770-230402 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 113bbc4295..40fab538f8 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.770-230401" +pandora_version="7.0NG.770-230402" 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 902b45df51..87ac2c6e1b 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1023,7 +1023,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.770'; -use constant AGENT_BUILD => '230401'; +use constant AGENT_BUILD => '230402'; # 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 718bce3f70..660ac8caf7 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.770 -%define release 230401 +%define release 230402 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 c047adfd82..e569bdfa44 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.770 -%define release 230401 +%define release 230402 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 472585509f..1d8a385ec4 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.770" -PI_BUILD="230401" +PI_BUILD="230402" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index de2ddec511..6b3995655f 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230401} +{230402} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 639563c773..1cbccaa21b 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.770 Build 230401") +#define PANDORA_VERSION ("7.0NG.770 Build 230402") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 7c5aad19a3..f68608f031 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.770(Build 230401))" + VALUE "ProductVersion", "(7.0NG.770(Build 230402))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index f296b51a30..3a00a118fe 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.770-230401 +Version: 7.0NG.770-230402 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 53724a9439..71afe2d3e6 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.770-230401" +pandora_version="7.0NG.770-230402" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 109d9be48f..bbe0df349b 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 = 'PC230401'; +$build_version = 'PC230402'; $pandora_version = 'v7.0NG.770'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 17eea611aa..35376ce33f 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 697b1ae776..ac0a75e81e 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.770 -%define release 230401 +%define release 230402 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 4c1d6fc120..4d0ed401fc 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.770 -%define release 230401 +%define release 230402 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 3560aad93e..70c25c2c6d 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.770" -PI_BUILD="230401" +PI_BUILD="230402" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 0861f04d44..b437e8b59e 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.770 Build 230401"; +my $version = "7.0NG.770 Build 230402"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 688d2d1583..6f4184706e 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.770 Build 230401"; +my $version = "7.0NG.770 Build 230402"; # save program name for logging my $progname = basename($0); From 715cedb20f87e3cf3029e4bcae1d9778ac7837e6 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 3 Apr 2023 01:00:12 +0200 Subject: [PATCH 39/39] 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 7c62699329..87a88442db 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.770-230402 +Version: 7.0NG.770-230403 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 40fab538f8..11348cc214 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.770-230402" +pandora_version="7.0NG.770-230403" 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 87ac2c6e1b..97a5bb36df 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1023,7 +1023,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.770'; -use constant AGENT_BUILD => '230402'; +use constant AGENT_BUILD => '230403'; # 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 660ac8caf7..31c3d1c181 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.770 -%define release 230402 +%define release 230403 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 e569bdfa44..71cad24f1c 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.770 -%define release 230402 +%define release 230403 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 1d8a385ec4..ba346ac89f 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.770" -PI_BUILD="230402" +PI_BUILD="230403" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 6b3995655f..d61f08596d 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230402} +{230403} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 1cbccaa21b..a8f234db7f 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.770 Build 230402") +#define PANDORA_VERSION ("7.0NG.770 Build 230403") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index f68608f031..d872c5b795 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.770(Build 230402))" + VALUE "ProductVersion", "(7.0NG.770(Build 230403))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 3a00a118fe..e6b49d2f61 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.770-230402 +Version: 7.0NG.770-230403 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 71afe2d3e6..786198bcaa 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.770-230402" +pandora_version="7.0NG.770-230403" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index bbe0df349b..e729b8bf14 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 = 'PC230402'; +$build_version = 'PC230403'; $pandora_version = 'v7.0NG.770'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 35376ce33f..d01a800c73 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index ac0a75e81e..fa7c55c1fa 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.770 -%define release 230402 +%define release 230403 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 4d0ed401fc..aa68723268 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.770 -%define release 230402 +%define release 230403 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 70c25c2c6d..508a6308c2 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.770" -PI_BUILD="230402" +PI_BUILD="230403" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index b437e8b59e..8dcd7ed78b 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.770 Build 230402"; +my $version = "7.0NG.770 Build 230403"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 6f4184706e..60bfbf937d 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.770 Build 230402"; +my $version = "7.0NG.770 Build 230403"; # save program name for logging my $progname = basename($0);