From b057f59a1b31e33d2133382b1b90a3e4b2842bbe Mon Sep 17 00:00:00 2001 From: alejandro Date: Tue, 23 Apr 2024 16:28:56 +0200 Subject: [PATCH 01/38] update version vmware and hash --- .../extras/discovery/DiscoveryApplicationsMigrateCodes.ini | 2 +- pandora_console/extras/mr/69.sql | 2 ++ pandora_console/pandoradb_data.sql | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini b/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini index c4b4591ce2..8791d535ff 100644 --- a/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini +++ b/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini @@ -1,4 +1,4 @@ -pandorafms.vmware=3d1785e1baa07db0a40b9e47bb30472c +pandorafms.vmware=09733bb0fa17a186fb62050c2d8fe0b6 pandorafms.mysql=33d470c7492214d4b384ed307e81adf4 pandorafms.vmware=1deafce1d55d3574645d8b136104e9ad pandorafms.mysql=ca7dd8b80a1a03a25eb0fb077818ad63 diff --git a/pandora_console/extras/mr/69.sql b/pandora_console/extras/mr/69.sql index ea49c68624..043ab0fe03 100644 --- a/pandora_console/extras/mr/69.sql +++ b/pandora_console/extras/mr/69.sql @@ -7754,4 +7754,6 @@ ALTER TABLE `tdeployment_hosts` DROP COLUMN `arch`; -- Update all deployment recon tasks port UPDATE `trecon_task` SET `field4` = 41121 WHERE `type` = 9; +UPDATE `tdiscovery_apps` SET `version` = '1.5' WHERE `short_name` = 'pandorafms.vmware'; + COMMIT; \ No newline at end of file diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index c80dac17f4..7e76dc95ca 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -2863,7 +2863,7 @@ SET @short_name = 'pandorafms.vmware'; SET @name = 'VMware'; SET @section = 'app'; SET @description = 'Monitor ESXi hosts, datastores and VMs from a specific datacenter'; -SET @version = '1.4'; +SET @version = '1.5'; INSERT IGNORE INTO `tdiscovery_apps` (`id_app`, `short_name`, `name`, `section`, `description`, `version`) VALUES ('', @short_name, @name, @section, @description, @version); SELECT @id_app := `id_app` FROM `tdiscovery_apps` WHERE `short_name` = @short_name; From 0eb80ff8bfdc4a6cacf58759ebe60d1d62c3c65b Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Thu, 25 Apr 2024 12:17:36 +0200 Subject: [PATCH 02/38] #13584 Fixed style in Force check button --- pandora_console/include/functions_agents.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 12f79aa680..83b2eef852 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -4755,7 +4755,10 @@ function get_resume_agent_concat($id_agente, $all_groups, $agent) 'force_checks', false, 'window.location.assign("'.$url.'&flag_agent=1")', - [ 'mode' => 'link' ], + [ + 'mode' => 'link', + 'class' => 'mrgn_lft_20px ', + ], true ); } From 14e909f6309154100a2c381496f90cc5609359dd Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 25 Apr 2024 12:44:16 +0200 Subject: [PATCH 03/38] #13652 fix dialog close error --- pandora_console/include/javascript/jquery.pandora.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js index f1cffbb125..bc94cf8fbe 100644 --- a/pandora_console/include/javascript/jquery.pandora.js +++ b/pandora_console/include/javascript/jquery.pandora.js @@ -216,7 +216,7 @@ $(document).ready(function() { }); $("#ok_buttom").click(function() { - $("#license_error_msg_dialog").dialog("close"); + $(".ui-dialog-content").dialog("close"); }); } } From a5d4eac0194aee7dd6eea31396dab02c0ec69174 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Thu, 25 Apr 2024 14:35:19 +0200 Subject: [PATCH 04/38] 13579-Fix background graph widgets dark theme --- pandora_console/include/styles/pandora_black.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 1383a3c8b5..f3396be8ae 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -2102,3 +2102,8 @@ select option:checked { #result_order .show_result_interpreter #result_items li.active { background-color: var(--secondary-color); } + +.content-widget .legend_background, +.content-widget .flot-base { + background-color: unset; +} From 9a78752e873975ef3e89f5a6566c1c4e9bdce5e5 Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Thu, 25 Apr 2024 15:33:10 +0200 Subject: [PATCH 05/38] #13464 fixed errata --- .../godmode/reporting/reporting_builder.item_editor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 5af45c53c4..02d57a5bf4 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -1459,7 +1459,7 @@ $class = 'databox filters'; From 18d41b038911a527b901b49c90b4a1cb2c539cc3 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 25 Apr 2024 17:05:42 +0200 Subject: [PATCH 06/38] #13534 fixed js injection --- pandora_server/util/pandora_manage.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 31b977cf51..5b721bd0fc 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -6191,7 +6191,7 @@ sub cli_create_group() { eval { $group_id_nodo = db_insert ($dbh_metaconsole, 'id_grupo', 'INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id, id_skin, description) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', $group_name, safe_input($group_name), $icon, - $parent_group_id, 0, 0, '', 0, $description); + $parent_group_id, 0, 0, '', 0, safe_input($description)); }; if ($@) { print_log "[ERROR] Problems with IDS and doesn't created group\n\n"; @@ -6293,15 +6293,15 @@ sub cli_update_group() { if(defined($icon)){ if(defined($description)){ - db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? , icon=? , description=? WHERE id_grupo=?',$group_name,$parent_group_id,$icon,$description,$group_id); + db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? , icon=? , description=? WHERE id_grupo=?',safe_input($group_name),$parent_group_id,$icon, safe_input($description) ,$group_id); }else{ - db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? , icon=? WHERE id_grupo=?',$group_name,$parent_group_id,$icon,$group_id); + db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? , icon=? WHERE id_grupo=?',safe_input($group_name),$parent_group_id,$icon,$group_id); } }else{ - db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? WHERE id_grupo=?',$group_name,$parent_group_id,$group_id); + db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? WHERE id_grupo=?',safe_input($group_name),$parent_group_id,$group_id); } }else{ - db_do ($dbh,'UPDATE tgrupo SET nombre=? WHERE id_grupo=?',$group_name,$group_id); + db_do ($dbh,'UPDATE tgrupo SET nombre=? WHERE id_grupo=?',safe_input($group_name),$group_id); } print_log "[INFO] Updated group '$group_id'\n\n"; } From 5d4b5f96272e14c315e476f8ecf279dd9d8eaa48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Su=C3=A1rez?= Date: Thu, 25 Apr 2024 09:39:16 -0600 Subject: [PATCH 07/38] Remove xprobe from conf.new --- pandora_server/conf/pandora_server.conf.new | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index eded19d4db..c40746ff70 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -308,10 +308,8 @@ dataserver_threads 1 # Set 0 if want eMail deliver shared mail by all destination. mail_in_separate 1 -# nmap: If provided, is used to detect OS type with recon server using -# advanded OS fingerprint technique. Xprobe2 gives more accurate results -# Nmap is also used to do TCP port scanning in detected host. - +# nmap: used to detect OS type with recon server using advanced OS fingerprint technique. +# Nmap is also used to do TCP port scanning for host detection. nmap /usr/bin/nmap # Default path is /usr/sbin/fping for installation default in distro Centos , if you are installing in other distribution, From 006b41377980c2267397a3b263b1ba827b5325cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Su=C3=A1rez?= Date: Thu, 25 Apr 2024 09:42:14 -0600 Subject: [PATCH 08/38] Remove other Xprobe2 references --- pandora_server/FreeBSD/pandora_server.conf.new | 6 ++---- pandora_server/NetBSD/pandora_server.conf.new | 6 ++---- pandora_server/conf/pandora_server_sec.conf.template | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pandora_server/FreeBSD/pandora_server.conf.new b/pandora_server/FreeBSD/pandora_server.conf.new index 90bd666b2b..f3e5276359 100644 --- a/pandora_server/FreeBSD/pandora_server.conf.new +++ b/pandora_server/FreeBSD/pandora_server.conf.new @@ -242,10 +242,8 @@ mta_address localhost # Set 0 if want eMail deliver shared mail by all destination. mail_in_separate 1 -# nmap: If provided, is used to detect OS type with recon server using -# advanded OS fingerprint technique. Xprobe2 gives more accurate results -# Nmap is also used to do TCP port scanning in detected host. - +# nmap: used to detect OS type with recon server using advanced OS fingerprint technique. +# Nmap is also used to do TCP port scanning for host detection. nmap /usr/local/bin/nmap # Default path is /usr/sbin/fping for installation default in distro Centos , if you are installing in other distribution, diff --git a/pandora_server/NetBSD/pandora_server.conf.new b/pandora_server/NetBSD/pandora_server.conf.new index 1adb9027f4..c9da05cddf 100644 --- a/pandora_server/NetBSD/pandora_server.conf.new +++ b/pandora_server/NetBSD/pandora_server.conf.new @@ -238,10 +238,8 @@ mta_address localhost # Set 0 if want eMail deliver shared mail by all destination. mail_in_separate 1 -# nmap: If provided, is used to detect OS type with recon server using -# advanded OS fingerprint technique. Xprobe2 gives more accurate results -# Nmap is also used to do TCP port scanning in detected host. - +# nmap: used to detect OS type with recon server using advanced OS fingerprint technique. +# Nmap is also used to do TCP port scanning for host detection. nmap /usr/pkg/bin/nmap # Path to the fping binary. Used by the Enterprise ICMP Server. diff --git a/pandora_server/conf/pandora_server_sec.conf.template b/pandora_server/conf/pandora_server_sec.conf.template index b070938187..088e2adf6e 100644 --- a/pandora_server/conf/pandora_server_sec.conf.template +++ b/pandora_server/conf/pandora_server_sec.conf.template @@ -302,10 +302,8 @@ dataserver_threads 1 # Set 0 if want eMail deliver shared mail by all destination. mail_in_separate 1 -# nmap: If provided, is used to detect OS type with recon server using -# advanded OS fingerprint technique. Xprobe2 gives more accurate results -# Nmap is also used to do TCP port scanning in detected host. - +# nmap: used to detect OS type with recon server using advanced OS fingerprint technique. +# Nmap is also used to do TCP port scanning for host detection. nmap /usr/bin/nmap # Default path is /usr/sbin/fping for installation default in distro Centos , if you are installing in other distribution, From 706ecec9d895ad1b6156dd8bb98b0b79f0ebccd2 Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Fri, 26 Apr 2024 13:30:14 +0200 Subject: [PATCH 09/38] #13507 Fixed dark theme styles for Netflow Explorer filter and view icons --- .../operation/network/network_report.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/network/network_report.php b/pandora_console/operation/network/network_report.php index bc72602fd0..069b8f99f3 100644 --- a/pandora_console/operation/network/network_report.php +++ b/pandora_console/operation/network/network_report.php @@ -483,6 +483,9 @@ $table->data = []; $chart_data = []; $labels = []; $hide_filter = !empty($main_value) && ($action === 'udp' || $action === 'tcp'); +$row_icon_color_filters = ($config['style'] === 'pandora') ? '' : 'filter: invert(100%) !important;'; +$row_icon_color_eye = ($config['style'] === 'pandora') ? '' : 'filter: invert(100%) !important; background-color: transparent !important;'; + foreach ($data as $item) { $row = []; $row['main'] = '
'; @@ -491,9 +494,17 @@ foreach ($data as $item) { $row['main'] .= html_print_link_with_params( 'images/filters@svg.svg', array_merge($hidden_main_link, ['main_value' => $item['host']]), - 'image' + 'image', + $row_icon_color_filters, + ); + $row['main'] .= html_print_input_image( + 'whois', + 'images/eye.png', + 'whois', + $row_icon_color_eye, + true, + ['onclick' => 'whois(\''.$item['host'].'\')'], ); - $row['main'] .= html_print_input_image('whois', 'images/eye.png', 'whois', '', true, ['onclick' => 'whois(\''.$item['host'].'\')']); } $row['main'] .= '
'; From 86db699cd315b83e97aaef0ef979c415407f7faa Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 29 Apr 2024 09:20:15 +0200 Subject: [PATCH 10/38] #13534 fixed sql injection in cli --- pandora_server/util/pandora_manage.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 5b721bd0fc..6ef84cbc43 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -6166,7 +6166,7 @@ sub cli_create_group() { $icon = '' unless defined($icon); $description = '' unless defined($description); - $group_id = pandora_create_group ($group_name, $icon, $parent_group_id, 0, 0, '', 0, $description, $dbh); + $group_id = pandora_create_group ($group_name, $icon, $parent_group_id, 0, 0, '', 0, safe_input($description), $dbh); if($group_id == -1) { print_log "[ERROR] A problem has been ocurred creating group '$group_name'\n\n"; From 1b812155e779002bf0481926fb9bf5e4421a4b38 Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Mon, 29 Apr 2024 10:15:02 +0200 Subject: [PATCH 11/38] #13527 Fixed dark theme styles sound console --- pandora_console/include/ajax/events.php | 2 +- .../include/javascript/pandora_events.js | 22 +++---------------- .../include/styles/pandora_black.css | 7 +++++- .../operation/events/sound_events.php | 4 ++-- 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index a063ef5c8b..b053d304b6 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -2541,7 +2541,7 @@ if ($drawConsoleSound === true) { true, [ 'title' => __('No alerts discovered'), - 'class' => 'invert_filter', + 'class' => '', ] ); $output .= ''; diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index 09ddee825c..2d7f5b0fca 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -1066,7 +1066,7 @@ function openSoundEventsDialog(settings, dialog_parameters) { resizable: false, modal: false, width: 600, - height: 600, + height: 700, dialogClass: "modal-sound", open: function() { $.ajax({ @@ -1102,24 +1102,8 @@ function openSoundEventsDialog(settings, dialog_parameters) { if (mode == 0) { action = true; } - if ($("#button-start-search").hasClass("play")) { - $("#modal-sound").css({ - height: "500px" - }); - $("#modal-sound") - .parent() - .css({ - height: "550px" - }); - } else { - $("#modal-sound").css({ - height: "450px" - }); - $("#modal-sound") - .parent() - .css({ - height: "500px" - }); + if (!$("#button-start-search").hasClass("play")) { + $("#progressbar_time").empty(); } action_events_sound(action, settings); diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index aa27e0fbf8..fae2a929b1 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -556,6 +556,11 @@ table#diagnostic_info tbody td div { color: var(--text-color) !important; } +.ui-widget-dialog-border, +.ui-dialog { + border: 1px solid #333 !important; +} + #cancel_btn_dialog { background-color: red; } @@ -1443,7 +1448,7 @@ button.submitButton { button.buttonButton.secondary, button.submitButton.secondary { background-color: #999; - color: var(--text-color); + color: var(--text-color) !important; border-color: #fff; } diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php index 42ff6af0cb..50dae7b9af 100644 --- a/pandora_console/operation/events/sound_events.php +++ b/pandora_console/operation/events/sound_events.php @@ -96,7 +96,7 @@ if ($config['style'] === 'pandora_black' && !is_metaconsole()) { echo ''; echo ''; -$output = '
'; +$output = '
'; // Header tabs. $output .= '
    '; $output .= '
  • '; @@ -264,7 +264,7 @@ $output = '
    '; true, [ 'title' => __('No alerts discovered'), - 'class' => 'invert_filter', + 'class' => '', ] ); $output .= ''; From dbc20faeb2f2b0052ffd9ad5c5974d071bd14507 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 29 Apr 2024 12:10:08 +0200 Subject: [PATCH 12/38] #13659 pagination snmp view agent --- pandora_console/include/ajax/module.php | 128 ++++++++++++++ pandora_console/include/functions_agents.php | 29 +++- .../agentes/estado_generalagente.php | 158 ++++++------------ 3 files changed, 203 insertions(+), 112 deletions(-) diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 37fac4ccac..18500c4d8d 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -55,6 +55,7 @@ if (check_login()) { $get_id_tag = (bool) get_parameter('get_id_tag', 0); $get_type = (bool) get_parameter('get_type', 0); $list_modules = (bool) get_parameter('list_modules', 0); + $list_snmp_modules = (bool) get_parameter('list_snmp_modules', 0); $get_agent_modules_json_by_name = (bool) get_parameter( 'get_agent_modules_json_by_name', 0 @@ -1538,6 +1539,133 @@ if (check_login()) { unset($table_data); } + if ($list_snmp_modules) { + include_once $config['homedir'].'/include/functions_graph.php'; + $agent = get_parameter('agent'); + $id_agente = $agent; + $network_interfaces_by_agents = agents_get_network_interfaces([$agent], false, true, get_parameter('offset', 0)); + $count_network_incerfaces = agents_get_network_interfaces([$agent], false, false, 0, true); + $network_interfaces = []; + if (empty($network_interfaces_by_agents) === false && empty($network_interfaces_by_agents[$id_agente]) === false) { + $network_interfaces = $network_interfaces_by_agents[$id_agente]['interfaces']; + } + + if (empty($network_interfaces) === false) { + $table_interface = new stdClass(); + $table_interface->id = 'agent_interface_info'; + $table_interface->class = 'info_table'; + $table_interface->width = '100%'; + $table_interface->style = []; + $table_interface->style['interface_event_graph'] = 'width: 35%;'; + + $table_interface->head = []; + $options = [ + 'class' => 'closed', + 'style' => 'cursor:pointer;', + ]; + $table_interface->data = []; + $event_text_cont = 0; + + $paginate_module = false; + if (isset($config['paginate_module']) === true) { + $paginate_module = (bool) $config['paginate_module']; + } + + foreach ($network_interfaces as $interface_name => $interface) { + if (empty($interface['traffic']) === false) { + $permission = check_acl_one_of_groups($config['id_user'], $all_groups, 'RR'); + + if ($permission) { + $params = [ + 'interface_name' => $interface_name, + 'agent_id' => $id_agente, + 'traffic_module_in' => $interface['traffic']['in'], + 'traffic_module_out' => $interface['traffic']['out'], + ]; + $params_json = json_encode($params); + $params_encoded = base64_encode($params_json); + $win_handle = dechex(crc32($interface['status_module_id'].$interface_name)); + $graph_link = ""; + $graph_link .= html_print_image( + 'images/chart.png', + true, + [ + 'title' => __('Interface traffic'), + 'class' => 'invert_filter', + ] + ).''; + } else { + $graph_link = ''; + } + } else { + $graph_link = ''; + } + + $content = [ + 'id_agent_module' => $interface['status_module_id'], + 'id_group' => $id_group, + 'period' => SECONDS_1DAY, + 'time_from' => '00:00:00', + 'time_to' => '00:00:00', + 'sizeForTicks' => 250, + 'height_graph' => 40, + [ + ['id_agent_module' => $interface['status_module_id']], + ] + ]; + + $e_graph = \reporting_module_histogram_graph( + ['datetime' => time()], + $content + ); + + $sqlLast_contact = sprintf( + ' + SELECT timestamp + FROM tagente_estado + WHERE id_agente_modulo = '.$interface['status_module_id'] + ); + + $last_contact = db_get_all_rows_sql($sqlLast_contact); + $last_contact = array_shift($last_contact); + $last_contact = array_shift($last_contact); + + $data = []; + $data['interface_name'] = ''.$interface_name.''; + $data['interface_status'] = $interface['status_image']; + $data['interface_graph'] = $graph_link; + $data['interface_ip'] = $interface['ip']; + $data['interface_mac'] = $interface['mac']; + $data['last_contact'] = __('Last contact: ').$last_contact; + $data['interface_event_graph'] = $e_graph['chart']; + + $table_interface->data[] = $data; + } + + if ($paginate_module === true) { + ui_pagination( + $count_network_incerfaces, + false, + 0, + 0, + false, + 'offset', + true, + '', + 'change_page_snmp(offset_param)', + [ + 'count' => '', + 'offset' => 'offset_param', + ] + ); + } + + html_print_table($table_interface); + } + } + if ($get_type === true) { $id_module = (int) get_parameter('id_module'); $module = modules_get_agentmodule($id_module); diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 12f79aa680..28a98e46b4 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -1544,7 +1544,9 @@ function agents_get_modules( $indexed=true, $get_not_init_modules=true, $force_tags=false, - $filter_include_sql=true + $filter_include_sql=true, + $pagination=false, + $offset=0, ) { global $config; @@ -1717,7 +1719,17 @@ function agents_get_modules( $sql_tags_join, $where ); - $result = db_get_all_rows_sql($sql); + + $limit = ''; + if ($pagination === true) { + if ($offset === 0) { + $limit = ' LIMIT '.$config['block_size'].' OFFSET 0'; + } else { + $limit = ' LIMIT '.$config['block_size'].' OFFSET '.$offset; + } + } + + $result = db_get_all_rows_sql($sql.$limit); if (empty($result)) { return []; @@ -3333,7 +3345,7 @@ function agents_update_gis( * * @return array A list of network interfaces information by agents. */ -function agents_get_network_interfaces($agents=false, $agents_filter=false) +function agents_get_network_interfaces($agents=false, $agents_filter=false, $pagination=false, $offset=0, $count=false) { global $config; @@ -3432,8 +3444,17 @@ function agents_get_network_interfaces($agents=false, $agents_filter=false) $columns, $filter, true, - false + false, + false, + true, + $pagination, + $offset ); + + if ($count === true) { + return (count($modules) ?? 0); + } + if (!empty($modules)) { $interfaces = []; diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 82aa8376d1..e50a5b174f 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -374,111 +374,6 @@ for ($i = 0; $i < $custom_fields_count; $i++) { /* * END: TABLE DATA BUILD - */ - -/* - * START: TABLE INTERFACES - */ - -$network_interfaces_by_agents = agents_get_network_interfaces([$agent]); - -$network_interfaces = []; -if (empty($network_interfaces_by_agents) === false && empty($network_interfaces_by_agents[$id_agente]) === false) { - $network_interfaces = $network_interfaces_by_agents[$id_agente]['interfaces']; -} - -if (empty($network_interfaces) === false) { - $table_interface = new stdClass(); - $table_interface->id = 'agent_interface_info'; - $table_interface->class = 'info_table'; - $table_interface->width = '100%'; - $table_interface->style = []; - $table_interface->style['interface_event_graph'] = 'width: 35%;'; - - $table_interface->head = []; - $options = [ - 'class' => 'closed', - 'style' => 'cursor:pointer;', - ]; - $table_interface->data = []; - $event_text_cont = 0; - - foreach ($network_interfaces as $interface_name => $interface) { - if (empty($interface['traffic']) === false) { - $permission = check_acl_one_of_groups($config['id_user'], $all_groups, 'RR'); - - if ($permission) { - $params = [ - 'interface_name' => $interface_name, - 'agent_id' => $id_agente, - 'traffic_module_in' => $interface['traffic']['in'], - 'traffic_module_out' => $interface['traffic']['out'], - ]; - $params_json = json_encode($params); - $params_encoded = base64_encode($params_json); - $win_handle = dechex(crc32($interface['status_module_id'].$interface_name)); - $graph_link = ""; - $graph_link .= html_print_image( - 'images/chart.png', - true, - [ - 'title' => __('Interface traffic'), - 'class' => 'invert_filter', - ] - ).''; - } else { - $graph_link = ''; - } - } else { - $graph_link = ''; - } - - $content = [ - 'id_agent_module' => $interface['status_module_id'], - 'id_group' => $id_group, - 'period' => SECONDS_1DAY, - 'time_from' => '00:00:00', - 'time_to' => '00:00:00', - 'sizeForTicks' => 250, - 'height_graph' => 40, - [ - ['id_agent_module' => $interface['status_module_id']], - ] - ]; - - $e_graph = \reporting_module_histogram_graph( - ['datetime' => time()], - $content - ); - - $sqlLast_contact = sprintf( - ' - SELECT timestamp - FROM tagente_estado - WHERE id_agente_modulo = '.$interface['status_module_id'] - ); - - $last_contact = db_get_all_rows_sql($sqlLast_contact); - $last_contact = array_shift($last_contact); - $last_contact = array_shift($last_contact); - - $data = []; - $data['interface_name'] = ''.$interface_name.''; - $data['interface_status'] = $interface['status_image']; - $data['interface_graph'] = $graph_link; - $data['interface_ip'] = $interface['ip']; - $data['interface_mac'] = $interface['mac']; - $data['last_contact'] = __('Last contact: ').$last_contact; - $data['interface_event_graph'] = $e_graph['chart']; - - $table_interface->data[] = $data; - } -} - -/* - * END: TABLE INTERFACES */ // This javascript piece of code is used to make expandible @@ -651,16 +546,23 @@ if (empty($agentIncidents) === false) { ); } -if (isset($table_interface) === true) { +$count_network_incerfaces = agents_get_network_interfaces([$agent], false, false, 0, true); +if ($count_network_incerfaces > 0) { ui_toggle( - html_print_table($table_interface, true), + html_print_div( + [ + 'id' => 'agent_interface_info', + 'content' => '', + 'class' => 'w100p', + ], + true + ), ''.__('Interface information (SNMP)').'', '', 'interface-table-status-agent', true ); } - ?> From a2ab92f90b4187c476116864cd3eebe1137cc971 Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Mon, 29 Apr 2024 13:04:01 +0200 Subject: [PATCH 13/38] #13507 Fixed dark theme style in the Netflow explorer chart label. --- pandora_console/include/functions_netflow.php | 8 ++++++-- .../artica/phpchartjs/src/Renderer/JavaScript.php | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index 9f016ac88a..247b81a816 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -1570,8 +1570,12 @@ function netflow_draw_item( ); // Theme. - $theme = $config['style']; - $text_color = ($theme !== 'pandora_black') ? '#333' : '#fff'; + $user_info = get_user_info($config['id_user']); + if (isset($user_info['id_skin']) === true && (int) $user_info['id_skin'] === 2) { + $text_color = '#ffffff'; + } else { + $text_color = '#333333'; + } $graph_output = pie_graph( $pie_data, diff --git a/pandora_console/vendor/artica/phpchartjs/src/Renderer/JavaScript.php b/pandora_console/vendor/artica/phpchartjs/src/Renderer/JavaScript.php index 6b4848cb00..9462f5c803 100644 --- a/pandora_console/vendor/artica/phpchartjs/src/Renderer/JavaScript.php +++ b/pandora_console/vendor/artica/phpchartjs/src/Renderer/JavaScript.php @@ -128,6 +128,13 @@ class JavaScript extends Renderer } } };'; + + if ($this->chart->options()->getTheme() !== null) { + if ((int) $this->chart->options()->getTheme() === 2) { + $script[] = 'Chart.defaults.color = "#ffffff";'; + } + } + $script[] = 'Chart.register(chart_watermark_'.$this->chart->getId().');'; } @@ -163,6 +170,10 @@ class JavaScript extends Renderer if (chart.config.options.title !== undefined ) { chart.config.options.title.fontColor = "#ffffff"; } + + if (chart.config.options.plugins.legend.labels.font !== undefined ) { + chart.config.options.plugins.legend.labels.font.color = "#ffffff"; + } '; } } From d0ebee12ffd197cbea5b797018d0e09eb9b842bd Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 29 Apr 2024 13:12:47 +0200 Subject: [PATCH 14/38] #17267 pagination token --- pandora_console/include/ajax/module.php | 12 ++++++------ pandora_console/include/functions_agents.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 18500c4d8d..86ea0cb301 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -1543,7 +1543,12 @@ if (check_login()) { include_once $config['homedir'].'/include/functions_graph.php'; $agent = get_parameter('agent'); $id_agente = $agent; - $network_interfaces_by_agents = agents_get_network_interfaces([$agent], false, true, get_parameter('offset', 0)); + $paginate_module = false; + if (isset($config['paginate_module']) === true) { + $paginate_module = (bool) $config['paginate_module']; + } + + $network_interfaces_by_agents = agents_get_network_interfaces([$agent], false, $paginate_module, get_parameter('offset', 0)); $count_network_incerfaces = agents_get_network_interfaces([$agent], false, false, 0, true); $network_interfaces = []; if (empty($network_interfaces_by_agents) === false && empty($network_interfaces_by_agents[$id_agente]) === false) { @@ -1566,11 +1571,6 @@ if (check_login()) { $table_interface->data = []; $event_text_cont = 0; - $paginate_module = false; - if (isset($config['paginate_module']) === true) { - $paginate_module = (bool) $config['paginate_module']; - } - foreach ($network_interfaces as $interface_name => $interface) { if (empty($interface['traffic']) === false) { $permission = check_acl_one_of_groups($config['id_user'], $all_groups, 'RR'); diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 28a98e46b4..da51e102e0 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -1721,7 +1721,7 @@ function agents_get_modules( ); $limit = ''; - if ($pagination === true) { + if ($pagination === true && isset($config['paginate_module']) === true) { if ($offset === 0) { $limit = ' LIMIT '.$config['block_size'].' OFFSET 0'; } else { From 243793786e0e4e088fd7a129e7802faa5cac2c5c Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Mon, 29 Apr 2024 15:15:29 +0200 Subject: [PATCH 15/38] #13653 fixed the message when removing the OS. --- pandora_console/godmode/setup/os.list.php | 4 +++- pandora_console/include/ajax/os.php | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php index 2c722aade0..5ec791baca 100644 --- a/pandora_console/godmode/setup/os.list.php +++ b/pandora_console/godmode/setup/os.list.php @@ -219,7 +219,9 @@ echo ''; $('#aux').text(''); } else { $('#aux').dialog('close'); - location.reload(); + let url = new URL(window.location.href); + url.searchParams.set('message', r.url_message) + window.location.href = url.href; } }, error: function(e) { diff --git a/pandora_console/include/ajax/os.php b/pandora_console/include/ajax/os.php index 058fe75578..5879a00158 100644 --- a/pandora_console/include/ajax/os.php +++ b/pandora_console/include/ajax/os.php @@ -60,7 +60,12 @@ if ($method === 'deleteOS') { ) { echo json_encode(['deleted' => false]); } else { - echo json_encode(['deleted' => true]); + echo json_encode( + [ + 'deleted' => true, + 'url_message' => 6, + ] + ); } } From d2174194c964a4639b6cfde517d37f2128ff2685 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 29 Apr 2024 15:40:11 +0200 Subject: [PATCH 16/38] #13625 fix traps hints and url --- .../include/class/SnmpConsole.class.php | 8 +-- pandora_console/include/functions_ui.php | 6 +-- pandora_console/include/javascript/pandora.js | 50 +++++++++---------- pandora_console/include/styles/pandora.css | 4 ++ 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php index f564b6599d..fefce2e54f 100644 --- a/pandora_console/include/class/SnmpConsole.class.php +++ b/pandora_console/include/class/SnmpConsole.class.php @@ -521,7 +521,7 @@ class SnmpConsole extends HTML $legend .= '
    '; $legend .= html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).' - '.__('Delete'); $legend .= '
    '; - $legend .= '
'; + $legend .= '
'; echo '
'; @@ -778,11 +778,11 @@ class SnmpConsole extends HTML // SNMP Agent. $agent = agents_get_agent_with_ip($tmp->source); if ($agent === false) { - $tmp->snmp_agent .= 'source.'" title="'.__('Create agent').'">'.$tmp->source.''; + $tmp->snmp_agent .= ''.$tmp->source.''; } else { $tmp->snmp_agent .= '
'; - $tmp->snmp_agent .= ''.$agent['alias'].ui_print_help_tip($tmp->source, true); - '
'; + $tmp->snmp_agent .= ''.$agent['alias'].''.ui_print_help_tip($tmp->source, true); + ''; } // Enterprise string. diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 89e8c2d01b..ccd4659a63 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -2948,14 +2948,14 @@ function ui_print_help_tip( $text_title = (strlen($text) >= 60) ? substr($text, 0, 60).'...' : $text; $id = random_int(1, 99999); - $output = '
'; + $output = '
'; $output .= ''; $output .= html_print_image( $img, true, [ - 'title' => $text_title, - 'class' => $blink === true ? 'blink' : '', + 'title' => io_safe_output($text_title), + 'class' => ($blink === true) ? 'blink' : '', 'style' => 'width: 16px; height: 16px;', ], false, diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index 83fbf57d54..180fb592d5 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -2364,6 +2364,29 @@ var formatterDataVerticalBar = function(value, ctx) { } }; +function open_tip(id) { + $("#tip_dialog_" + id).dialog({ + title: $("#tip_dialog_" + id).data("title"), + modal: true, + maxWidth: 600, + minWidth: 400, + show: { + effect: "fade", + duration: 200 + }, + hide: { + effect: "fade", + duration: 200 + }, + closeOnEscape: true, + buttons: { + Close: function() { + $(this).dialog("close"); + } + } + }); +} + // Show about section $(document).ready(function() { $("[id^='icon_about']").click(function() { @@ -2457,33 +2480,6 @@ $(document).ready(function() { }); } } - - $("[id^='div_tip_']").click(function() { - var id = $(this) - .attr("id") - .split("_")[2]; - - $("#tip_dialog_" + id).dialog({ - title: $("#tip_dialog_" + id).data("title"), - modal: true, - maxWidth: 600, - minWidth: 400, - show: { - effect: "fade", - duration: 200 - }, - hide: { - effect: "fade", - duration: 200 - }, - closeOnEscape: true, - buttons: { - Close: function() { - $(this).dialog("close"); - } - } - }); - }); }); function close_info_box(id) { diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 0e9d68cd5c..8e340928f7 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -3653,6 +3653,10 @@ div.tip > img { margin-left: 10px; } +div.tip > div.invisible { + display: none !important; +} + /* * --------------------------------------------------------------------- * - SEARCH BOX in header - From b60b96239fd3f8c2f0dcc3c7c5a3aac89677d393 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 29 Apr 2024 15:45:57 +0200 Subject: [PATCH 17/38] #13520 fixed message error when create snmp policy --- pandora_console/include/functions_snmp_browser.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php index d545ff102b..8328307d24 100644 --- a/pandora_console/include/functions_snmp_browser.php +++ b/pandora_console/include/functions_snmp_browser.php @@ -1588,7 +1588,12 @@ function snmp_browser_create_modules_snmp( enterprise_include_once('include/functions_policies.php'); foreach ($id_target as $policy) { - $ids[] = policies_create_module($oid['oid'], $policy, 2, $values); + $exist = db_get_row_filter('tpolicy_modules', ['name' => $oid['oid'], 'id_policy' => $policy], '*'); + if ($exist !== false) { + $ids[] = false; + } else { + $ids[] = policies_create_module($oid['oid'], $policy, 2, $values); + } } } } From 4c3ab95e3f082dd57be605cc334c73375cb1c228 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Mon, 29 Apr 2024 15:55:06 +0200 Subject: [PATCH 18/38] 13634-Fix endpoint api planned_downtimes_deleted --- pandora_console/include/functions_planned_downtimes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_planned_downtimes.php b/pandora_console/include/functions_planned_downtimes.php index 772611fa29..a7d5015aba 100644 --- a/pandora_console/include/functions_planned_downtimes.php +++ b/pandora_console/include/functions_planned_downtimes.php @@ -961,7 +961,7 @@ function planned_downtimes_items($filter) function delete_planned_downtimes($filter) { - $downtime_execute = db_get_row_filter('tplanned_downtime', ['id' => $filter['id_downtime']], 'execute'); + $downtime_execute = db_get_row_filter('tplanned_downtime', ['id' => $filter['id_downtime']], 'executed'); if ($downtime_execute) { $return = __("This scheduled downtime are executed now. Can't delete in this moment."); From 4f098cc51493f4a35ac17359dfae01c6ac018de0 Mon Sep 17 00:00:00 2001 From: alejandro Date: Mon, 29 Apr 2024 16:22:16 +0200 Subject: [PATCH 19/38] update hash --- .../extras/discovery/DiscoveryApplicationsMigrateCodes.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini b/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini index 8791d535ff..5cbd75d0de 100644 --- a/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini +++ b/pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini @@ -1,4 +1,4 @@ -pandorafms.vmware=09733bb0fa17a186fb62050c2d8fe0b6 +pandorafms.vmware=999bbda7bbcc313aee81d6816f8a5c0e pandorafms.mysql=33d470c7492214d4b384ed307e81adf4 pandorafms.vmware=1deafce1d55d3574645d8b136104e9ad pandorafms.mysql=ca7dd8b80a1a03a25eb0fb077818ad63 From 382013fbe6c7d7597db1032015a9ca27ff80d8a3 Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Mon, 29 Apr 2024 16:28:58 +0200 Subject: [PATCH 20/38] #13594 Fixed Free search in the Manage agents view --- .../godmode/agentes/modificar_agente.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 662bdd6e72..fa4d5c3b92 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -566,10 +566,10 @@ if ($search != '') { if ($id != '') { $aux = $id[0]['id_agent']; $search_sql = sprintf( - ' AND ( REPLACE(nombre, " ", " ") LIKE "%%%s%%" - OR REPLACE(alias, " ", " ") LIKE "%%%s%%" - OR REPLACE(comentarios, " ", " ") LIKE "%%%s%%" - OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND REPLACE(description, " ", " ") LIKE "%%%s%%") + ' AND ( nombre LIKE "%%%s%%" + OR alias, " ", " ") LIKE "%%%s%%" + OR comentarios, " ", " ") LIKE "%%%s%%" + OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND description, " ", " ") LIKE "%%%s%%") OR tagente.id_agente = %d', $search, $search, @@ -591,10 +591,10 @@ if ($search != '') { $search_sql .= ')'; } else { $search_sql = sprintf( - ' AND ( REPLACE(nombre, " ", " ") - LIKE "%%%s%%" OR REPLACE(alias, " ", " ") - LIKE "%%%s%%" OR REPLACE(comentarios, " ", " ") LIKE "%%%s%%" - OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND REPLACE(description, " ", " ") LIKE "%%%s%%"))', + ' AND ( nombre + LIKE "%%%s%%" OR alias + LIKE "%%%s%%" OR comentarios LIKE "%%%s%%" + OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND description LIKE "%%%s%%"))', $search, $search, $search, From 239bbbb117e9974d4da84f18de68c58b58558dd5 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 29 Apr 2024 16:31:42 +0200 Subject: [PATCH 21/38] #13521 fixed status color widget --- .../lib/Dashboard/Widgets/module_value.php | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_value.php b/pandora_console/include/lib/Dashboard/Widgets/module_value.php index 87992ab3ba..dde1d93508 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/module_value.php +++ b/pandora_console/include/lib/Dashboard/Widgets/module_value.php @@ -447,25 +447,18 @@ class ModuleValueWidget extends Widget $sizeLabel = (isset($this->values['sizeLabel']) === true) ? $this->values['sizeLabel'] : 40; $sizeValue = (isset($this->values['sizeValue']) === true) ? $this->values['sizeValue'] : 40; - $sql = 'SELECT min_warning, - max_warning, - min_critical, - max_critical, - str_warning, - str_critical - FROM tagente_modulo - WHERE id_agente_modulo = '.(int) $this->values['moduleId']; - $sql_data = db_get_row_sql($sql); - - $last = modules_get_last_value($this->values['moduleId']); - - if (($last >= $sql_data['min_warning']) && ($last < $sql_data['max_warning'])) { - $color = COL_WARNING; - } - - if ($last >= $sql_data['max_warning']) { - $color = COL_CRITICAL; - } + $db_status = modules_get_agentmodule_status($this->values['moduleId']); + $module_value = modules_get_last_value($this->values['moduleId']); + $status = 0; + $title = ''; + modules_get_status($this->values['moduleId'], $db_status, $module_value, $status, $title); + $color = match ($status) { + STATUS_MODULE_NO_DATA => COL_NOTINIT, + STATUS_MODULE_CRITICAL => COL_CRITICAL, + STATUS_MODULE_WARNING => COL_WARNING, + STATUS_MODULE_OK => COL_NORMAL, + STATUS_MODULE_UNKNOWN => COL_UNKNOWN, + }; $uuid = uniqid(); $output .= '
'; From ec77ac4e859e9adc10f1c739bfb286164c5572ff Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Mon, 29 Apr 2024 16:58:52 +0200 Subject: [PATCH 22/38] 13611-Fix interval in Netflow widget --- .../include/lib/Dashboard/Widgets/netflow.php | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/netflow.php b/pandora_console/include/lib/Dashboard/Widgets/netflow.php index 8d520f8604..c2780abdcc 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/netflow.php +++ b/pandora_console/include/lib/Dashboard/Widgets/netflow.php @@ -389,29 +389,6 @@ class Netflow extends Widget { return ' $(document).ready(function(){ - //Limit 1 week - $("#period_select option").each(function(key, element){ - if(element.value > 604800){ - $(element).remove(); - } - }) - $("#period_manual option").each(function(key, element){ - if(element.value > 604800){ - $(element).remove(); - } - }); - $("#period_manual input").on("change", function(e){ - if($("#hidden-period").val() > 604800) { - $(this).val(1); - $("#hidden-period").val(604800); - $("#period_manual select option").removeAttr("selected"); - setTimeout(() => { - $("#period_default select option[value=\'604800\']").attr("selected", "selected"); - $("#period_manual select option[value=\'604800\']").attr("selected", "selected"); - $("#period_manual select").val(604800); - }, 500); - } - }); if($("#chart_type").val() === "usage_map") { $("#data_to_show").show(); $("#aggregated").hide(); From a544cb06094dda95c10f3ab5618491bca86e1f56 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 30 Apr 2024 01:00:06 +0200 Subject: [PATCH 23/38] 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.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.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 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index e6c89e7280..be9d9841ec 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240429 +Version: 7.0NG.776-240430 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 1231a61256..c425fcd5bc 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.776-240429" +pandora_version="7.0NG.776-240430" 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 63a453d09c..95bbe6691a 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240429'; +use constant AGENT_BUILD => '240430'; # 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 19c9b23cf6..091790c5ff 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.776 -%define release 240429 +%define release 240430 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index bc1eb2a014..3c101c0720 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240429 +%define release 240430 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index 3061c38b65..6fe85a1b90 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240429 +%define release 240430 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index 747512944c..e0609e9635 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240429 +%define release 240430 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 85a2f2ef51..e84c66b80e 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.776 -%define release 240429 +%define release 240430 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 4275066d29..4c896413d3 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240429" +PI_BUILD="240430" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 317b22feb6..8ad9d367dc 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240429} +{240430} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index b24daf8831..865d72840d 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.776 Build 240429") +#define PANDORA_VERSION ("7.0NG.776 Build 240430") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index dfc1f21d6d..547ed73abc 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240429))" + VALUE "ProductVersion", "(7.0NG.776(Build 240430))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 238ebd0bc6..5e94808891 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240429 +Version: 7.0NG.776-240430 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 c22c59c057..245da14514 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.776-240429" +pandora_version="7.0NG.776-240430" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 096b2027bb..3452e6cfe4 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240429'; +$build_version = 'PC240430'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index ee32e4d9a8..44f0cc78b0 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 9e11b76b08..a46ceff1a8 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240429 +%define release 240430 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 7cc504dd39..df84792bf7 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.776 -%define release 240429 +%define release 240430 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index d8a84c8ab0..abbd349635 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240429" +PI_BUILD="240430" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 8da9a3c529..3f717fe28e 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240429"; +my $version = "7.0NG.776 Build 240430"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 57383205b9..f9e50b7043 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.776 Build 240429"; +my $version = "7.0NG.776 Build 240430"; # save program name for logging my $progname = basename($0); From 7763e8fa39468ac324faa3bc7207f4818685e36e Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 30 Apr 2024 08:23:51 +0200 Subject: [PATCH 24/38] #13517 autocomplete param size --- .../reporting/reporting_builder.item_editor.php | 2 ++ pandora_console/include/functions_ui.php | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 945739bc74..cd53da1f95 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -2318,7 +2318,9 @@ if (is_metaconsole() === true) { $params['add_none_module'] = true; $params['use_hidden_input_idagent'] = true; $params['hidden_input_idagent_id'] = 'hidden-id_agent'; + $params['size'] = 40; if ($meta) { + $params['size'] = 44; $params['use_input_id_server'] = true; $params['input_id_server_id'] = 'hidden-server_id'; $params['metaconsole_enabled'] = true; diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 89e8c2d01b..7b08ae2bbf 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -5867,7 +5867,7 @@ function ui_print_agent_autocomplete_input($parameters) $hidden_input_idagent_value = $parameters['hidden_input_idagent_value']; } - $size = 30; + $size = 100; // Default value. if (isset($parameters['size'])) { $size = $parameters['size']; @@ -6293,14 +6293,14 @@ function ui_print_agent_autocomplete_input($parameters) $javascript_function_change .= ' function setInputBackground(inputId, image) { $("#"+inputId) - .attr("style", "background-image: url(\'"+image+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'"); + .attr("style", "background-image: url(\'"+image+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:'.$size.'%; '.$inputStyles.'"); } $(document).ready(function () { $("#'.$input_id.'").focusout(function (e) { setTimeout(() => { let iconImage = "'.$icon_image.'"; - $("#'.$input_id.'").attr("style", "background-image: url(\'"+iconImage+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'"); + $("#'.$input_id.'").attr("style", "background-image: url(\'"+iconImage+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:'.$size.'%; '.$inputStyles.'"); }, 100); }); }); @@ -6574,7 +6574,7 @@ function ui_print_agent_autocomplete_input($parameters) if (select_item_click) { select_item_click = 0; $("#'.$input_id.'") - .attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'"); + .attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:'.$size.'%; '.$inputStyles.'"); return; } else { // Clear selectbox if item is not selected. @@ -6589,7 +6589,7 @@ function ui_print_agent_autocomplete_input($parameters) //Set loading $("#'.$input_id.'") - .attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'"); + .attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:'.$size.'%; '.$inputStyles.'"); var term = input_value; //Word to search '.$javascript_change_ajax_params_text.' @@ -6606,7 +6606,7 @@ function ui_print_agent_autocomplete_input($parameters) success: function (data) { if (data.length < 2) { //Set icon - $("#'.$input_id.'").attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'"); + $("#'.$input_id.'").attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:'.$size.'%; '.$inputStyles.'"); return; } @@ -6656,7 +6656,7 @@ function ui_print_agent_autocomplete_input($parameters) //Set icon $("#'.$input_id.'") - .attr("style", "background: url(\"'.$icon_image.'\") 97% center no-repeat; background-size: 20px; width:100%; '.$inputStyles.'") + .attr("style", "background: url(\"'.$icon_image.'\") 97% center no-repeat; background-size: 20px; width:'.$size.'%; '.$inputStyles.'") return; } }); @@ -6675,7 +6675,7 @@ function ui_print_agent_autocomplete_input($parameters) } $attrs = []; - $attrs['style'] = 'background-image: url('.$icon_image.'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$text_color.' '.$inputStyles.''; + $attrs['style'] = 'background-image: url('.$icon_image.'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:'.$size.'%; '.$text_color.' '.$inputStyles.''; if (!$disabled_javascript_on_blur_function) { $attrs['onblur'] = $javascript_on_blur_function_name.'()'; From 6d8b3f7441a71d2116dbe906d40814f19b55d13a Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 30 Apr 2024 08:55:51 +0200 Subject: [PATCH 25/38] #13503 fix hover add cell dashboard --- .../include/javascript/pandora_dashboards.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js index 853379a2aa..b6e20aa4ba 100644 --- a/pandora_console/include/javascript/pandora_dashboards.js +++ b/pandora_console/include/javascript/pandora_dashboards.js @@ -232,6 +232,9 @@ function initialiceLayout(data) { }); if (!$("#checkbox-edit-mode").is(":checked")) { + $("#add-widget") + .parent() + .addClass("invisible_important"); $(".add-widget").hide(); } else { $(".new-widget-message").hide(); @@ -549,6 +552,9 @@ function initialiceLayout(data) { grid.resizable(".grid-stack-item", true); grid.float(false); $(".header-options").show(); + $("#add-widget") + .parent() + .removeClass("invisible_important"); $(".add-widget").show(); $(".new-widget-message").hide(); $("#container-layout").addClass("container-layout"); @@ -558,6 +564,9 @@ function initialiceLayout(data) { grid.resizable(".grid-stack-item", false); grid.float(true); $(".header-options").hide(); + $("#add-widget") + .parent() + .addClass("invisible_important"); $(".add-widget").hide(); $(".new-widget-message").show(); $("#container-layout").removeClass("container-layout"); @@ -776,6 +785,9 @@ function initialiceLayout(data) { }); if (!$("#checkbox-edit-mode").is(":checked")) { + $("#add-widget") + .parent() + .addClass("invisible_important"); $(".add-widget").hide(); } else { $(".new-widget-message").hide(); From a586b0eebc39279eebdefb77c8ff10a65b31eb5a Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Tue, 30 Apr 2024 09:19:59 +0200 Subject: [PATCH 26/38] 13595-Fix image tactical view group --- pandora_console/include/functions_groups.php | 45 ++++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index 5dd99ebce9..079aaa555a 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -2662,7 +2662,20 @@ function tactical_groups_get_agents_and_monitoring($id_groups, $data='') $tdata[1] = ''.$tdata[1].''; if ($data['total_agents'] > 500 && !enterprise_installed()) { - $tdata[2] = "
"; + $tdata[2] = "
"; + $tdata[2] .= html_print_image( + 'images/alert_enterprise.png', + true, + [ + 'title' => __('Enterprise version not installed'), + 'class' => 'img_help' + ], + false, + false, + false, + true + ); + $tdata[2] .= '
'; } $tdata[3] = html_print_image('images/module.png', true, ['title' => __('Monitor checks'), 'class' => 'invert_filter'], false, false, false, true); @@ -2676,7 +2689,20 @@ function tactical_groups_get_agents_and_monitoring($id_groups, $data='') */ if ($data['total_agents']) { if (($data['monitor_total'] / $data['total_agents'] > 100) && !enterprise_installed()) { - $tdata[5] = "
"; + $tdata[5] = "
"; + $tdata[5] .= html_print_image( + 'images/alert_enterprise.png', + true, + [ + 'title' => __('Enterprise version not installed'), + 'class' => 'img_help' + ], + false, + false, + false, + true + ); + $tdata[5] .= '
'; } } @@ -2728,7 +2754,20 @@ function tactical_groups_get_stats_alerts($id_groups, $data='') */ if ($data['monitor_alerts'] > $data['total_agents'] && !enterprise_installed()) { - $tdata[2] = "
"; + $tdata[2] = "
"; + $tdata[2] .= html_print_image( + 'images/alert_enterprise.png', + true, + [ + 'title' => __('Enterprise version not installed'), + 'class' => 'img_help' + ], + false, + false, + false, + true + ); + $tdata[2] .= '
'; } $tdata[3] = html_print_image( From b6ce5b7405ba46b8ee1067e20d63336cfba99abb Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Tue, 30 Apr 2024 09:34:07 +0200 Subject: [PATCH 27/38] #13594 Fixed Free search in the Manage agents view --- pandora_console/godmode/agentes/modificar_agente.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index fa4d5c3b92..9f734ec539 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -567,9 +567,9 @@ if ($search != '') { $aux = $id[0]['id_agent']; $search_sql = sprintf( ' AND ( nombre LIKE "%%%s%%" - OR alias, " ", " ") LIKE "%%%s%%" - OR comentarios, " ", " ") LIKE "%%%s%%" - OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND description, " ", " ") LIKE "%%%s%%") + OR alias LIKE "%%%s%%" + OR comentarios LIKE "%%%s%%" + OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND description LIKE "%%%s%%") OR tagente.id_agente = %d', $search, $search, From efff8889b02d7d8fbd95f0803a3f6e66f90e4ccc Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Tue, 30 Apr 2024 10:22:39 +0200 Subject: [PATCH 28/38] #13303 Fixed pagination when filters are activated in node and meta console --- .../operation/agentes/status_monitor.php | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 0724725b6a..3eec561ea3 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -1389,7 +1389,15 @@ if ($autosearch) { if ($result === false) { $result = []; } else { - $tablePagination = ui_pagination($count, false, $offset, 0, true, 'offset', false); + $tablePagination = ui_pagination( + $count, + 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params, + $offset, + 0, + true, + 'offset', + false + ); } } else { // For each server defined and not disabled. @@ -1460,7 +1468,15 @@ if ($autosearch) { $show_count = true; } - $tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', $show_count); + $tablePagination = ui_pagination( + $count_modules, + 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params, + $offset, + 0, + true, + 'offset', + $show_count + ); } // Get number of elements of the pagination. @@ -2337,7 +2353,15 @@ if (empty($result) === false) { $show_count = true; } - $tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', $show_count); + $tablePagination = ui_pagination( + $count_modules, + 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params, + $offset, + 0, + true, + 'offset', + $show_count + ); } } else { if (get_parameter('ag_group', false) !== false) { From 46c1890a2b081e71037616d6bff2f806349af748 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 30 Apr 2024 11:36:45 +0200 Subject: [PATCH 29/38] #13459 add svg files --- pandora_console/godmode/setup/file_manager.php | 1 + 1 file changed, 1 insertion(+) diff --git a/pandora_console/godmode/setup/file_manager.php b/pandora_console/godmode/setup/file_manager.php index 8ccddde606..93b83200c9 100644 --- a/pandora_console/godmode/setup/file_manager.php +++ b/pandora_console/godmode/setup/file_manager.php @@ -121,6 +121,7 @@ if ($upload_file === true) { MIME_TYPES['jpg'], MIME_TYPES['png'], MIME_TYPES['gif'], + MIME_TYPES['svg'], ] ); } From 3d5b6502e57ecfe423acdb5d7e800e2bd3742b57 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Tue, 30 Apr 2024 12:17:59 +0200 Subject: [PATCH 30/38] #13575 fixed api check --- pandora_console/extensions/api_checker.php | 53 ++++++++++++---------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/pandora_console/extensions/api_checker.php b/pandora_console/extensions/api_checker.php index 38488fc9e4..557ec82e1b 100755 --- a/pandora_console/extensions/api_checker.php +++ b/pandora_console/extensions/api_checker.php @@ -69,38 +69,41 @@ function api_execute( if (empty($url) === true) { $url = 'http://'.$ip.$pandora_url.'/include/api.php?'; + } else { + $url_schema = parse_url($url); + $url = $url_schema['scheme'].'://'.$url_schema['host'].$pandora_url.'/include/api.php?'; + } - if (empty($op) === false) { - $data['op'] = $op; - } + if (empty($op) === false) { + $data['op'] = $op; + } - if (empty($op2) === false) { - $data['op2'] = $op2; - } + if (empty($op2) === false) { + $data['op2'] = $op2; + } - if (empty($id) === false) { - $data['id'] = $id; - } + if (empty($id) === false) { + $data['id'] = $id; + } - if (empty($id2) === false) { - $data['id2'] = $id2; - } + if (empty($id2) === false) { + $data['id2'] = $id2; + } - if (empty($return_type) === false) { - $data['return_type'] = $return_type; - } + if (empty($return_type) === false) { + $data['return_type'] = $return_type; + } - if (empty($other) === false) { - $data['other_mode'] = $other_mode; - $data['other'] = $other; - } + if (empty($other) === false) { + $data['other_mode'] = $other_mode; + $data['other'] = $other; + } - // If token is not reported,use old method. - if (empty($token) === true) { - $data['apipass'] = $apipass; - $data['user'] = $user; - $data['pass'] = $password; - } + // If token is not reported,use old method. + if (empty($token) === true) { + $data['apipass'] = $apipass; + $data['user'] = $user; + $data['pass'] = $password; } $url_protocol = parse_url($url)['scheme']; From b3a212251e36f810345d9b0d54e3dd359ac2f830 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 30 Apr 2024 13:29:07 +0200 Subject: [PATCH 31/38] #13501 no show error when update without change anything --- .../godmode/agentes/configurar_agente.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index cdbe26d89d..01688effaa 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -1065,6 +1065,7 @@ if ($update_agent) { } $field_values = []; + $update_custom_result = false; foreach ($fields as $field) { $field_value = get_parameter_post('customvalue_'.$field['id_field'], ''); @@ -1115,7 +1116,7 @@ if ($update_agent) { ); if ($update_custom == 1) { - $update_custom_result = 1; + $update_custom_result = true; } } } @@ -1157,6 +1158,7 @@ if ($update_agent) { } } + $agent_data = agents_get_agent($id_agente); $values = [ 'disabled' => $disabled, 'id_parent' => $id_parent, @@ -1184,6 +1186,14 @@ if ($update_agent) { 'vul_scan_enabled' => $vul_scan_enabled, 'ignore_unknown' => $ignore_unknown, ]; + // Update change fix on ticket 13501 to no show errors when press button update with out change anything. + $update_change = false; + foreach ($values as $key => $value) { + if (isset($agent_data[$key]) === true && $agent_data[$key] !== $value) { + $update_agent = true; + break; + } + } if (empty($repeated_name) === true) { $values['nombre'] = $nombre_agente; @@ -1195,7 +1205,7 @@ if ($update_agent) { } $result = (bool) db_process_sql_update('tagente', $values, ['id_agente' => $id_agente]); - if ($result === false && $update_custom_result == false) { + if ($result === false && $update_custom_result === false && $update_change === true) { ui_print_error_message( __('There was a problem updating the agent') ); From a0ab22efb52e5651b36a5bdd6cab7e3381946bf6 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 1 May 2024 01:00:05 +0200 Subject: [PATCH 32/38] 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.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.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 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index be9d9841ec..a0c0e60f1c 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240430 +Version: 7.0NG.776-240501 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 c425fcd5bc..c0262f0ab7 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.776-240430" +pandora_version="7.0NG.776-240501" 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 95bbe6691a..568ea9443a 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240430'; +use constant AGENT_BUILD => '240501'; # 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 091790c5ff..ffb06ae898 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.776 -%define release 240430 +%define release 240501 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index 3c101c0720..b04a870459 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240430 +%define release 240501 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index 6fe85a1b90..b0d7e79cdd 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240430 +%define release 240501 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index e0609e9635..ae46aa062f 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240430 +%define release 240501 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index e84c66b80e..7ca5c86a57 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.776 -%define release 240430 +%define release 240501 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 4c896413d3..afe9863b18 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240430" +PI_BUILD="240501" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 8ad9d367dc..ab88f0ef17 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240430} +{240501} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 865d72840d..ea4f490037 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.776 Build 240430") +#define PANDORA_VERSION ("7.0NG.776 Build 240501") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 547ed73abc..a0a8ca3918 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240430))" + VALUE "ProductVersion", "(7.0NG.776(Build 240501))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 5e94808891..2ff5c1d332 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240430 +Version: 7.0NG.776-240501 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 245da14514..e6b41236e1 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.776-240430" +pandora_version="7.0NG.776-240501" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 3452e6cfe4..927b4b1719 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240430'; +$build_version = 'PC240501'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 44f0cc78b0..2425ddc97f 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 a46ceff1a8..1cf0979fdb 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240430 +%define release 240501 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index df84792bf7..db7a998bc8 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.776 -%define release 240430 +%define release 240501 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index abbd349635..70a3f98ec0 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240430" +PI_BUILD="240501" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 3f717fe28e..b5c16e6778 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240430"; +my $version = "7.0NG.776 Build 240501"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index f9e50b7043..d978fd40dc 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.776 Build 240430"; +my $version = "7.0NG.776 Build 240501"; # save program name for logging my $progname = basename($0); From bb0c9e5437bf4f955e86bddc7ab36fba94f21128 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 2 May 2024 01:00:04 +0200 Subject: [PATCH 33/38] 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.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.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 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index a0c0e60f1c..fb1d843bee 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240501 +Version: 7.0NG.776-240502 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 c0262f0ab7..de5b578511 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.776-240501" +pandora_version="7.0NG.776-240502" 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 568ea9443a..a8f81071cd 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240501'; +use constant AGENT_BUILD => '240502'; # 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 ffb06ae898..e54d57fb39 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.776 -%define release 240501 +%define release 240502 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index b04a870459..0bcb7dcecf 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240501 +%define release 240502 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index b0d7e79cdd..d0d65cdc81 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240501 +%define release 240502 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index ae46aa062f..600396accd 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240501 +%define release 240502 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 7ca5c86a57..24cf291b0b 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.776 -%define release 240501 +%define release 240502 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 afe9863b18..f37e0ce254 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240501" +PI_BUILD="240502" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index ab88f0ef17..8b7204e865 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240501} +{240502} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index ea4f490037..ca8476f844 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.776 Build 240501") +#define PANDORA_VERSION ("7.0NG.776 Build 240502") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index a0a8ca3918..52eafb9764 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240501))" + VALUE "ProductVersion", "(7.0NG.776(Build 240502))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 2ff5c1d332..b9160ddf43 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240501 +Version: 7.0NG.776-240502 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 e6b41236e1..7a8a0187a7 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.776-240501" +pandora_version="7.0NG.776-240502" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 927b4b1719..437e919290 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240501'; +$build_version = 'PC240502'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 2425ddc97f..b4ce5ebdc1 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 1cf0979fdb..69624cb6b0 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240501 +%define release 240502 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index db7a998bc8..0833991089 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.776 -%define release 240501 +%define release 240502 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 70a3f98ec0..6971579dbf 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240501" +PI_BUILD="240502" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index b5c16e6778..85d19c4c4e 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240501"; +my $version = "7.0NG.776 Build 240502"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index d978fd40dc..a8b4ab7bea 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.776 Build 240501"; +my $version = "7.0NG.776 Build 240502"; # save program name for logging my $progname = basename($0); From 70fe2c8e8ae972d134c84af59e43fc3f9998bdfe Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 3 May 2024 01:00:05 +0200 Subject: [PATCH 34/38] 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.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.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 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index fb1d843bee..122d43ed05 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240502 +Version: 7.0NG.776-240503 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 de5b578511..03461beb0f 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.776-240502" +pandora_version="7.0NG.776-240503" 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 a8f81071cd..05d49335cb 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240502'; +use constant AGENT_BUILD => '240503'; # 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 e54d57fb39..037ebbe6bb 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.776 -%define release 240502 +%define release 240503 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index 0bcb7dcecf..d3558b0026 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240502 +%define release 240503 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index d0d65cdc81..a7d6c6a620 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240502 +%define release 240503 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index 600396accd..db99b6fbf2 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240502 +%define release 240503 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 24cf291b0b..250f327421 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.776 -%define release 240502 +%define release 240503 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 f37e0ce254..aae9e94d1a 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240502" +PI_BUILD="240503" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 8b7204e865..37d4289b18 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240502} +{240503} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index ca8476f844..85da7bbecd 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.776 Build 240502") +#define PANDORA_VERSION ("7.0NG.776 Build 240503") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 52eafb9764..44c1b8d6a1 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240502))" + VALUE "ProductVersion", "(7.0NG.776(Build 240503))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index b9160ddf43..e947bc0573 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240502 +Version: 7.0NG.776-240503 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 7a8a0187a7..c6b8402407 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.776-240502" +pandora_version="7.0NG.776-240503" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 437e919290..9af4949d06 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240502'; +$build_version = 'PC240503'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index b4ce5ebdc1..d97bd64d26 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 69624cb6b0..7cc4e63064 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240502 +%define release 240503 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 0833991089..16ad3ac618 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.776 -%define release 240502 +%define release 240503 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 6971579dbf..5a42f571c6 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240502" +PI_BUILD="240503" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 85d19c4c4e..511a173cf1 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240502"; +my $version = "7.0NG.776 Build 240503"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index a8b4ab7bea..a74b93661d 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.776 Build 240502"; +my $version = "7.0NG.776 Build 240503"; # save program name for logging my $progname = basename($0); From 309159a8605453b6db4855f2f3a1fb106b6af7dc Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 3 May 2024 12:52:13 +0200 Subject: [PATCH 35/38] fix prediction date report pandora_enterprise#13568 --- .../include/functions_forecast.php | 91 ++++++++++--------- 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/pandora_console/include/functions_forecast.php b/pandora_console/include/functions_forecast.php index 1f0d1e59d9..e4fb43a7c5 100644 --- a/pandora_console/include/functions_forecast.php +++ b/pandora_console/include/functions_forecast.php @@ -134,11 +134,14 @@ function forecast_projection_graph( // 3.1 Standard deviation for X: sqrt((Sum(Xi²)/Obs) - (avg X)²) // 3.2 Standard deviation for Y: sqrt((Sum(Yi²)/Obs) - (avg Y)²) // Linear correlation coefficient: - // Agent interval could be zero, 300 is the predefined + // Agent interval could be zero, 300 is the predefined. if ($sum_obs == 0) { $agent_interval = SECONDS_5MINUTES; } else { $agent_interval = ($sum_diff_dates / $sum_obs); + if ($agent_interval < 60) { + $agent_interval = SECONDS_1MINUTE; + } } // Could be a inverse correlation coefficient @@ -170,7 +173,7 @@ function forecast_projection_graph( $a = 0; } - // Data inicialization + // Data inicialization. $output_data = []; if ($prediction_period != false) { $limit_timestamp = ($last_timestamp + $prediction_period); @@ -199,50 +202,54 @@ function forecast_projection_graph( $time_format = 'M d'; } - // Aplying linear regression to module data in order to do the prediction - $idx = 0; - // Create data in graph format like - while ($in_range) { - $now = time(); + try { + // Aplying linear regression to module data in order to do the prediction. + $idx = 0; + // Create data in graph format like. + while ($in_range) { + $now = time(); - // Check that exec time is not greater than half max exec server time - if ($max_exec_time != false) { - if (($begin_time + ($max_exec_time / 2)) < $now) { - return false; - } - } - - $timestamp_f = ($current_ts * 1000); - - if ($csv) { - $output_data[$idx]['date'] = $current_ts; - $output_data[$idx]['data'] = ($a + ($b * $current_ts)); - } else { - $output_data[$idx][0] = $timestamp_f; - $output_data[$idx][1] = ($a + ($b * $current_ts)); - } - - // Using this function for prediction_date - if ($prediction_period == false) { - // These statements stop the prediction when interval is greater than 2 years - if (($current_ts - $last_timestamp) >= 94608000 - || $max_value == $min_value - ) { - return false; + // Check that exec time is not greater than half max exec server time. + if ($max_exec_time != false) { + if (($begin_time + ($max_exec_time / 2)) < $now) { + return false; + } } - // Found it - if (($max_value >= $output_data[$idx][1]) - && ($min_value <= $output_data[$idx][0]) - ) { - return ($current_ts + ($sum_diff_dates * $agent_interval)); - } - } else if ($current_ts > $limit_timestamp) { - $in_range = false; - } + $timestamp_f = ($current_ts * 1000); - $current_ts = ($current_ts + $agent_interval); - $idx++; + if ($csv) { + $output_data[$idx]['date'] = $current_ts; + $output_data[$idx]['data'] = ($a + ($b * $current_ts)); + } else { + $output_data[$idx][0] = $timestamp_f; + $output_data[$idx][1] = ($a + ($b * $current_ts)); + } + + // Using this function for prediction_date. + if ($prediction_period == false) { + // These statements stop the prediction when interval is greater than 2 years. + if (($current_ts - $last_timestamp) >= 94608000 + || $max_value == $min_value + ) { + return false; + } + + // Found it. + if (($max_value >= $output_data[$idx][1]) + && ($min_value <= $output_data[$idx][0]) + ) { + return ($current_ts + ($sum_diff_dates * $agent_interval)); + } + } else if ($current_ts > $limit_timestamp) { + $in_range = false; + } + + $current_ts = ($current_ts + $agent_interval); + $idx++; + } + } catch (\Exception $e) { + return false; } return $output_data; From 59aafe40450fd7c5d04e6ad899fb4a8c7496a7ab Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 4 May 2024 01:00:04 +0200 Subject: [PATCH 36/38] 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.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.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 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 122d43ed05..368b71b844 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240503 +Version: 7.0NG.776-240504 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 03461beb0f..2662ad33f2 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.776-240503" +pandora_version="7.0NG.776-240504" 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 05d49335cb..78d6272c34 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240503'; +use constant AGENT_BUILD => '240504'; # 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 037ebbe6bb..997b258337 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.776 -%define release 240503 +%define release 240504 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index d3558b0026..2ad019abfc 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240503 +%define release 240504 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index a7d6c6a620..adb07304b8 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240503 +%define release 240504 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index db99b6fbf2..cea0a88e7b 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240503 +%define release 240504 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 250f327421..41060e513c 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.776 -%define release 240503 +%define release 240504 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 aae9e94d1a..464a917dc7 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240503" +PI_BUILD="240504" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 37d4289b18..86fa14a130 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240503} +{240504} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 85da7bbecd..efbf1dfcff 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.776 Build 240503") +#define PANDORA_VERSION ("7.0NG.776 Build 240504") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 44c1b8d6a1..4d5860f9b8 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240503))" + VALUE "ProductVersion", "(7.0NG.776(Build 240504))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index e947bc0573..cfe214773e 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240503 +Version: 7.0NG.776-240504 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 c6b8402407..146102e61a 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.776-240503" +pandora_version="7.0NG.776-240504" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 9af4949d06..7b1e4f69bb 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240503'; +$build_version = 'PC240504'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index d97bd64d26..585dc8ed68 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 7cc4e63064..d21da67e2b 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240503 +%define release 240504 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 16ad3ac618..beb93b2468 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.776 -%define release 240503 +%define release 240504 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 5a42f571c6..431190a3b7 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240503" +PI_BUILD="240504" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 511a173cf1..6bad5449bc 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240503"; +my $version = "7.0NG.776 Build 240504"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index a74b93661d..312420b14a 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.776 Build 240503"; +my $version = "7.0NG.776 Build 240504"; # save program name for logging my $progname = basename($0); From 6f63e22caf898edb2c59f26fdcd9d597f25acff7 Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 5 May 2024 01:00:03 +0200 Subject: [PATCH 37/38] 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.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.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 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 368b71b844..6bf5a29def 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240504 +Version: 7.0NG.776-240505 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 2662ad33f2..54c158b7a4 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.776-240504" +pandora_version="7.0NG.776-240505" 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 78d6272c34..4ff881fa4c 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240504'; +use constant AGENT_BUILD => '240505'; # 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 997b258337..2984fdaf90 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.776 -%define release 240504 +%define release 240505 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index 2ad019abfc..51083523b9 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240504 +%define release 240505 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index adb07304b8..527f9828d0 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240504 +%define release 240505 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index cea0a88e7b..8e9b56f9ab 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240504 +%define release 240505 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 41060e513c..f960a0a816 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.776 -%define release 240504 +%define release 240505 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 464a917dc7..a5ad6de1ee 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240504" +PI_BUILD="240505" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 86fa14a130..300a9efbb6 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240504} +{240505} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index efbf1dfcff..5e62da0d1a 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.776 Build 240504") +#define PANDORA_VERSION ("7.0NG.776 Build 240505") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 4d5860f9b8..b567300d73 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240504))" + VALUE "ProductVersion", "(7.0NG.776(Build 240505))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index cfe214773e..189774ebd1 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240504 +Version: 7.0NG.776-240505 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 146102e61a..f409448a62 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.776-240504" +pandora_version="7.0NG.776-240505" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 7b1e4f69bb..24ae75d07f 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240504'; +$build_version = 'PC240505'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 585dc8ed68..de6aac3ec8 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 d21da67e2b..04948579a1 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240504 +%define release 240505 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index beb93b2468..65bdc79bad 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.776 -%define release 240504 +%define release 240505 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 431190a3b7..021bdb7904 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240504" +PI_BUILD="240505" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6bad5449bc..658dbaaafe 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240504"; +my $version = "7.0NG.776 Build 240505"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 312420b14a..12f06bea3a 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.776 Build 240504"; +my $version = "7.0NG.776 Build 240505"; # save program name for logging my $progname = basename($0); From feba65819b7114152055d710f4d927c5896d0bc3 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 6 May 2024 01:00:04 +0200 Subject: [PATCH 38/38] 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.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.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 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 6bf5a29def..aaba742659 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240505 +Version: 7.0NG.776-240506 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 54c158b7a4..c2fa12960c 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.776-240505" +pandora_version="7.0NG.776-240506" 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 4ff881fa4c..b784189567 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240505'; +use constant AGENT_BUILD => '240506'; # 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 2984fdaf90..ee143f48f4 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.776 -%define release 240505 +%define release 240506 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index 51083523b9..543ecf5db8 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240505 +%define release 240506 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index 527f9828d0..bce5bc22c9 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240505 +%define release 240506 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index 8e9b56f9ab..c195e54d12 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240505 +%define release 240506 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index f960a0a816..943cfc54f1 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.776 -%define release 240505 +%define release 240506 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 a5ad6de1ee..cb23e3bd30 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240505" +PI_BUILD="240506" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 300a9efbb6..435fd2861e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240505} +{240506} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 5e62da0d1a..d02064850c 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.776 Build 240505") +#define PANDORA_VERSION ("7.0NG.776 Build 240506") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index b567300d73..c3df89f6c4 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240505))" + VALUE "ProductVersion", "(7.0NG.776(Build 240506))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 189774ebd1..25ad1edcad 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240505 +Version: 7.0NG.776-240506 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 f409448a62..570166590b 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.776-240505" +pandora_version="7.0NG.776-240506" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 24ae75d07f..7a215f9070 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240505'; +$build_version = 'PC240506'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index de6aac3ec8..1abad96ca9 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 04948579a1..2928d1e365 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240505 +%define release 240506 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 65bdc79bad..d58d1fc072 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.776 -%define release 240505 +%define release 240506 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 021bdb7904..bd176b3fc7 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240505" +PI_BUILD="240506" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 658dbaaafe..c3d616f0a5 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240505"; +my $version = "7.0NG.776 Build 240506"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 12f06bea3a..131be6734d 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.776 Build 240505"; +my $version = "7.0NG.776 Build 240506"; # save program name for logging my $progname = basename($0);