From 9994477c06556692ce72706441f9b679ca48983c Mon Sep 17 00:00:00 2001 From: Shinichi Matsumoto Date: Fri, 3 Feb 2023 08:00:44 +0000 Subject: [PATCH 001/681] Change return value of function agents_get_agent_id_by_alias when alias is '' --- pandora_console/include/functions_agents.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 6e37a1e991..3b3bac283b 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -165,9 +165,9 @@ function agents_locate_agent(string $field) function agents_get_agent_id_by_alias($alias, $is_metaconsole=false) { if ($is_metaconsole === true) { - return db_get_all_rows_sql("SELECT id_tagente FROM tmetaconsole_agent WHERE upper(alias) LIKE upper('%$alias%')"); + return db_get_all_rows_sql("SELECT id_tagente FROM tmetaconsole_agent WHERE '$alias' != '' and upper(alias) LIKE upper('%$alias%')"); } else { - return db_get_all_rows_sql("SELECT id_agente FROM tagente WHERE upper(alias) LIKE upper('%$alias%')"); + return db_get_all_rows_sql("SELECT id_agente FROM tagente WHERE '$alias' != '' and upper(alias) LIKE upper('%$alias%')"); } } From eb6422495b53bdbf120ec04657e3fb934c1690aa Mon Sep 17 00:00:00 2001 From: rafael Date: Mon, 13 Mar 2023 13:52:41 +0100 Subject: [PATCH 002/681] 9735 adding inventory_solaris.pl to plugin path on unix agent and adding reference commented to conf file --- pandora_agents/unix/SunOS/pandora_agent.conf | 4 +- .../unix/plugins/inventory_solaris.pl | 121 ++++++++++++++++++ 2 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 pandora_agents/unix/plugins/inventory_solaris.pl diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf index 96f76389d2..ad4e9df6c7 100644 --- a/pandora_agents/unix/SunOS/pandora_agent.conf +++ b/pandora_agents/unix/SunOS/pandora_agent.conf @@ -213,5 +213,5 @@ module_end module_plugin grep_log /var/adm/syslog Syslog . - - +#Inventory plugin +#module_plugin /usr/share/pandora_agent/plugins/inventory_solaris.pl diff --git a/pandora_agents/unix/plugins/inventory_solaris.pl b/pandora_agents/unix/plugins/inventory_solaris.pl new file mode 100644 index 0000000000..fa07650e39 --- /dev/null +++ b/pandora_agents/unix/plugins/inventory_solaris.pl @@ -0,0 +1,121 @@ +#!/usr/bin/perl -w +# + +use strict; +use Data::Dumper; + +#print header +print "\n"; + +#get pakahes +my @pkg_list = `/usr/bin/pkginfo -l 2> /dev/null`; + +print " \n"; +print " \n"; +print " \n"; + +my $pkg; +foreach my $line (@pkg_list) { + + chomp $line; + + my $match = ( $line =~ /PKGINST:/ .. $line =~ /^$/ ); + + if ( $match && $match !~ /E0/ ) { + + if ( $line =~ /^\s+([A-Z]+):\s+(.*)$/ ) { + my ($key, $val) = ($1, $2); + if ( $key eq 'FILES' ) { + if ( $val =~ /^(\d+) (.*)$/ ) { + $pkg->{FILES}->{$2} = $1; + } + } + else { + $pkg->{$1} = $2; + } + } + elsif ( $line =~ /^\s+([0-9]+) (.*)$/ ) { + $pkg->{FILES}->{$2} = $1; + } + else { + print "Unrecognized output: [$line]\n"; + } + + } + else { + + # + # Blank line between packages + # + print "{PKGINST} . ';'; + print $pkg->{VERSION} . ';'; + print $pkg->{NAME} . ';'; + print "]]>\n"; + + } +} +print " \n"; +print " \n"; +#close software module + + +#CPU module +print " \n"; +print " \n"; +print " \n"; + +my $cpu_model =`kstat cpu_info 2> /dev/null | grep brand | uniq | sed 's/.*brand//g' | tr -d ' '`; +my $cpu_clock = `kstat cpu_info 2> /dev/null | grep clock_MHz | uniq | awk '{print \$NF " Mhz"}'`; +my $cpu_brand = `kstat cpu_info 2> /dev/null | grep vendor_id | uniq | awk '{print \$NF}'`; + +chomp $cpu_brand; +chomp $cpu_clock; +chomp $cpu_model; + +print "\n"; + +print " \n"; +print " \n"; +#close cpu module + + +#RAM module +print " \n"; +print " \n"; +print " \n"; + +my $memory_size =`prtconf 2> /dev/null | grep Memory | cut -d ':' -f 2`; + +chomp $memory_size; + +print "\n"; + +print " \n"; +print " \n"; +#close RAM module + +#NIC module +print " \n"; +print " \n"; +print " \n"; + +my @nic =`dladm show-link 2> /dev/null| grep -v STATE | awk '{print \$1}'`; + +foreach my $nic (@nic){ + chomp $nic; + + my $nic_mac = `dladm show-linkprop $nic -p mac-address 2> /dev/null |grep -v LINK| awk '{print \$4}'`; + my $nic_speed = `dladm show-linkprop $nic -p speed 2> /dev/null |grep -v LINK| awk '{print \$4}'`; + + chomp $nic_mac; + chomp $nic_speed; + print "\n"; +} + +print " \n"; +print " \n"; +#close NIC module + +#close inventory +print "\n"; \ No newline at end of file From 230a8d804a09379037186883a83511485c159f42 Mon Sep 17 00:00:00 2001 From: alejandro Date: Thu, 16 Mar 2023 10:16:14 +0100 Subject: [PATCH 003/681] added powershell dchp plugin --- pandora_plugins/Dhcp/pandora_dhcp.ps1 | 85 +++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 pandora_plugins/Dhcp/pandora_dhcp.ps1 diff --git a/pandora_plugins/Dhcp/pandora_dhcp.ps1 b/pandora_plugins/Dhcp/pandora_dhcp.ps1 new file mode 100644 index 0000000000..0b50e00e5f --- /dev/null +++ b/pandora_plugins/Dhcp/pandora_dhcp.ps1 @@ -0,0 +1,85 @@ +#Plugin for monitoring Microsoft Exchange Server. +# +# Pandora FMS Agent Plugin for dchp. +# +#(c) Alejandro Sánchez +# v1.2, 26 enero 2023 +# ------------------------------------------------------------------------ + + +function print_module { + + param ([string]$module_name,[string]$module_type,[string]$module_value,[string]$module_desc) + + echo "" + echo "$module_name" + echo "$module_type" + echo "" + echo "" + echo "" + +} + +#$LinuxCurrentIP=$() 2> $NULL +$WindowsCurrentIP=$((Get-NetIPConfiguration | Where-Object { $_.IPv4DefaultGateway -ne $null -and $_.NetAdapter.Status -ne "Disconnected" }).IPv4Address.IPAddress) 2> $NULL +$Scopes=$(get-dhcpserverv4scope | ConvertTo-Csv -NoTypeInformation) 2> $NULL +$Scopes=$(get-dhcpserverv4scope | Select ScopeId |ConvertTo-Csv -NoTypeInformation) 2> $NULL +$ScopeIds=$(((get-dhcpserverv4scope).ScopeId).IPAddressToString) 2> $NULL + +$avalaible_ips=0 +$count_reservation=0 +$count_leases=0 +ForEach($scope_ids in $Scopes) +{ +if($scope_ids -notmatch 'ScopeId') +{ +$scope_ids = $scope_ids -replace '"', "" +$scope_ids =[IPAddress]$scope_ids +$ScopeRange=$(get-dhcpserverv4scope -ScopeId $scope_ids | ConvertTo-Csv -NoTypeInformation) +$ScopeMask=$(((get-dhcpserverv4scope -ScopeId $scope_ids).SubnetMask).IPAddressToString) 2> $NULL +$PercentageInUse=$((get-dhcpserverv4scopestatistics -ScopeId $scope_ids).PercentageInUse) 2> $NULL +# $Free=$((get-dhcpserverv4scopestatistics -ScopeId $scope_ids).Free) 2> $NULL +# $InUse=$((get-dhcpserverv4scopestatistics -ScopeId $scope_ids).InUse) 2> $NULL +# $Reserved=$((get-dhcpserverv4scopestatistics -ScopeId $scope_ids).Reserved) 2> $NULL +# $Pending=$((get-dhcpserverv4scopestatistics -ScopeId $scope_ids).Pending) 2> $NULL +#$AddressAssignedList=$(Get-DhcpServerv4Lease -ScopeId $scope_ids | ConvertTo-Csv -NoTypeInformation) 2> $NULL +$AddressAssignedList=$((Get-DhcpServerv4Lease -ScopeId $scope_ids).AddressState) 2> $NULL +#$Reservations=$(Get-DhcpServerv4Reservation -ScopeId $scope_ids | ConvertTo-Csv -NoTypeInformation) 2> $NULL +$Reservations=$((Get-DhcpServerv4Reservation -ScopeId $scope_ids).AddressState) 2> $NULL +$ExclusionRanges=$(Get-DhcpServerv4ExclusionRange -ScopeId $scope_ids | ConvertTo-Csv -NoTypeInformation) 2> $NULL +$Start_range=((Get-DhcpServerv4ExclusionRange -ScopeId $scope_ids).StartRange.IPAddressToString) 2> $NULL +$End_range=((Get-DhcpServerv4ExclusionRange -ScopeId $scope_ids).EndRange.IPAddressToString) 2> $NULL + + +## reservation +ForEach($reservation in $Reservations){ +if ($Reservations -match "InactiveReservation"){$count_reservation=$count_reservation+0}else {if ($Reservations){$count_reservation=$count_reservation+1}else {$count_reservation=$count_reservation+0} } +} +## leases +ForEach($lease in $AddressAssignedList){ +if ($AddressAssignedList -match "InactiveReservation"){$count_leases=$count_leases+0}else {if ($Reservations){$count_reservation=$count_reservation+1}else {$count_reservation=$count_reservation+0} } +} + +$count_assigned=$count_reservation+$count_leases + +# last octet value of an IP address +$exc_start=$Start_range.Split('.')[-1] +$exc_end=$End_range.Split('.')[-1] + +# avalaible end range - start range +1 +$avalaible=[int]$exc_end - [int]$exc_start +1 + +$free= $avalaible - $count_reservation + +print_module "[$scope_ids] - dhcp usage" "generic_data" "$PercentageInUse" "Used percentage" +print_module "[$scope_ids] - dhcp reserved ips" "generic_data" "$count_reservation" "reservations" +print_module "[$scope_ids] - dhcp assigned ips" "generic_data" "$count_assigned" "assigned ips" +print_module "[$scope_ids] - dhcp avalaible ips" "generic_data" "$avalaible" "Available and reserved ips" +print_module "[$scope_ids] - dhcp free ips" "generic_data" "$free" "Available ips (not reserved)" + +#reset +$count_reservation=0 +$count_leases=0 +} +} + From 6ad160685b07f1070396729c9f9e8a5a514d851d Mon Sep 17 00:00:00 2001 From: KANAYAMA Akihiro Date: Thu, 16 Mar 2023 19:55:41 +0900 Subject: [PATCH 004/681] Fixed encoding multibyte characters --- pandora_console/include/class/AgentWizard.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php index 2580d17371..d9280974f1 100644 --- a/pandora_console/include/class/AgentWizard.class.php +++ b/pandora_console/include/class/AgentWizard.class.php @@ -2333,7 +2333,7 @@ class AgentWizard extends HTML } $tmp->id_plugin($infoMacros['server_plugin']); - $tmp->macros(json_encode($fieldsPlugin)); + $tmp->macros(io_json_mb_encode($fieldsPlugin)); } } } @@ -2507,7 +2507,7 @@ class AgentWizard extends HTML } $tmp->id_plugin($infoMacros['server_plugin']); - $tmp->macros(json_encode($fieldsPlugin)); + $tmp->macros(io_json_mb_encode($fieldsPlugin)); } $tmp->ip_target(io_safe_input($this->targetIp)); From 0c1ec8095ee391bec6d1c14eb5859767a652293a Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Mon, 3 Apr 2023 16:59:10 +0200 Subject: [PATCH 005/681] new alert macro --- pandora_server/lib/PandoraFMS/Core.pm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 4726df4710..3fc5f8c733 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -1521,8 +1521,9 @@ sub pandora_execute_action ($$$$$$$$$;$$) { # Check for _module_graph_Xh_ macros # Check for _module_graph_Xh_ macros and _module_graphth_Xh_ my $module_graph_list = {}; - my $macro_regexp = "_modulegraph_(\\d+)h_"; + my $macro_regexp = "_modulegraph_(?!([\\w\\s-]+_\\d+h_))(\\d+)h_"; my $macro_regexp2 = "_modulegraphth_(\\d+)h_"; + my $macro_regexp3 = "_modulegraph_([\\w\\s-]+)_(\\d+)h_"; # API connection my $ua = new LWP::UserAgent; @@ -1548,6 +1549,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) { my $subst_func = sub { my $hours = shift; my $threshold = shift; + my $module = shift if @_; my $period = $hours * 3600; # Hours to seconds if($threshold == 0){ $params->{"other"} = $period . '%7C1%7C0%7C225%7C%7C14'; @@ -1558,8 +1560,10 @@ sub pandora_execute_action ($$$$$$$$$;$$) { $cid = 'module_graphth_' . $hours . 'h'; } - $params->{"other_mode"} = 'url_encode_separator_%7C'; - + if (defined($module)) { + $params->{"id"} = get_agent_module_id($dbh, $module, $agent->{'id_agente'}); + } + if (! exists($module_graph_list->{$cid}) && defined $url) { # Get the module graph image in base 64 my $response = $ua->post($url, $params); @@ -1578,10 +1582,11 @@ sub pandora_execute_action ($$$$$$$$$;$$) { eval { no warnings; local $SIG{__DIE__}; - $field3 =~ s/$macro_regexp/$subst_func->($1, 0)/ige; + $field3 =~ s/$macro_regexp/$subst_func->($2, 0)/ige; $field3 =~ s/$macro_regexp2/$subst_func->($1, 1)/ige; + $field3 =~ s/$macro_regexp3/$subst_func->($2, 0, $1)/ige; }; - + # Default content type my $content_type = $field4 . '; charset="iso-8859-1"'; From 07f3a3fbeffeb16eb55a5c701a357a2181bd3abc Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Mon, 3 Apr 2023 17:03:34 +0200 Subject: [PATCH 006/681] new alert macro --- pandora_server/lib/PandoraFMS/Core.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 3fc5f8c733..8a82e755aa 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -1564,6 +1564,8 @@ sub pandora_execute_action ($$$$$$$$$;$$) { $params->{"id"} = get_agent_module_id($dbh, $module, $agent->{'id_agente'}); } + $params->{"other_mode"} = 'url_encode_separator_%7C'; + if (! exists($module_graph_list->{$cid}) && defined $url) { # Get the module graph image in base 64 my $response = $ua->post($url, $params); From 63228ef370ff11d10312d4742f7fc49b06c6a6ae Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Tue, 11 Apr 2023 17:21:35 +0200 Subject: [PATCH 007/681] #10252 fix translate --- pandora_console/extensions/dbmanager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php index 1ec40b79f1..7f3465b89e 100644 --- a/pandora_console/extensions/dbmanager.php +++ b/pandora_console/extensions/dbmanager.php @@ -136,7 +136,7 @@ function dbmgr_extension_main() __( "This is an advanced extension to interface with %s database directly from WEB console using native SQL sentences. Please note that you can damage your %s installation - if you don't know exactly what are you are doing, + if you don't know exactly what you are doing, this means that you can severily damage your setup using this extension. This extension is intended to be used only by experienced users with a depth knowledge of %s internals.", From 32c8109cbe00d42eab698096af40e24c1dddd80c Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Wed, 12 Apr 2023 14:17:10 +0200 Subject: [PATCH 008/681] #10266 added tip visual setup option in Open version --- pandora_console/godmode/setup/setup_visuals.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index e6dd22eb2d..971415a7e1 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -1119,8 +1119,13 @@ for ($i = 1; $i <= $graphColorAmount; $i++) { $row = ($i % 2 === 0) ? ($row + 1) : $row; } +$tip = ui_print_help_tip( + __('Decimal data resolution setting for SLA and other reports is not available in the Community version.'), + true +); + $table_chars->data[$row][] = html_print_label_input_block( - __('Data precision'), + ($disabled_graph_precision) ? __('Data precision').$tip : __('Data precision'), html_print_input( [ 'type' => 'number', @@ -1138,7 +1143,7 @@ $table_chars->data[$row][] = html_print_label_input_block( ); $table_chars->data[$row][] = html_print_label_input_block( - __('Data precision in graphs'), + ($disabled_graph_precision) ? __('Data precision in graphs').$tip : __('Data precision in graphs'), html_print_input( [ 'type' => 'number', From c26db22fa5f9d2951c39d38d10bac5ed08266fe3 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Thu, 13 Apr 2023 11:07:09 +0200 Subject: [PATCH 009/681] #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality --- pandora_console/general/header.php | 5 +++- pandora_console/godmode/menu.php | 18 ++++++++------- .../godmode/setup/setup_general.php | 13 +++++++++++ pandora_console/include/functions_config.php | 8 +++++++ pandora_console/operation/menu.php | 23 +++++++++++++++++++ 5 files changed, 58 insertions(+), 9 deletions(-) diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index b0cbc0cec5..38f36fe730 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -352,7 +352,10 @@ echo sprintf('
', $menuTypeClass); } // Button for feedback pandora. - if (enterprise_installed()) { + if (enterprise_installed() && ( (!isset($config['activate_feedback']) + || (isset($config['activate_feedback']) + && $config['activate_feedback'] === true )) ) + ) { $header_feedback = '
'; $header_feedback .= ''; $header_feedback .= ''; diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index f6e4aac358..79670bc02b 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -546,21 +546,23 @@ if ($access_console_node === true) { } } - $menu_godmode['links']['text'] = __('Links'); - $menu_godmode['links']['sec2'] = ''; - $menu_godmode['links']['id'] = 'god-links'; + /* + $menu_godmode['links']['text'] = __('Links'); + $menu_godmode['links']['sec2'] = ''; + $menu_godmode['links']['id'] = 'god-links'; - $sub = []; - $rows = db_get_all_rows_in_table('tlink', 'name'); - foreach ($rows as $row) { + $sub = []; + $rows = db_get_all_rows_in_table('tlink', 'name'); + foreach ($rows as $row) { // Audit //meter en extensiones. $sub[$row['link']]['text'] = $row['name']; $sub[$row['link']]['id'] = $row['name']; $sub[$row['link']]['type'] = 'direct'; $sub[$row['link']]['subtype'] = 'new_blank'; - } + } - $menu_godmode['links']['sub'] = $sub; + $menu_godmode['links']['sub'] = $sub; + */ } // Warp Manager. diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index ad7a40aa8b..ce0216ce64 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -429,6 +429,19 @@ $table->data[$i++][] = html_print_label_input_block( ) ); +$table->data[$i++][] = html_print_label_input_block( + __('Enable Feedback'), + html_print_checkbox_switch_extended( + 'activate_feedback', + 1, + $config['activate_feedback'], + false, + '', + '', + true + ) +); + $table->colspan[$i][] = 2; $table->data[$i++][] = html_print_label_input_block( __('Timezone setup'), diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index b94892e7c1..a990c96398 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -264,6 +264,10 @@ function config_update_config() $error_update[] = __('Enable Sflow'); } + if (config_update_value('activate_feedback', (bool) get_parameter('activate_feedback'), true) === false) { + $error_update[] = __('Enable Feedback'); + } + if (config_update_value('general_network_path', get_parameter('general_network_path'), true) === false) { $error_update[] = __('General network path'); } else { @@ -3330,6 +3334,10 @@ function config_process_config() config_update_value('autoupdate', 1); } + if (!isset($config['activate_feedback'])) { + config_update_value('activate_feedback', 1); + } + if (!isset($config['api_password'])) { config_update_value('api_password', ''); } diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 8b6d9f4749..fe381e0449 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -628,6 +628,27 @@ if ($favorite_menu !== false) { } +// Links. +$rows = db_get_all_rows_in_table('tlink', 'name'); +// $rows = []; +if (!empty($rows)) { + $menu_operation['links']['text'] = __('Links'); + $menu_operation['links']['sec2'] = ''; + $menu_operation['links']['id'] = 'god-links'; + + $sub = []; + foreach ($rows as $row) { + // Audit //meter en extensiones. + $sub[$row['link']]['text'] = $row['name']; + $sub[$row['link']]['id'] = $row['name']; + $sub[$row['link']]['type'] = 'direct'; + $sub[$row['link']]['subtype'] = 'new_blank'; + } + + $menu_operation['links']['sub'] = $sub; +} + + // Workspace. @@ -785,6 +806,8 @@ if ($access_console_node === true) { // ~ } } + + // Save operation menu array to use in operation/extensions.php view $operation_menu_array = $menu_operation; From dc41e1c37753c005e8b326d2c9c733eb8c6d6bf8 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Thu, 13 Apr 2023 11:36:13 +0200 Subject: [PATCH 010/681] fix if in header and declare correctly a value --- pandora_console/general/header.php | 5 +---- pandora_console/include/functions_config.php | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 38f36fe730..5609ab46d6 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -352,10 +352,7 @@ echo sprintf('
', $menuTypeClass); } // Button for feedback pandora. - if (enterprise_installed() && ( (!isset($config['activate_feedback']) - || (isset($config['activate_feedback']) - && $config['activate_feedback'] === true )) ) - ) { + if (enterprise_installed() && $config['activate_feedback'] !== false) { $header_feedback = '
'; $header_feedback .= ''; $header_feedback .= ''; diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index a990c96398..ba2f1efa89 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -3335,7 +3335,7 @@ function config_process_config() } if (!isset($config['activate_feedback'])) { - config_update_value('activate_feedback', 1); + config_update_value('activate_feedback', true); } if (!isset($config['api_password'])) { From 53d813fa0bb3097ad4a41549d63238bba42e815f Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Thu, 13 Apr 2023 11:36:57 +0200 Subject: [PATCH 011/681] #10353 Removed name validation for new network components --- .../modules/manage_network_components.php | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index 7ef20ca385..6d7a56e054 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -340,14 +340,7 @@ if ($type >= MODULE_TYPE_REMOTE_SNMP && $type <= MODULE_TYPE_REMOTE_SNMP_PROC) { } if ($is_management_allowed === true && $create_component) { - $name_check = db_get_value( - 'name', - 'tnetwork_component', - 'name', - $name - ); - - if ($name && !$name_check) { + if ($name) { $id = network_components_create_network_component( $name, $type, @@ -427,14 +420,8 @@ if ($is_management_allowed === true && $create_component) { AUDIT_LOG_MODULE_MANAGEMENT, 'Fail try to create remote component' ); - - if ($name_check !== false) { - // If name exists, advice about it. - ui_print_error_message(__('Could not be created because the component exists')); - } else { - // Other cases. - ui_print_error_message(__('Could not be created')); - } + // Other cases. + ui_print_error_message(__('Could not be created')); include_once 'godmode/modules/manage_network_components_form.php'; return; From b043717df5d9ba7077116b7fa96f234d19be9659 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Thu, 13 Apr 2023 13:49:05 +0200 Subject: [PATCH 012/681] #15263 created filter for modules --- .../godmode/agentes/module_manager.php | 77 ++++++++++++++++++- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 3cb5ce9787..92bb1f224e 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -47,8 +47,74 @@ if (isset($policy_page) === false) { $policy_page = false; } -$checked = (bool) get_parameter('checked'); +$checked = (bool) get_parameter('status_hierachy_mode'); +$status_hierachy_mode = (bool) get_parameter('status_hierachy_mode'); $sec2 = (string) get_parameter('sec2'); +// Table for filter bar. +$filterTable = new stdClass(); +$filterTable->class = 'filter-table-adv w100p'; +$filterTable->size[0] = '20%'; +$filterTable->size[1] = '20%'; +$filterTable->size[2] = '20%'; +$filterTable->size[3] = '20%'; +$filterTable->size[4] = '20%'; +$filterTable->data = []; +$filterTable->cellstyle[0][0] = 'width:0'; +$filterTable->data[0][0] = __('Search'); +$filterTable->data[1][0] .= html_print_input_text( + 'search_string', + $search_string, + '', + 30, + 255, + true, + false, + false, + '', + '' +); +$filterTable->data[0][0] .= html_print_input_hidden('search', 1, true); + +if ((bool) $policy_page === false) { + $filterTable->data[0][1] = __('Show in hierachy mode'); + $filterTable->data[1][1] = html_print_checkbox_switch( + 'status_hierachy_mode', + ((string) $checked), + ((string) $checked), + true, + false, + 'onChange=change_mod_filter();' + ); +} + +$filterTable->data[1][2] = html_print_submit_button( + __('Filter'), + 'filter', + false, + [ + 'icon' => 'search', + 'class' => 'float-right', + 'mode' => 'secondary mini', + ], + true +); + +// Print filter table. +echo '
'; +ui_toggle( + html_print_table($filterTable, true).'
', + ''.__('Filter').'', + __('Filter'), + 'filter', + true, + false, + '', + 'white-box-content no_border', + 'filter-datatable-main box-flat white_table_graph fixed_filter_bar' +); +echo ''; + + if (isset($id_agente) === false) { return; @@ -1199,14 +1265,17 @@ html_print_div( if (/checked/.test(window.location)) { var url = window.location.toString(); if (checked) { - window.location = url.replace("checked=false", "checked=true"); + //window.location = url.replace("checked=0", "checked=1"); + $("#checkbox-status_hierachy_mode").val('1'); } else { - window.location = url.replace("checked=true", "checked=false"); + //window.location = url.replace("checked=1", "checked=0"); + $("#checkbox-status_hierachy_mode").val('0'); } } else { - window.location = window.location + "&checked=true"; + //window.location = window.location + "&checked=1"; + $("#checkbox-status_hierachy_mode").val('1'); } } From 10c7d4dddb2046752d82a1b0e065dfa68718ac33 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Thu, 13 Apr 2023 13:54:11 +0200 Subject: [PATCH 013/681] #15263 created filter for modules --- pandora_console/godmode/agentes/module_manager.php | 1 + 1 file changed, 1 insertion(+) diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 92bb1f224e..f4881c0373 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -73,6 +73,7 @@ $filterTable->data[1][0] .= html_print_input_text( '', '' ); + $filterTable->data[0][0] .= html_print_input_hidden('search', 1, true); if ((bool) $policy_page === false) { From e0437d3fbd11149dde298020066e1fcbc85c9e4c Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Mon, 17 Apr 2023 09:23:55 +0200 Subject: [PATCH 014/681] Fix duplicate code --- .../godmode/agentes/configurar_agente.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index dc27e4b207..32597ef4c4 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -1970,10 +1970,10 @@ if ($create_module) { // MODULE ENABLE/DISABLE // =====================. -if ($enable_module) { +/* + if ($enable_module) { $result = modules_change_disabled($enable_module, 0); $module_name = modules_get_agentmodule_name($enable_module); - // Write for conf disable if remote_config. $configuration_data = enterprise_hook( 'config_agents_get_module_from_conf', @@ -1987,10 +1987,8 @@ if ($enable_module) { // Force Update when disabled for save disabled in conf. $old_configuration_data = $configuration_data; - // Successfull action. $success_action = $result; - $success_action = $result; if ($result === NOERR) { db_pandora_audit( @@ -2003,9 +2001,11 @@ if ($enable_module) { 'Fail to enable #'.$enable_module.' | '.$module_name.' | '.io_safe_output($agent['alias']) ); } -} + } -if ($disable_module) { + if ($disable_module) { + + hd($disable_module, true); $result = modules_change_disabled($disable_module, 1); $module_name = modules_get_agentmodule_name($disable_module); @@ -2029,18 +2029,20 @@ if ($disable_module) { if ($result === NOERR) { + hd($disable_module, true); db_pandora_audit( AUDIT_LOG_MODULE_MANAGEMENT, 'Disable #'.$disable_module.' | '.$module_name.' | '.io_safe_output($agent['alias']) ); } else { + hd($disable_module, true); db_pandora_audit( AUDIT_LOG_MODULE_MANAGEMENT, 'Fail to disable #'.$disable_module.' | '.$module_name.' | '.io_safe_output($agent['alias']) ); } -} - + } +*/ // Fix to stop the module from being added to the agent's conf // when an error occurred while updating or inserting. or enable disable module. if ($update_module || $create_module From 9da8e8363337e98cdff93b379a87bc4c4d9323d6 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Tue, 18 Apr 2023 09:52:59 +0200 Subject: [PATCH 015/681] Modified the timestamp according to input data. Added query with the timestamp of the filter. --- .../include/functions_inventory.php | 20 +++++++++++++++---- .../operation/agentes/agent_inventory.php | 9 ++++++++- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/functions_inventory.php b/pandora_console/include/functions_inventory.php index 5b3efedc93..9bda1f17a1 100644 --- a/pandora_console/include/functions_inventory.php +++ b/pandora_console/include/functions_inventory.php @@ -741,15 +741,23 @@ function inventory_get_datatable( array_push($where, "tagent_module_inventory.data LIKE '%".$inventory_search_string."%'"); } + if ($utimestamp > 0) { + array_push($where, 'tagente_datos_inventory.utimestamp <= '.$utimestamp.' '); + } + $sql = sprintf( 'SELECT tmodule_inventory.*, tagent_module_inventory.*, - tagente.alias as name_agent + tagente.alias as name_agent, + tagente_datos_inventory.utimestamp as last_update, + tagente_datos_inventory.timestamp as last_update_timestamp FROM tmodule_inventory INNER JOIN tagent_module_inventory ON tmodule_inventory.id_module_inventory = tagent_module_inventory.id_module_inventory LEFT JOIN tagente ON tagente.id_agente = tagent_module_inventory.id_agente + LEFT JOIN tagente_datos_inventory + ON tagent_module_inventory.id_agent_module_inventory = tagente_datos_inventory.id_agent_module_inventory WHERE %s ORDER BY tmodule_inventory.id_module_inventory LIMIT %d, %d', @@ -763,6 +771,10 @@ function inventory_get_datatable( if ($order_by_agent === false) { $modules = []; foreach ($rows as $row) { + if ($row['utimestamp'] !== $row['last_update']) { + $row['timestamp'] = $row['last_update_timestamp']; + } + $data_rows = explode(PHP_EOL, $row['data']); foreach ($data_rows as $data_key => $data_value) { if (empty($data_value) === false) { @@ -894,16 +906,16 @@ function inventory_get_dates($module_inventory_name, $inventory_agent, $inventor AND tagente_datos_inventory.id_agent_module_inventory = tagent_module_inventory.id_agent_module_inventory AND tagente.id_agente = tagent_module_inventory.id_agente'; - if ($inventory_agent != 0) { + if ($inventory_agent !== 'All') { $sql .= ' AND tagent_module_inventory.id_agente IN ('."'".implode(',', (array) $inventory_agent)."'".')'; } - if ($inventory_id_group != 0) { + if ($inventory_id_group !== 0) { $sql .= " AND tagente.id_grupo = $inventory_id_group"; } if (is_string($module_inventory_name) === true - && $module_inventory_name != 'all' + && $module_inventory_name !== '0' ) { $sql .= " AND tmodule_inventory.name IN ('".str_replace(',', "','", $module_inventory_name)."')"; } diff --git a/pandora_console/operation/agentes/agent_inventory.php b/pandora_console/operation/agentes/agent_inventory.php index 1d692bfd41..9ae081186b 100644 --- a/pandora_console/operation/agentes/agent_inventory.php +++ b/pandora_console/operation/agentes/agent_inventory.php @@ -232,7 +232,14 @@ foreach ($rows as $row) { $table->cellspacing = 4; $table->class = 'info_table'; $table->head = []; - $table->head[0] = $row['name'].' - ('.date($config['date_format'], $row['utimestamp']).')'; + + if ($row['utimestamp'] === '0' && $utimestamp === 0) { + $table->head[0] = $row['name']; + } else if ($utimestamp === 0) { + $table->head[0] = $row['name'].' - (Last update '.date($config['date_format'], $row['utimestamp']).')'; + } else { + $table->head[0] = $row['name'].' - ('.date($config['date_format'], $utimestamp).')'; + } if ((bool) $row['block_mode'] === true) { $table->head[0] .= '   '.html_print_image( From 2387cbd3524617e11950d8d1e0a7924b84952f72 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Tue, 18 Apr 2023 12:14:25 +0200 Subject: [PATCH 016/681] Check variable value to show error message --- pandora_console/godmode/tag/edit_tag.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pandora_console/godmode/tag/edit_tag.php b/pandora_console/godmode/tag/edit_tag.php index 6c22094708..603a97f8cd 100644 --- a/pandora_console/godmode/tag/edit_tag.php +++ b/pandora_console/godmode/tag/edit_tag.php @@ -127,7 +127,7 @@ if ($create_tag) { // Erase comma characters on tag name $name_tag = str_replace(',', '', $name_tag); - + hd($name_tag, true); $data = []; $data['name'] = $name_tag; $data['description'] = $description_tag; @@ -155,11 +155,14 @@ if ($create_tag) { AUDIT_LOG_TAG_MANAGEMENT, $auditMessage ); - ui_print_result_message( - $action === 'update', - __('Successfully created tag'), - __('Error creating tag') - ); + + if ($name_tag !== '') { + ui_print_result_message( + $action === 'update', + __('Successfully created tag'), + __('Error creating tag') + ); + } } // Form fields are filled here From 4a250fc7c069e18f1f6b82b538693bf989f5fa67 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Tue, 18 Apr 2023 12:51:12 +0200 Subject: [PATCH 017/681] Trimmed tag name --- pandora_console/godmode/tag/edit_tag.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/tag/edit_tag.php b/pandora_console/godmode/tag/edit_tag.php index 603a97f8cd..557c5cb129 100644 --- a/pandora_console/godmode/tag/edit_tag.php +++ b/pandora_console/godmode/tag/edit_tag.php @@ -121,13 +121,14 @@ if ($update_tag && $id_tag != 0) { ); } -// Create tag: creates a new tag +// Create tag: creates a new tag. if ($create_tag) { $return_create = true; - // Erase comma characters on tag name + // Erase comma characters and spaces on tag name. $name_tag = str_replace(',', '', $name_tag); - hd($name_tag, true); + $name_tag = str_replace(' ', '', $name_tag); + $data = []; $data['name'] = $name_tag; $data['description'] = $description_tag; From 77b12120767b0a188d039b2dea609c5af008081f Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Wed, 19 Apr 2023 10:53:52 +0200 Subject: [PATCH 018/681] add new icon svg --- .../godmode/reporting/graph_builder.php | 2 +- pandora_console/images/builder.png | Bin 423 -> 518 bytes pandora_console/images/builder@2x.png | Bin 0 -> 963 bytes pandora_console/images/builder@svg.svg | 9 +++++++++ 4 files changed, 10 insertions(+), 1 deletion(-) mode change 100755 => 100644 pandora_console/images/builder.png create mode 100644 pandora_console/images/builder@2x.png create mode 100644 pandora_console/images/builder@svg.svg diff --git a/pandora_console/godmode/reporting/graph_builder.php b/pandora_console/godmode/reporting/graph_builder.php index 6c006a8059..524c796bd2 100644 --- a/pandora_console/godmode/reporting/graph_builder.php +++ b/pandora_console/godmode/reporting/graph_builder.php @@ -309,7 +309,7 @@ if ($edit_graph === true) { 'graph_editor' => [ 'active' => false, 'text' => ''.html_print_image( - 'images/builder.png', + 'images/builder@svg.svg', true, [ 'title' => __('Graph editor'), diff --git a/pandora_console/images/builder.png b/pandora_console/images/builder.png old mode 100755 new mode 100644 index 964ab6af6698f6876ad4943ce8777993664b9512..18729a155bd1ad827551857b5576121a66e78600 GIT binary patch literal 518 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc#=yY%t50_}ki(Mh=?zc(M!jHiYq-`978Mw?}lvj zI^rNw@_3?NoU-P+AnuP+e_L2wHhi+y+4{}Z z`u%R44hy&Vq}u$ndv9*vy|YrZN9VMO+R+>G30X>7=RX(5UjJ=(H=ssR_VFg2{c~fQ z)XsaYbYA;)ir10jwma56Hay@MD3Uzsbo*<`)|9iK)@i9IT{C8}s&x9(;r5N^+1tYn zY0IiJS`+M-otW!f*+mSLQ8rb!qtDBf0Bt#zRS~+d@M6TV<GoToQEWv~>fb7->1T6vxAZBcW zK;s+~6chv=K79BBtFMvlJOIQFP$5Sk-jCs7puz+g4bp_}SZvnshuMHlF%uf!0H0w1 z0Yn)Bg#^~P!4?%rKoA%TADFO6I6~<{AZ`TW0=(%CW<88%K@TDz2t?KdwDtgsLTK!K zz!gl$3PCy#;&KiXo=|ciRv~!+Ai!vX7zyQfX!cnM#Pvwh3xN0`D7S+G3>3?x8cGaE z1RA^mTNE*%MK->)=m<*;&54moQvG48WI2A3$T6ftrRI5SxAQWl&@Q%Jv3G;dTM3a3NUq0|3U{tJ002ovPDHLkV1nWPl&1gy diff --git a/pandora_console/images/builder@2x.png b/pandora_console/images/builder@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..90603a77fdcfc77efa64b7c5507dd0b15ddf8d2d GIT binary patch literal 963 zcmV;!13dhRP)TIZO}W)IUq4V3Dq zqQ{%LF#b$0I<%=U`F{x1EhQJg`W1`CTfJWIwwY@ZPdmMX5=iH8CPhB@AeXL~{ zNW84J-ZO$R!rqc#K|dGt5UFc8Boz#5`2fpbjznJ&?5I%3NSR?wNr7-ic8-^%G16g@ zu}ya{9A39A%_Y;jjAmvh2dPwQv0ksQ;izJdzQ9Rz#$_zz+t~dOCuHxzBoHisJ#sBVH4U#V2Oik|qa8`~8L4gVRs@RULAR?+mA zTv*C&OE&TP$TE&H6BqJ64y}eR;nbn4GXC;u4U=nyBkN`|!tz3|o-Kyq8cv`^%F5+( zy4`NqaR{F^Fn^83Eq)%i_+vV>ZL;mWm@kz|Cuq=WwO&s$ImW<|vCf&p_lYvs>2%(q zx&y1pUv*xZn0(Bk2z*6(iXN$hH7>}!Gu{xy@yl$&$*Iw+4)v*9e42sIzbfKR34%8g)%0FCQwB=5#QLmUz z!$=X^;!y_st)C`1ZpEh+oK|q$3XE(2U-aMySC#OH`{>g7%EzuCo)lR;XZbn6{}Db# l&*lxxOZZpgm~SF3+%Fjo@%GUH%+~+_002ovPDHLkV1g-ItD*n^ literal 0 HcmV?d00001 diff --git a/pandora_console/images/builder@svg.svg b/pandora_console/images/builder@svg.svg new file mode 100644 index 0000000000..f0231491c8 --- /dev/null +++ b/pandora_console/images/builder@svg.svg @@ -0,0 +1,9 @@ + + + + Dark/20/builder@svg + Created with Sketch. + + + + \ No newline at end of file From b7a7b4b5977e472e167016ac80c0653fe17116a8 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Thu, 20 Apr 2023 09:09:34 +0200 Subject: [PATCH 019/681] Fix js code line that forced the selected version to 1 --- pandora_console/include/class/CredentialStore.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/class/CredentialStore.class.php b/pandora_console/include/class/CredentialStore.class.php index 904ddbc6e4..36f66c6b40 100644 --- a/pandora_console/include/class/CredentialStore.class.php +++ b/pandora_console/include/class/CredentialStore.class.php @@ -1366,7 +1366,7 @@ class CredentialStore extends Wizard $('#li_snmp_2').show(); if ($('#li_snmp_1').length > 0) { - $('#version').val('1'); + //$('#version').val('1'); $('#version').trigger('change'); } else { const ul = $('#modal_form').children('ul')[0]; From 9acfa36d438cb1bfcf865b010b1253ec6c22781b Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Thu, 20 Apr 2023 10:22:37 +0200 Subject: [PATCH 020/681] #10698 Adjusted style of comment field, event list view --- pandora_console/include/styles/events.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css index e4dfbe428d..b0790f76b5 100644 --- a/pandora_console/include/styles/events.css +++ b/pandora_console/include/styles/events.css @@ -88,6 +88,10 @@ table#table_events > tbody > tr > td { padding: 0px !important; } +table#table_events > tbody > tr > td > i { + font-size: 7.5pt; +} + td > input[id^="checkbox-multi"] { margin: 0px !important; } From 8e9bc5d0bb32f211ca5d8192eadb4bdb55fded03 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Thu, 20 Apr 2023 11:13:47 +0200 Subject: [PATCH 021/681] Fix style class invert_filter --- pandora_console/include/functions_events.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 9f4ba19bb1..0fe3e3551c 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2665,7 +2665,7 @@ function events_print_type_img( $urlImage = ui_get_full_url(false); $icon = ''; - $style = 'invert_filter main_menu_icon'; + $style = 'main_menu_icon'; switch ($type) { case 'alert_recovered': @@ -2702,23 +2702,28 @@ function events_print_type_img( break; case 'system': + $style .= ' invert_filter'; $icon = 'images/configuration@svg.svg'; break; case 'recon_host_detected': + $style .= ' invert_filter'; $icon = 'images/recon.png'; break; case 'new_agent': + $style .= ' invert_filter'; $icon = 'images/agents@svg.svg'; break; case 'configuration_change': + $style .= ' invert_filter'; $icon = 'images/configuration@svg.svg'; break; case 'unknown': default: + $style .= ' invert_filter'; $icon = 'images/event.svg'; break; } From 48d7eb2514ca6b772d337bb0d06a482a4f4c55bd Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 20 Apr 2023 11:15:34 +0200 Subject: [PATCH 022/681] #10733 align text widget hotizontally --- .../include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php b/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php index 033761afdf..9d65fe1b40 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php +++ b/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php @@ -643,17 +643,19 @@ class AvgSumMaxMinModule extends Widget $output .= '
'; $orientation = ''; + $extraClass = ''; if ((int) $this->values['horizontal'] === 1) { $orientation = 'flex aligni_center'; } else { $orientation = 'grid'; + $extraClass = 'mrgn_btn_20px'; } // General div. $output .= '
'; // Div value. - $output .= '
'; + $output .= '
'; if (is_numeric($data) === true) { $dataDatos = remove_right_zeros( From e05a19dc7f36e0daa9355773203f31ae25fce226 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 20 Apr 2023 12:24:52 +0200 Subject: [PATCH 023/681] #10991 fixed acl in auth view --- pandora_console/godmode/setup/setup_auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php index c0548b32e8..3822a01b2e 100644 --- a/pandora_console/godmode/setup/setup_auth.php +++ b/pandora_console/godmode/setup/setup_auth.php @@ -24,7 +24,7 @@ global $config; check_login(); -if ((bool) check_acl($config['id_user'], 0, 'PM') === true && is_user_admin($config['id_user']) === false) { +if ((bool) check_acl($config['id_user'], 0, 'PM') === false && is_user_admin($config['id_user']) === false) { db_pandora_audit( AUDIT_LOG_ACL_VIOLATION, 'Trying to access Setup Management' From 6ef34d78c4b3d748a11ff6ed20d285ae391daa9f Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 20 Apr 2023 12:47:06 +0200 Subject: [PATCH 024/681] #10991 fixed background in black theme --- pandora_console/include/styles/pandora_black.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index f657e9d910..e6e2710d7c 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -736,7 +736,7 @@ div#main_pure { div#main, div#container, body.pure { - background-color: #111; + background-color: #111 !important; } form ul.form_flex { From c70082e12d1c81f80235795384a2cc1730e7b52e Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Fri, 21 Apr 2023 09:40:14 +0200 Subject: [PATCH 025/681] Fix limit in SQL query --- .../include/class/AuditLog.class.php | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pandora_console/include/class/AuditLog.class.php b/pandora_console/include/class/AuditLog.class.php index c16628dd69..e0d1ce2620 100644 --- a/pandora_console/include/class/AuditLog.class.php +++ b/pandora_console/include/class/AuditLog.class.php @@ -318,17 +318,29 @@ class AuditLog extends HTML $count = (int) db_get_value_sql(sprintf('SELECT COUNT(*) as "total" FROM tsesion WHERE %s', $filter)); - $sql = sprintf( - 'SELECT * - FROM tsesion - WHERE %s - ORDER BY %s - LIMIT %d, %d', - $filter, - $order, - $start, - $length - ); + if ($length !== '-1') { + $sql = sprintf( + 'SELECT * + FROM tsesion + WHERE %s + ORDER BY %s + LIMIT %d, %d', + $filter, + $order, + $start, + $length + ); + } else { + $sql = sprintf( + 'SELECT * + FROM tsesion + WHERE %s + ORDER BY %s', + $filter, + $order + ); + } + $data = db_get_all_rows_sql($sql); if (empty($data) === false) { From 0c2de27774b37280a7f1ecb431f105c39b59d3cc Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 21 Apr 2023 11:40:27 +0200 Subject: [PATCH 026/681] #10984 title visual console --- .../operation/visual_console/view.php | 82 ++++++++++--------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php index 80254800b5..01f4a2092f 100644 --- a/pandora_console/operation/visual_console/view.php +++ b/pandora_console/operation/visual_console/view.php @@ -60,8 +60,10 @@ function visual_map_print_button_editor_refactor( $disabled, '', [ - 'class' => $class, - 'mode' => 'onlyIcon', + 'class' => $class, + 'mode' => 'onlyIcon', + 'data-title' => $label, + 'data-use_title_for_force_title' => '1', ], false, true @@ -270,45 +272,45 @@ if ($pure === false) { echo '
'; echo '', + 'field3_recovery' => '

Automatic alert system


We have good news for you, alert has been recovered

Monitoring details

Data: _data_ (normal)

Agent: _agent_ _address_

Module: _module_ _moduledescription_

Timestamp: _timestamp_

This is a graph of latest 24hr data for this module

_modulegraph_24h_

Contact Us  |  Support  |  Docs

', + ]; + + $result = alerts_create_alert_template($name, $type, $values); + return $result; +} From 9e81e28c62d537fcc2610532eb026849de53e148 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 14 Jul 2023 12:12:20 +0200 Subject: [PATCH 649/681] #10598 basic_net fix --- pandora_console/include/class/WelcomeWindow.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/class/WelcomeWindow.class.php b/pandora_console/include/class/WelcomeWindow.class.php index 0d1068ce67..77f722e5d3 100644 --- a/pandora_console/include/class/WelcomeWindow.class.php +++ b/pandora_console/include/class/WelcomeWindow.class.php @@ -1286,7 +1286,7 @@ class WelcomeWindow extends Wizard type: "POST", url: "include/ajax/task_to_perform.php", data: { - Contition: 1, + create_net_scan: 1, ip_target: $('#text-ip_target_discovery').val(), }, success: function(data) { From e6e4448ea949597d9b567ec50b9b790e304dfba7 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 14 Jul 2023 12:33:19 +0200 Subject: [PATCH 650/681] #10598 license and dropsearch select2 --- pandora_console/include/class/WelcomeWindow.class.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pandora_console/include/class/WelcomeWindow.class.php b/pandora_console/include/class/WelcomeWindow.class.php index 77f722e5d3..6d7baa647c 100644 --- a/pandora_console/include/class/WelcomeWindow.class.php +++ b/pandora_console/include/class/WelcomeWindow.class.php @@ -399,6 +399,10 @@ class WelcomeWindow extends Wizard $btn_license_valid_class = ''; $li_license_valid_class = 'row_green'; $flag_lv = true; + } else { + $btn_license_valid_class = 'fail'; + $li_license_valid_class = 'row_grey'; + $flag_lv = false; } } else { $show_license = false; @@ -1227,6 +1231,10 @@ class WelcomeWindow extends Wizard $('#text-id_agent').autocomplete({ appendTo: '#dialog_alert_mail' }); + + $("#id_agent_module").select2({ + dropdownParent: $("#dialog_alert_mail") + }); } }); } From 4407efecc06517edfa5dc0b2d1ea80dc7a631713 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 14 Jul 2023 12:39:13 +0200 Subject: [PATCH 651/681] #10598 remove show license and show always --- .../include/class/WelcomeWindow.class.php | 59 +++++++++---------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/pandora_console/include/class/WelcomeWindow.class.php b/pandora_console/include/class/WelcomeWindow.class.php index 6d7baa647c..3a2d45f2e0 100644 --- a/pandora_console/include/class/WelcomeWindow.class.php +++ b/pandora_console/include/class/WelcomeWindow.class.php @@ -385,7 +385,6 @@ class WelcomeWindow extends Wizard $flag_su = true; } - $show_license = true; if (enterprise_installed()) { $license_valid = true; enterprise_include_once('include/functions_license.php'); @@ -405,7 +404,9 @@ class WelcomeWindow extends Wizard $flag_lv = false; } } else { - $show_license = false; + $btn_license_valid_class = 'fail'; + $li_license_valid_class = 'row_grey'; + $flag_lv = false; } $inputs[] = [ @@ -510,36 +511,34 @@ class WelcomeWindow extends Wizard ], ], ]; - if ($show_license) { - $inputs[] = [ - 'wrapper' => 'div', - 'block_id' => 'div_license_valid', - 'class' => 'hole flex-row flex-items-center w98p '.$li_license_valid_class, - 'direct' => 1, - 'block_content' => [ - [ - 'label' => __('Enterprise licence valid'), - 'arguments' => [ - 'class' => 'first_lbl', - 'name' => 'lbl_license_valid', - 'id' => 'lbl_license_valid', - ], - ], - [ - 'arguments' => [ - 'label' => '', - 'type' => 'button', - 'attributes' => [ - 'class' => (empty($btn_license_valid_class) === false) ? $btn_license_valid_class : 'invisible_important', - 'mode' => 'onlyIcon', - ], - 'name' => 'btn_license_valid_conf', - 'id' => 'btn_license_valid_conf', - ], + $inputs[] = [ + 'wrapper' => 'div', + 'block_id' => 'div_license_valid', + 'class' => 'hole flex-row flex-items-center w98p '.$li_license_valid_class, + 'direct' => 1, + 'block_content' => [ + [ + 'label' => __('Enterprise licence valid'), + 'arguments' => [ + 'class' => 'first_lbl', + 'name' => 'lbl_license_valid', + 'id' => 'lbl_license_valid', ], ], - ]; - } + [ + 'arguments' => [ + 'label' => '', + 'type' => 'button', + 'attributes' => [ + 'class' => (empty($btn_license_valid_class) === false) ? $btn_license_valid_class : 'invisible_important', + 'mode' => 'onlyIcon', + ], + 'name' => 'btn_license_valid_conf', + 'id' => 'btn_license_valid_conf', + ], + ], + ], + ]; } else { $inputs[] = [ 'wrapper' => 'div', From fd17e2179a3959e0323d2d06419de11cb5648540 Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 15 Jul 2023 01:01:00 +0200 Subject: [PATCH 652/681] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 9f2a0a04aa..df1ea056ca 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.772-230714 +Version: 7.0NG.772-230715 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 c0704f74a7..34e10dbd19 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.772-230714" +pandora_version="7.0NG.772-230715" 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 09aad69a9b..c9abd30afc 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.772'; -use constant AGENT_BUILD => '230714'; +use constant AGENT_BUILD => '230715'; # 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 0e6440e1a7..12c4dc696f 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.772 -%define release 230714 +%define release 230715 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 111552facf..ddb37a50cd 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.772 -%define release 230714 +%define release 230715 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 52f5e1635a..e29893349d 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230714" +PI_BUILD="230715" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 5188111230..dda2cccd13 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230714} +{230715} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 24d4844aee..c3f9c62d26 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.772 Build 230714") +#define PANDORA_VERSION ("7.0NG.772 Build 230715") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 7327e99e36..5680c21ed9 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.772(Build 230714))" + VALUE "ProductVersion", "(7.0NG.772(Build 230715))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 178e7e5759..89b3df28c4 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.772-230714 +Version: 7.0NG.772-230715 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 7ce4a5b8fa..bc34cf03e0 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.772-230714" +pandora_version="7.0NG.772-230715" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index e02fb5d108..d8ec443791 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC230714'; +$build_version = 'PC230715'; $pandora_version = 'v7.0NG.772'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 5627b2be25..a2c1044528 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 a0df57a9f3..17cdb3438f 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.772 -%define release 230714 +%define release 230715 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 8fe1a03640..81a8a5e42d 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.772 -%define release 230714 +%define release 230715 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 70b2c29cef..5493af7692 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230714" +PI_BUILD="230715" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index bbd5c10b4a..6318a5f0fb 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.772 Build 230714"; +my $version = "7.0NG.772 Build 230715"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 90a221e928..11d0aa9fd7 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.772 Build 230714"; +my $version = "7.0NG.772 Build 230715"; # save program name for logging my $progname = basename($0); From bdf2ac1e0b27dd0a183a0f353da471f8cf11216a Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 16 Jul 2023 01:00:51 +0200 Subject: [PATCH 653/681] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index df1ea056ca..21630c0ed4 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.772-230715 +Version: 7.0NG.772-230716 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 34e10dbd19..278a176713 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.772-230715" +pandora_version="7.0NG.772-230716" 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 c9abd30afc..58d0599f44 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.772'; -use constant AGENT_BUILD => '230715'; +use constant AGENT_BUILD => '230716'; # 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 12c4dc696f..b63cbb6b5b 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.772 -%define release 230715 +%define release 230716 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index ddb37a50cd..b997660661 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.772 -%define release 230715 +%define release 230716 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 e29893349d..59f8f0d850 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230715" +PI_BUILD="230716" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index dda2cccd13..27852482fe 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230715} +{230716} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index c3f9c62d26..f9f95ccaba 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.772 Build 230715") +#define PANDORA_VERSION ("7.0NG.772 Build 230716") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 5680c21ed9..1c77a72a85 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.772(Build 230715))" + VALUE "ProductVersion", "(7.0NG.772(Build 230716))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 89b3df28c4..d569a78635 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.772-230715 +Version: 7.0NG.772-230716 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 bc34cf03e0..f07fdd43d9 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.772-230715" +pandora_version="7.0NG.772-230716" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index d8ec443791..f05f47bda8 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC230715'; +$build_version = 'PC230716'; $pandora_version = 'v7.0NG.772'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index a2c1044528..bbc09d23e8 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 17cdb3438f..58df26ab69 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.772 -%define release 230715 +%define release 230716 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 81a8a5e42d..b573995a2a 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.772 -%define release 230715 +%define release 230716 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 5493af7692..2f8caf5140 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230715" +PI_BUILD="230716" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6318a5f0fb..c3fa658bc4 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.772 Build 230715"; +my $version = "7.0NG.772 Build 230716"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 11d0aa9fd7..fe7c3ddb4f 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.772 Build 230715"; +my $version = "7.0NG.772 Build 230716"; # save program name for logging my $progname = basename($0); From bff52108355b9ea120187de321d936b39923d215 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 17 Jul 2023 01:00:44 +0200 Subject: [PATCH 654/681] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 21630c0ed4..c3721c3481 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.772-230716 +Version: 7.0NG.772-230717 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 278a176713..b75cd1605d 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.772-230716" +pandora_version="7.0NG.772-230717" 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 58d0599f44..7d08a232b1 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.772'; -use constant AGENT_BUILD => '230716'; +use constant AGENT_BUILD => '230717'; # 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 b63cbb6b5b..c61554dc4a 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.772 -%define release 230716 +%define release 230717 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index b997660661..ee587b10f7 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.772 -%define release 230716 +%define release 230717 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 59f8f0d850..d0452d5783 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230716" +PI_BUILD="230717" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 27852482fe..7095ffc51e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230716} +{230717} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index f9f95ccaba..465a673721 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.772 Build 230716") +#define PANDORA_VERSION ("7.0NG.772 Build 230717") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 1c77a72a85..b2cfbcf5a9 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.772(Build 230716))" + VALUE "ProductVersion", "(7.0NG.772(Build 230717))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index d569a78635..db0060aaaa 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.772-230716 +Version: 7.0NG.772-230717 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 f07fdd43d9..e83c4c4694 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.772-230716" +pandora_version="7.0NG.772-230717" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index f05f47bda8..e63c15a5e5 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC230716'; +$build_version = 'PC230717'; $pandora_version = 'v7.0NG.772'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index bbc09d23e8..a816e04f11 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 58df26ab69..3232fd8164 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.772 -%define release 230716 +%define release 230717 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index b573995a2a..ef9a34adea 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.772 -%define release 230716 +%define release 230717 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 2f8caf5140..8fb43e076a 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230716" +PI_BUILD="230717" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index c3fa658bc4..2279752285 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.772 Build 230716"; +my $version = "7.0NG.772 Build 230717"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index fe7c3ddb4f..5387e4d150 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.772 Build 230716"; +my $version = "7.0NG.772 Build 230717"; # save program name for logging my $progname = basename($0); From c333ffcf0adeddf301778dde16cdf64531daaf1c Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 17 Jul 2023 08:59:32 +0200 Subject: [PATCH 655/681] #11420 fixed url and added buttons --- pandora_console/godmode/servers/modificar_server.php | 2 +- pandora_console/godmode/servers/servers.build_table.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index cb99f3b4ef..6d3e672334 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -212,7 +212,7 @@ if (isset($_GET['server']) === true) { false, 'servers', true, - [], + $buttons, [ [ 'link' => '', diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php index 861a507143..872aa33e6a 100644 --- a/pandora_console/godmode/servers/servers.build_table.php +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -255,7 +255,7 @@ foreach ($servers as $server) { if (($names_servers[$safe_server_name] === true) && ($server['type'] === 'data' || $server['type'] === 'enterprise satellite')) { $data[8] .= ''; - $data[8] .= ''; + $data[8] .= ''; $data[8] .= html_print_image( 'images/remote-configuration@svg.svg', true, From 8d89ed90d3825ba4b6885e639f4e099e12bd1a15 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Mon, 17 Jul 2023 09:34:57 +0200 Subject: [PATCH 656/681] #11735 Fix Agent view modules --- pandora_console/include/ajax/module.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 0ab70681df..8cc2eca4a5 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -98,15 +98,18 @@ if (check_login()) { } $id_plugin = get_parameter('id_plugin', 0); - $id_module_plugin = db_get_value( - 'id_plugin', - 'tagente_modulo', - 'id_agente_modulo', - $get_module_macros - ); - if ($id_plugin !== $id_module_plugin) { - $get_plugin_macros = true; - $get_module_macros = 0; + + if ($id_plugin !== 0) { + $id_module_plugin = db_get_value( + 'id_plugin', + 'tagente_modulo', + 'id_agente_modulo', + $get_module_macros + ); + if ($id_plugin !== $id_module_plugin) { + $get_plugin_macros = true; + $get_module_macros = 0; + } } if ($get_plugin_macros) { From f96adf59e9fedf60058ca0ed4ac54e8ae0f53584 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Mon, 17 Jul 2023 10:16:13 +0200 Subject: [PATCH 657/681] #11737 Fix pgp update required message --- pandora_console/include/class/ConsoleSupervisor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index cb9435b559..5916f5bf12 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -1807,7 +1807,7 @@ class ConsoleSupervisor $this->cleanNotifications('NOTIF.PHP.SERIALIZE_PRECISION'); } - if (version_compare('8.1', PHP_VERSION) >= 0) { + if (version_compare('8.0.29', PHP_VERSION) > 0) { $url = 'https://www.php.net/supported-versions.php'; $this->notify( [ From 37b1c94b45073f4041a1857ff2f4f86378c6f096 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 17 Jul 2023 11:53:14 +0200 Subject: [PATCH 658/681] #11493 Fixed icon --- .../include/lib/Dashboard/Widgets/AgentHive.php | 7 ++++--- pandora_console/include/styles/dashboards.css | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php b/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php index d41ef6df68..3b881ca344 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php +++ b/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php @@ -414,7 +414,7 @@ class AgentHive extends Widget $output .= '
'; $output .= file_get_contents( - ui_get_full_url('images/'.$icon) + ui_get_full_url('images/'.$icon, false, false, false) ); $output .= '
'; $output .= ui_print_truncate_text( @@ -424,8 +424,9 @@ class AgentHive extends Widget true, true, '…', - 'font-size: 11pt;color: #14524f; - font-weight: 600;text-align: left', + 'font-size: 11pt;color: #14524f;white-space: nowrap; + font-weight: 600;text-align: left;width: 80%; + overflow: hidden;', ); $output .= '
'; diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css index 35f83388f9..285e8fa481 100644 --- a/pandora_console/include/styles/dashboards.css +++ b/pandora_console/include/styles/dashboards.css @@ -674,17 +674,16 @@ form.modal-dashboard .widget-agent-hive-square-status { width: 3%; height: 100%; - margin-left: 4%; - margin-right: 3%; + margin-left: 3%; border-radius: 15px; } .widget-agent-hive-square-info { - width: 90%; + width: 87%; height: 100%; display: flex; flex-direction: column; - margin-left: 5px; + margin-left: 6%; } .widget-agent-hive-square-info-header { From d3fded0fa88a1143a9e0d814e917c415f2b4ad96 Mon Sep 17 00:00:00 2001 From: Calvo Date: Mon, 17 Jul 2023 12:02:48 +0200 Subject: [PATCH 659/681] Deleted missing Dumper --- pandora_server/util/pandora_db.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index d8d61eb7df..671ac819fc 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -789,7 +789,6 @@ sub pandora_checkdb_integrity { $where_condition = ''; my @modules = get_db_rows($dbh, 'SELECT id_agente_modulo FROM tagente_modulo'); foreach my $id_agente_modulo (@modules) { - print Dumper($id_agente_modulo); $where_condition .= 'options NOT LIKE ("%\\"moduleId\\":\\"'.$id_agente_modulo->{'id_agente_modulo'}.'\\"%")'; if($id_agente_modulo == $modules[-1]) { last; From 567bfdcbb7a017be39dbf91aafc42e05c5651c26 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Mon, 17 Jul 2023 13:08:13 +0200 Subject: [PATCH 660/681] #11737 Fix version --- pandora_console/include/class/ConsoleSupervisor.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index 5916f5bf12..9142f9a692 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -1807,7 +1807,8 @@ class ConsoleSupervisor $this->cleanNotifications('NOTIF.PHP.SERIALIZE_PRECISION'); } - if (version_compare('8.0.29', PHP_VERSION) > 0) { + // If PHP_VERSION is lower than 8.0.27 version_compare() returns 1. + if (version_compare('8.0.27', PHP_VERSION) === 1) { $url = 'https://www.php.net/supported-versions.php'; $this->notify( [ From 8aaa98a741468b1adccc43961ba20fd707cba25f Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 17 Jul 2023 14:10:08 +0200 Subject: [PATCH 661/681] #10254 added message timeout --- pandora_console/include/auth/mysql.php | 1 - pandora_console/index.php | 1 - 2 files changed, 2 deletions(-) diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php index 5f4b1cfe59..ef619236c8 100644 --- a/pandora_console/include/auth/mysql.php +++ b/pandora_console/include/auth/mysql.php @@ -244,7 +244,6 @@ function process_user_login_remote($login, $pass, $api=false) } if ($sr === false) { - $config['auth_error'] = 'User not found in database or incorrect password'; return false; } break; diff --git a/pandora_console/index.php b/pandora_console/index.php index a1304963c1..4d37baceb2 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -711,7 +711,6 @@ if (isset($config['id_user']) === false) { login_check_failed($nick); } - $config['auth_error'] = __('User is blocked'); $login_failed = true; } From a0dc60a49fd1e116c9b99ea6f0eef8964871e19b Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 17 Jul 2023 14:57:54 +0200 Subject: [PATCH 662/681] #11493 Added png --- pandora_console/images/widgets/AgentHive.png | Bin 0 -> 5426 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pandora_console/images/widgets/AgentHive.png diff --git a/pandora_console/images/widgets/AgentHive.png b/pandora_console/images/widgets/AgentHive.png new file mode 100644 index 0000000000000000000000000000000000000000..9a3c4623e52c7a08eaa4d1018d84b79746e38124 GIT binary patch literal 5426 zcmV-270v32P){qG?0+r{hWK=?77UzoVn-R^SS3HA!gRPcV_nN*)x0goHMg$_RJBGfh&09qaH|6 zyGEiYg2d>_M{-8juxJ8}tSsJqD-9>|XHEUiCnOWiuwu#M&nL=|KY!UANS9wKem^UU z1CU|I_O02fs+#6|ebYXYCP$H+L9w#4v(bnVBT#0KYf;77Qv|$o=S~7^*X3F?V8|!} z6KMwUA;X$AYtZRaC(%C#ts!9wD?f8mLlszlJ}%vxt)*NJ9KYCD-H$hKyA8m)lIG5y zfjYGl&||ZvqvapnLc%K+sqw`F@*M=gSOQ>F_7**1Rzlq6qy3tD|9}S3xBWY%c0G~N!^rwO#s9Gi#d2Pv-zDiWeh^k8E%*msVvuO|}nF?Or za+9K}9r#2(4xN=`qQc$r!5dk7cWVn7 z3jtv1&JTYHFFv=fK8z5&kVlW1sw1K6LXaZM{_}rWxd!G3>^Fm;t~`m9{^;$p8j31Q<=h0nDz8dyXLExG~=@O-oBd_4s96&b*B6 z5?%T1Q|c|lzdwxPOM+0Vy&0CjdpICpI5~(WdgasCkyelq;ez!a_E8k!Dx)+bnCcV$ z#m_t`Uc!PX(u*Zq(nSSzjS6C#jD$2L8jAR3sZNok+Poi+I!o~q`Gy7Yucbr;_%uNY zpPc#N-4$_g7LZH_v@JAdCcs#SIe~>Y37gd&wluh>jgtcAq|da_25yt35}MDee_CX3Q8= zSy`z~=n_$;lRk<=<0D6o)O9k@c;X6rV(ybPpJN~9?jbyrKXULOy8Z6P?4TvZy}e=3 zqXQodbo6HjmgW=4px3wm&5fm84#jaqF+j~?T~&h`H)}P58L2KnCypbQxR>E3E6B9z zpjmjw!%kJJh*d&)d^T=c5GbgugF<*16aq>s>sq#qUfsBhtt<)Kh4C3pn~u&_-+wEn zxWIEX?crSVK)$sh27`$Roj0&Bz7U9;76cC}>w*!4;DJo@u~6e#sU9O1GcAaJU_r=6 zFe9QyFnyOX!tekFQ@WHC6bXlP51|~8j>|CQvMUYW8rWC;^uQ4To}1J7febUNE@saN z&vaA~8drmG;?I6G@)D6aKf>}ElZmJG6b}4!^ymhyYo(&FNatRkKYDLg5Gtw_1QEPc zB4Cy9TM$mhi9Wghe{x2Zu{3lAu?a9~6vFC_EG$u2lGKZNlfHY@49Bz}vkU--O32Y@ zcPG>3MD+MHsB}aW%gv_OJU$yw$PkFEV8izQR;zg|!BmDp^m!Ar58}y|?lEP{jAJNO zS`u5RS7G+yp)@syoUUeqIfikWaYjD`*! zsyvW8?~bmSJsXV5rMj5#^4mK)25Un7jF12ZYSO2l?7HX3kt1lwjvZ*&uwiJ=o;_&b zz=7!S;ln5=Cr6hRlnHSB_J~usj_Bpc{rBG=y?62x!;R7a2KxnaB&b|(h5+z}`r7_g zRaK~4w{B?MxN$^d>eZ_ksc`S!y%D4txnvnI%HO3+mxOZx;6*lC0AedB`vNEMa{V`1 zSW|>+@w!lD9m3mljiuE`xk+AQ5(xn>2|4EQNt7<|!$jZc2Rl~alEv%UQAC5f>vy{d zVT(V<3{iTE-ycGQ3H`x;NSLf8R^D@;7EUJMnxU+2qYx-A{7NfdnLBPkw($Jl9&QVd zr_aYtRR|uD#_7IhEFM#ic5N=A$z;D1A}rqfms5GX8ayvgyE?YrL{N^!=xu$kksiBO zdYMc@&#{DH8Je!382PJKEF%S4;VpfB8Tt}G^qc>-!SGq6&*y7vZT8vAY&w<@-2{hc zgD!cqO-9vSiU-e{(Y6LvckSY_Wh4qamQW&MEg{V{Lq^guV#r83$>15~WntP5Gz(5Jl6-#060#aFXV09D%4<}#@QFM$AX6l( zYOu1#|5)=7zEa7=9Wz7=GaCpS@KRJg{!wRlV5RuU`l5&;)ozH`9SH3XtZwSS=kfc5 z_zid-=`ZVkKW5qT<%_TT=Jh1$xh0E;EfYi(*bcxy){qJYLcF_z);_-&vGz?QGxJCB z7?5Rf{C{O3ypdx148abLrmNW-6=-c!NZhutA>U6Vz}7GlDQv?J!eyp>UnA;i~GqyxSZY z!_cb7`;M7`mDH6RwssdHN+!Zh9Zxbz2yO{gmMUgVyt5oHk}#_Y)^u$#1Ff!fZs?7| zp>%7K9%K0YHPVH4$LvTiAv5^x))nvMH2ErzS##hw+JCSy$Cqa5hRhTezSp5f^4(;X zsk!0lO8AQhAG|xx*eQ;g7uRp=FDOd;=B}_+`KlzNzgDjqonN_cC8>&VX*E4OF za8rZ@QHsu-dK;(L}XnSDHe{tFXWI1OJG#0g>5Yg?{Yqw3W(f%lg#$lZPP=uxdZ^65<# z#|)u&|GsmwnS=yU_)1K~2vl^yfB~waC}{QS)hHAS5ue7vH~K}RQ3O9e%_*GCKWWk= z^!c8h51BO{@L{=d2zxBBr!!%~1XNQ~L;ULMYBX`;MAN+3!>8(K2M z5_cNrD?{^}!D+gg9|;GqGfM-wB{OAZ2T?NSgoz4Ilm;_QFhhj(2h9lrUa>QGmdp$s zd^0guG$-MGN)&TaS+Am+ke>FG?+rb#hv;LL%&_RNVndIsv2Yp&qxXN5?nhqY761J+ zO5W0U#0;E9qNgW}D8mUKa9-mXm1P8TH4kfb+lWRj)7&sul4 z8J;0=1E3>j;M6VM=QN;2&L08X4jv4KbAGv0GygTB2WOX@I7iHM%*e1cfLh^!L|{-9 z+GQ9Xd~?D8i|dFPuLnce4r!=7#nwj`hC%p>88l&E2aeI2IXVcNrSouCZ!^1Fe|85~ zyLf!%`M4`)cp@z&-o}jG!O-sDY8TI{2RM40QDRnuA;q&hxZ1^|bj^H6%-9(Wp&-C} z2%qrAn@R`{uJMizhOiS&jfi+0h*LbHG$WWJW~>H7T0lA;T%Z2kYE(_mHc)814_ohM zr;+2ats#z>u{&r!vv?7zsyJm@y3@hXln|HTh#5N?WOYzQCr)@f7;<$sjk)xMC(z8L+a_T+VZ5nu`%A*A+8%HAB0Dt5*$R`2xTvFQDV-b^+{a zhIR*6yUehcCK=_CVJjffPQX7u-k~wV4w}FrKPb{c&g;PtDt`9lacpPZ>q8?Z00w-J ziY7AIdhf4)8rt`Uo~suuTB0!pnL$&u8WaJ~3m0stN0YyMv&tXlXK9mL1ONcrXlC1h zcaM8`&;H%pe>i-|O>f~X10Y8gmoM5csXa5Qt@nFojLDP{&Js*t6<9PRin5nP?eR@QOE{Gh&K|fq`AP-NlUd zeqZ|rY|@CZX`?Lpu~}o-(5z9#W{qldn>F%GxQ!Q-;;wrPwU5fdKr|Q$;KhOfw&V;* zg5+-w%PO#tQdA`*C_)g)Vo(goK`{~tqTZ-3?>292NS(HoHVJT=(F(t$*}x%+aj)nv$A-5XF-a5LsirOOROy%-vWXp1XV>oJ!@+Ah4|FO z5L?258NiD5AM}u-GQRGy%_Y+UiWoVYKk2Ts*ksLefi9tNKr^WG`}#%|YcsWED*ScK zD@rKRJ`_G;WJpij!%#SI6-lH%nx!Za!*rUt%}>4sBuQ4~H1RN8-o;bXHGWA+iF6^< zeSjjwUqj1hY>Ru_0+K3)I{VAZ@EtpN6EfyB;S?6`!)Ix}a(xB>%RLZYv;J9g|C8asBZ;!jK8Fn!Lim%3?-T70PM z7x++@__V5u8G>y4LOs4Pa_Xk~LJk~Q0l~n1yG2DsXw#-m1ht}~0u>e(qRpE(llbY= zr_s7~>&UfPJgwFchca;5gLnx8E*ax)dAF z;M~cLH{OUcu;l{?3LM1oaS#&6uRIdZ%*@o%T@>5mvp}1aezMoqFah!axyWjLs59PY z^Nd*$Uxb0Lwbtl?FtW0;v^X3GgYk$uIHCd<%CSdPD2(E;K25WW&*r_7!XOtJf4w7s zup;Bug@W}1%F4>noH=vcl4zCrpiQ7{+%gApk&|5k_6O3+1`ZyQ4YxIa9UNRH2p^n) zTYBIdDQ1Q^aOKc}J-f@?wh723rTgZW@DW3}R1NIF+&K7l$jto55m@+vYi@cV7&s#U z0)Zb`d`!-Lj9k{^hCi!3DHYED{qN7oZFq@}f+eaTSf~RH`c$?=ddn8g_0*J;ZI6@+ zhb;)g>-Xdn5LgStxuc8K`2Io8U6s)uO&L3!gBnL4*%*U^!Ic;EY8F0C2!f%P7xav4 zZ6DgC!a00?yJ5|o2!ti@(ZAVPW7sXd(5~H$M3|6UdJG9y!6p?BTSL1~2b(8RxTVue zRClv9?-U%f658OdTcAmw9J_as+U3UX9jJEc(GS1b#ZNU}N`*r|qv!NoAY~fPgZyax zL>kpT%jX3>I2nYElhM0xZy=us)e3PCfclNTud#j(vf4sTsc@d0zYxLCE9V70&`)ad zt=phPKKSSYGA^f37^e|PY>ZmTLd?SC%WmC zr@_YClu(bA(8W(RDvh8(!gcP6j%u^Q;KT5GZ8b`$*Gi+;O0C!Qcwst?r}VYPSH^3l z(QBpFYkEBYPUB4~9JX>TU1{{Xek|{H!);2a-Ii(wye55eyjB{$R%*Sbm#jQfDx8+6 zgtAH_Oog|+({hzi%df3iNguw(GHm#;Cff-GC9*!Eq6WMR35ulA9UxY9Zi@8FJE7b2 z=Pz@;f1lDP$7?0DqOuwl;GNY|cxM%a?j2EBurS$E%&o=U!NYpA`J5pm{$> z>3#vNFEqd3D-pw~RvHtP?Itay!r?3AW~UKeTky4KFs9I5c#Da9t<>`MZSHuJ3dhY( zBdmedVZj(Vua#P(GMW>H?;nw($(l#GVZg4EN3Zs@D#I>4D>^MD9pob7@BLU@71mO! z`}L{^$VC>?{1;F|B&{h}_j;$%Yo)d++Q4oZAQ$=U`0Vl?MVouLHD(V40u^NkK8J~| zcGibhzzZexN>Umr-{2qpV!r}y!@}%_@j#=3T#`PYL%vz^@^9W8Go-u!dn?qFee2&)JlReqC{^jR>P=5OOyl$D9z8~H{ zUhF?$5dPYGrmpTmY%d?gHmyOd*~4XKt;JpVssbJT*8#Nooi`$tUzSIDT-*EENk4n? zZ*KUDJK08wcy%TeS1@qw(7x`qRTo?Qm$WGF$@m>QT~*h+-;nYyUAw!UTqQgc%2uxJ zG&S2AsSVpcP0d%M?H&TYMZAl Date: Mon, 17 Jul 2023 16:31:40 +0200 Subject: [PATCH 663/681] Optimize pandora_db iterations when possible --- pandora_server/util/pandora_db.pl | 85 +++++++++++++++---------------- 1 file changed, 40 insertions(+), 45 deletions(-) diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 671ac819fc..c3648d6fc6 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -761,56 +761,51 @@ sub pandora_checkdb_integrity { # Delete orphan data_inc reference records db_do ($dbh, 'DELETE FROM tagente_datos_inc WHERE id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_modulo)'); + # Delete orphan data from visual console. + log_message ('INTEGRITY', "Deleting orphan visual console items."); + db_do ($dbh, 'DELETE FROM tlayout_data WHERE id_agent NOT IN (SELECT id_agente FROM tagente)'); + db_do ($dbh, 'DELETE FROM tlayout_data WHERE id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_modulo)'); + # Delete orphan data form deleted agents. - my @agents_ids = get_db_rows ($dbh, 'SELECT id_agente, alias FROM tagente'); - my $agents_id = '0'; - foreach my $id (@agents_ids) { - $agents_id .= ','.$id->{'id_agente'}; + # Clearl orphan data from dashboards + log_message ('INTEGRITY', "Deleting orphan dahsboard items."); + my @agents_ids = get_db_rows($dbh, 'SELECT id_agente FROM tagente'); + my $where_condition; + foreach my $agent_id (@agents_ids) { + $where_condition .= 'options NOT LIKE ("%\\"agentid\\":\\"'.$agent_id->{'id_agente'}.'\\"%")'; + if($agent_id == $agents_ids[-1]) { + last; + } + $where_condition .= ' AND '; } - if(defined($agents_id) && $agents_id ne '0') { - # Delete orphan data from visual console. - log_message ('INTEGRITY', "Deleting orphan visual console items."); - db_do ($dbh, 'DELETE FROM tlayout_data WHERE id_agent NOT IN (?)', $agents_id); - db_do ($dbh, 'DELETE FROM tlayout_data WHERE id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_modulo)'); - # Clearl orphan data from dashboards - log_message ('INTEGRITY', "Deleting orphan dahsboard items."); - my $where_condition; - foreach my $agent_id (@agents_ids) { - $where_condition .= 'options NOT LIKE ("%\\"agentid\\":\\"'.$agent_id->{'id_agente'}.'\\"%")'; - if($agent_id == $agents_ids[-1]) { - last; - } - $where_condition .= ' AND '; - } + db_do ($dbh, 'UPDATE twidget_dashboard set options = NULL WHERE '.$where_condition); - db_do ($dbh, 'UPDATE twidget_dashboard set options = NULL WHERE '.$where_condition); - - $where_condition = ''; - my @modules = get_db_rows($dbh, 'SELECT id_agente_modulo FROM tagente_modulo'); - foreach my $id_agente_modulo (@modules) { - $where_condition .= 'options NOT LIKE ("%\\"moduleId\\":\\"'.$id_agente_modulo->{'id_agente_modulo'}.'\\"%")'; - if($id_agente_modulo == $modules[-1]) { - last; - } - $where_condition .= ' AND '; - } - - db_do ($dbh, 'UPDATE twidget_dashboard set options = NULL WHERE '.$where_condition); - - # Delete orphan data from favorite agents - log_message ('INTEGRITY', "Deleting orphan favories items."); - db_do ($dbh, 'DELETE FROM tfavmenu_user WHERE section = "Agents" AND id_element NOT IN (?)', $agents_id); - - # Delete orphan data from gis maps - log_message ('INTEGRITY', "Deleting orphan GIS data."); - db_do ($dbh, 'DELETE FROM tgis_data_history WHERE tagente_id_agente NOT IN (?)', $agents_id); - - # Delete orphan tnetwork maps data - log_message ('INTEGRITY', "Deleting orphan networkmaps data."); - db_do ($dbh, 'DELETE FROM titem WHERE source_data NOT IN (?)', $agents_id); - db_do ($dbh, 'DELETE FROM trel_item WHERE id_parent_source_data NOT IN (?) OR id_child_source_data NOT IN (?)', $agents_id, $agents_id); + $where_condition = ''; + my @modules = get_db_rows($dbh, 'SELECT id_agente_modulo FROM tagente_modulo'); + foreach my $id_agente_modulo (@modules) { + $where_condition .= 'options NOT LIKE ("%\\"moduleId\\":\\"'.$id_agente_modulo->{'id_agente_modulo'}.'\\"%")'; + if($id_agente_modulo == $modules[-1]) { + last; + } + $where_condition .= ' AND '; } + + db_do ($dbh, 'UPDATE twidget_dashboard set options = NULL WHERE '.$where_condition); + + # Delete orphan data from favorite agents + log_message ('INTEGRITY', "Deleting orphan favories items."); + db_do ($dbh, 'DELETE FROM tfavmenu_user WHERE section = "Agents" AND id_element NOT IN (SELECT id_agente FROM tagente)'); + + # Delete orphan data from gis maps + log_message ('INTEGRITY', "Deleting orphan GIS data."); + db_do ($dbh, 'DELETE FROM tgis_data_history WHERE tagente_id_agente NOT IN (SELECT id_agente FROM tagente)'); + + # Delete orphan tnetwork maps data + log_message ('INTEGRITY', "Deleting orphan networkmaps data."); + db_do ($dbh, 'DELETE FROM titem WHERE source_data NOT IN (SELECT id_agente FROM tagente)'); + db_do ($dbh, 'DELETE FROM trel_item WHERE id_parent_source_data NOT IN (SELECT id_agente FROM tagente) OR id_child_source_data NOT IN (SELECT id_agente FROM tagente)'); + # Check enterprise tables enterprise_hook ('pandora_checkdb_integrity_enterprise', [$conf, $dbh]); From 20e05f677efcb29495cab5a1702093766dde0166 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 18 Jul 2023 01:01:01 +0200 Subject: [PATCH 664/681] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index c3721c3481..25cc4317bc 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.772-230717 +Version: 7.0NG.772-230718 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 b75cd1605d..841e77f29d 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.772-230717" +pandora_version="7.0NG.772-230718" 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 7d08a232b1..2d7565e722 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.772'; -use constant AGENT_BUILD => '230717'; +use constant AGENT_BUILD => '230718'; # 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 c61554dc4a..7adf1af667 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.772 -%define release 230717 +%define release 230718 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index ee587b10f7..2fb3a3c47f 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.772 -%define release 230717 +%define release 230718 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 d0452d5783..476bcfff87 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230717" +PI_BUILD="230718" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 7095ffc51e..25d53728df 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230717} +{230718} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 465a673721..37b5d7b223 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.772 Build 230717") +#define PANDORA_VERSION ("7.0NG.772 Build 230718") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index b2cfbcf5a9..f0fb52d90c 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.772(Build 230717))" + VALUE "ProductVersion", "(7.0NG.772(Build 230718))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index db0060aaaa..93e195b067 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.772-230717 +Version: 7.0NG.772-230718 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 e83c4c4694..1dec27507e 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.772-230717" +pandora_version="7.0NG.772-230718" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index e63c15a5e5..b384fdf8d2 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC230717'; +$build_version = 'PC230718'; $pandora_version = 'v7.0NG.772'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index a816e04f11..2a21ae2c9c 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 3232fd8164..4b20e76d49 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.772 -%define release 230717 +%define release 230718 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index ef9a34adea..77d690bdfc 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.772 -%define release 230717 +%define release 230718 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 8fb43e076a..856ee2d2ce 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230717" +PI_BUILD="230718" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 2279752285..841b212aa5 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.772 Build 230717"; +my $version = "7.0NG.772 Build 230718"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 5387e4d150..ac754cac92 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.772 Build 230717"; +my $version = "7.0NG.772 Build 230718"; # save program name for logging my $progname = basename($0); From 5806da78dd58e9ed6302d593c4b5689ccd6328a2 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 18 Jul 2023 10:18:30 +0200 Subject: [PATCH 665/681] #11487 Fixed subgroups --- pandora_console/include/functions_graph.php | 23 +++++++++---------- .../agentes/pandora_networkmap.editor.php | 8 ++++++- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 116deea959..ddf68475c6 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -4983,19 +4983,18 @@ function graph_monitor_wheel($width=550, $height=600, $filter=false) $filter_module_group = (!empty($filter) && !empty($filter['module_group'])) ? $filter['module_group'] : false; if ($filter['group'] != 0) { - $filter_subgroups = ''; - if (!$filter['dont_show_subgroups']) { - $filter_subgroups = ' || parent IN ('.$filter['group'].')'; + if ($filter['dont_show_subgroups'] === false) { + $groups = groups_get_children($filter['group']); + $groups_ax = []; + foreach ($groups as $g) { + $groups_ax[$g['id_grupo']] = $g; + } + + $groups = $groups_ax; + } else { + $groups = groups_get_group_by_id($filter['group']); + $groups[$group['id_grupo']] = $group; } - - $groups = db_get_all_rows_sql('SELECT * FROM tgrupo where id_grupo IN ('.$filter['group'].') '.$filter_subgroups); - - $groups_ax = []; - foreach ($groups as $g) { - $groups_ax[$g['id_grupo']] = $g; - } - - $groups = $groups_ax; } else { $groups = users_get_groups(false, 'AR', false, true, (!empty($filter) && isset($filter['group']) ? $filter['group'] : null)); } diff --git a/pandora_console/operation/agentes/pandora_networkmap.editor.php b/pandora_console/operation/agentes/pandora_networkmap.editor.php index ac73c474aa..3dea327116 100644 --- a/pandora_console/operation/agentes/pandora_networkmap.editor.php +++ b/pandora_console/operation/agentes/pandora_networkmap.editor.php @@ -205,9 +205,15 @@ if ($edit_networkmap) { $button = []; if ($edit_networkmap === true) { + if (empty($method) === false && $method === 'radial_dinamic') { + $url = 'index.php?sec=network&sec2=operation/agentes/networkmap.dinamic&activeTab=radial_dynamic&id_networkmap='.$id; + } else { + $url = 'index.php?sec=network&sec2=operation/agentes/pandora_networkmap&tab=view&id_networkmap='.$id; + } + $button['map'] = [ 'active' => false, - 'text' => ''.html_print_image( + 'text' => ''.html_print_image( 'images/network@svg.svg', true, [ From e645f65e8e1be6aa41e722d60afb4c9cb8365ca0 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 19 Jul 2023 01:00:45 +0200 Subject: [PATCH 666/681] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 25cc4317bc..6e5a9ccc64 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.772-230718 +Version: 7.0NG.772-230719 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 841e77f29d..75850e3771 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.772-230718" +pandora_version="7.0NG.772-230719" 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 2d7565e722..37f16c658f 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.772'; -use constant AGENT_BUILD => '230718'; +use constant AGENT_BUILD => '230719'; # 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 7adf1af667..be1df542a1 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.772 -%define release 230718 +%define release 230719 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 2fb3a3c47f..1713a34f17 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.772 -%define release 230718 +%define release 230719 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 476bcfff87..90b464d570 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230718" +PI_BUILD="230719" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 25d53728df..a147da9939 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230718} +{230719} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 37b5d7b223..8172d41f25 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.772 Build 230718") +#define PANDORA_VERSION ("7.0NG.772 Build 230719") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index f0fb52d90c..3878d891d0 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.772(Build 230718))" + VALUE "ProductVersion", "(7.0NG.772(Build 230719))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 93e195b067..964bb752d0 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.772-230718 +Version: 7.0NG.772-230719 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 1dec27507e..5342ae5725 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.772-230718" +pandora_version="7.0NG.772-230719" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index b384fdf8d2..20d3363e68 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC230718'; +$build_version = 'PC230719'; $pandora_version = 'v7.0NG.772'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 2a21ae2c9c..e5ce174350 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 4b20e76d49..bbb62269cc 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.772 -%define release 230718 +%define release 230719 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 77d690bdfc..0e62343d30 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.772 -%define release 230718 +%define release 230719 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 856ee2d2ce..56562ff7ce 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230718" +PI_BUILD="230719" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 73e9ba3a8b..f75db8462f 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.772 Build 230718"; +my $version = "7.0NG.772 Build 230719"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index ac754cac92..6c5062c309 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.772 Build 230718"; +my $version = "7.0NG.772 Build 230719"; # save program name for logging my $progname = basename($0); From 018bfe12887de38a81c18961f0245a32955847ce Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Wed, 19 Jul 2023 10:36:30 +0200 Subject: [PATCH 667/681] #10696 fixed resize circular mesh --- pandora_console/include/functions_graph.php | 5 ++++- pandora_console/include/functions_netflow.php | 7 ++++++- pandora_console/include/graphs/functions_d3.php | 4 ++-- pandora_console/include/graphs/pandora.d3.js | 13 ++++++++----- .../include/lib/Dashboard/Widgets/netflow.php | 8 +++++++- pandora_console/include/styles/netflow_widget.css | 4 ++++ 6 files changed, 31 insertions(+), 10 deletions(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index d1702ef9d6..5be8dc1233 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -4618,7 +4618,10 @@ function graph_netflow_circular_mesh($data) include_once $config['homedir'].'/include/graphs/functions_d3.php'; - return d3_relationship_graph($data['elements'], $data['matrix'], 900, true); + $width = (empty($data['width']) === false) ? $data['width'] : 900; + $height = (empty($data['height']) === false) ? $data['height'] : 900; + + return d3_relationship_graph($data['elements'], $data['matrix'], $width, true, $height); } diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index 66e1ad1a9f..9d0c492971 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -1233,7 +1233,9 @@ function netflow_draw_item( $max_aggregates, $connection_name='', $output='HTML', - $address_resolution=false + $address_resolution=false, + $width_content=false, + $height_content=false ) { $aggregate = $filter['aggregate']; $interval = ($end_date - $start_date); @@ -1432,6 +1434,9 @@ function netflow_draw_item( netflow_aggregate_is_ip($aggregate) ); + $data_circular['width'] = $width_content; + $data_circular['height'] = $height_content; + $html = '
'; $html .= graph_netflow_circular_mesh($data_circular); $html .= '
'; diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php index acb675423a..baa957acc9 100644 --- a/pandora_console/include/graphs/functions_d3.php +++ b/pandora_console/include/graphs/functions_d3.php @@ -57,7 +57,7 @@ function include_javascript_d3($return=false) } -function d3_relationship_graph($elements, $matrix, $width=700, $return=false) +function d3_relationship_graph($elements, $matrix, $width=700, $return=false, $height=700) { global $config; @@ -72,7 +72,7 @@ function d3_relationship_graph($elements, $matrix, $width=700, $return=false) $output = '
'; $output .= include_javascript_d3(true); $output .= ""; if (!$return) { diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index 5c8b59013b..64313904bc 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -22,7 +22,7 @@ // matrix = [[0, 0, 2], // a[a => a, a => b, a => c] // [5, 0, 1], // b[b => a, b => b, b => c] // [2, 3, 0]]; // c[c => a, c => b, c => c] -function chordDiagram(recipient, elements, matrix, width) { +function chordDiagram(recipient, elements, matrix, width, height) { d3.chart = d3.chart || {}; d3.chart.chordWheel = function(options) { // Default values @@ -59,10 +59,13 @@ function chordDiagram(recipient, elements, matrix, width) { .enter() .append("svg:svg") .attr("width", width) - .attr("height", width) + .attr("height", height) .attr("class", "dependencyWheel") .append("g") - .attr("transform", "translate(" + width / 2 + "," + width / 2 + ")"); + .attr( + "transform", + "translate(" + width / 2 + "," + height / 2 + ") scale(1.2)" + ); var arc = d3.svg .arc() @@ -206,8 +209,8 @@ function chordDiagram(recipient, elements, matrix, width) { .on("mousemove", move_tooltip); function move_tooltip(d) { - x = d3.event.pageX + 10; - y = d3.event.pageY + 10; + x = d3.event.layerX + 10; + y = d3.event.layerY + 10; $("#tooltip").css("left", x + "px"); $("#tooltip").css("top", y + "px"); diff --git a/pandora_console/include/lib/Dashboard/Widgets/netflow.php b/pandora_console/include/lib/Dashboard/Widgets/netflow.php index 6af2e78bab..be603e452b 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/netflow.php +++ b/pandora_console/include/lib/Dashboard/Widgets/netflow.php @@ -339,6 +339,10 @@ class Netflow extends Widget $style .= ' width: 95%;'; } + if ($size['width'] > $size['height']) { + $size['width'] = $size['height']; + } + // Draw the netflow chart. $output .= html_print_div( [ @@ -353,7 +357,9 @@ class Netflow extends Widget $this->values['max_values'], '', 'HTML', - 0 + 0, + ($size['width'] - 50), + ($size['height'] - 20), ), ], true diff --git a/pandora_console/include/styles/netflow_widget.css b/pandora_console/include/styles/netflow_widget.css index 04b093c989..c7be7fe90d 100644 --- a/pandora_console/include/styles/netflow_widget.css +++ b/pandora_console/include/styles/netflow_widget.css @@ -7,3 +7,7 @@ #image_hide_show_labels { display: none !important; } + +.select2-search--dropdown .select2-search__field { + padding: 0px !important; +} From a9ae04cdc4edf1aa3bb3cef2ca7681bbd9f8c8bf Mon Sep 17 00:00:00 2001 From: Enrique Martin Date: Wed, 19 Jul 2023 10:46:10 +0200 Subject: [PATCH 668/681] Added systemd and sysvinit startup for pandora_agent_daemon --- pandora_agents/unix/pandora_agent_installer | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 90b464d570..df34f29400 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -541,8 +541,17 @@ install () { then echo "Define 'pandora_agent=\"YES\"' in /etc/rc.conf to enable the daemon." else - echo "Check your startup configuration to be sure Pandora FMS Agent is ready " - echo "to start automatically when system restarts": + # Enable startup service + if [ `command -v systemctl` ] + then + systemctl enable pandora_agent_daemon + elif [ `command -v chkconfig` ] + then + chkconfig pandora_agent_daemon on + else + echo "Check your startup configuration to be sure Pandora FMS Agent is ready " + echo "to start automatically when system restarts": + fi fi # Restore the daemon script From 1f722998e639f8bd146ab0e47ec236cd4495eb4d Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 20 Jul 2023 01:01:06 +0200 Subject: [PATCH 669/681] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 6e5a9ccc64..befff3be5c 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.772-230719 +Version: 7.0NG.772-230720 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 75850e3771..0f507262b8 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.772-230719" +pandora_version="7.0NG.772-230720" 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 37f16c658f..066c703237 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.772'; -use constant AGENT_BUILD => '230719'; +use constant AGENT_BUILD => '230720'; # 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 be1df542a1..b6b857863e 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.772 -%define release 230719 +%define release 230720 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 1713a34f17..7df3b5fca9 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.772 -%define release 230719 +%define release 230720 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 90b464d570..14939dc1e0 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230719" +PI_BUILD="230720" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index a147da9939..656dff5ec3 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230719} +{230720} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 8172d41f25..8cb58c7095 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.772 Build 230719") +#define PANDORA_VERSION ("7.0NG.772 Build 230720") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 3878d891d0..009659b454 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.772(Build 230719))" + VALUE "ProductVersion", "(7.0NG.772(Build 230720))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 964bb752d0..66c16b35b1 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.772-230719 +Version: 7.0NG.772-230720 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 5342ae5725..a2c66fff09 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.772-230719" +pandora_version="7.0NG.772-230720" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 20d3363e68..99d33b658e 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC230719'; +$build_version = 'PC230720'; $pandora_version = 'v7.0NG.772'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index e5ce174350..548f57b24b 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 bbb62269cc..a77349551b 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.772 -%define release 230719 +%define release 230720 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 0e62343d30..659b1dfcd1 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.772 -%define release 230719 +%define release 230720 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 56562ff7ce..84d3f238e1 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230719" +PI_BUILD="230720" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index f75db8462f..fbe7655596 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.772 Build 230719"; +my $version = "7.0NG.772 Build 230720"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 6c5062c309..79b4d5a020 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.772 Build 230719"; +my $version = "7.0NG.772 Build 230720"; # save program name for logging my $progname = basename($0); From 4d83071f1cd90da67da36adb5f4721d7326d38f4 Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 20 Jul 2023 11:02:02 +0000 Subject: [PATCH 670/681] Add new directory --- pandora_server/util/load/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pandora_server/util/load/.gitkeep diff --git a/pandora_server/util/load/.gitkeep b/pandora_server/util/load/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 From 8a66b41280f5de38552f5aed17f1fd32005b9f09 Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 20 Jul 2023 11:17:06 +0000 Subject: [PATCH 671/681] Upload New File --- .../util/load/create_usersandgroups.sh | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pandora_server/util/load/create_usersandgroups.sh diff --git a/pandora_server/util/load/create_usersandgroups.sh b/pandora_server/util/load/create_usersandgroups.sh new file mode 100644 index 0000000000..36534bbf0b --- /dev/null +++ b/pandora_server/util/load/create_usersandgroups.sh @@ -0,0 +1,51 @@ +#!/bin/bash +# (c) 2023 Pandora FMS, by Sancho Lerena +# This script is used to create a huge load of data +# It creates a group from each item in groupnames.txt +# It creates an user from each item in usernames.txt +# It gives an association to each user for a random group using a Read Only operator profile +# It moves each agent to a primary group, randomly from groupname.txt + +if [ ! -e usernames.txt ] +then + echo "Error, I cannot find usernames.txt" + exit +fi + +if [ ! -e groupnames.txt ] +then + echo "Error, I cannot find groupnames.txt" + exit +fi + +# Create users from usernames.txt +for a in `cat usernames.txt` +do + /usr/share/pandora_server/util/pandora_manage.pl /etc/pandora/pandora_server.conf --create_user $a $a 0 "Created by CLI" +done + + +# Create groups from groupnames.txt +for a in `cat groupnames.txt` +do + /usr/share/pandora_server/util/pandora_manage.pl /etc/pandora/pandora_server.conf --create_group $a +done + +# Associate a group to each user +TOTAL_GROUPS=`cat groupnames.txt | wc -l` +for username in `cat usernames.txt` +do + RAN=`echo $RANDOM % $TOTAL_GROUPS + 1 | bc` + GROUP_NAME=`cat groupnames.txt | tail -$RAN | head -1` + + /usr/share/pandora_server/util/pandora_manage.pl /etc/pandora/pandora_server.conf --add_profile $username "Operator (Read)" $GROUP_NAME +done + +# Move each agent to a random group +TOTAL_GROUPS=`cat groupnames.txt | wc -l` +for agentname in `/usr/share/pandora_server/util/pandora_manage.pl /etc/pandora/pandora_server.conf --get_agents | cut -f 2 -d ","` +do + RAN=`echo $RANDOM % $TOTAL_GROUPS + 1 | bc` + GROUP_NAME=`cat groupnames.txt | tail -$RAN | head -1` + /usr/share/pandora_server/util/pandora_manage.pl /etc/pandora/pandora_server.conf --update_agent $agentname group_name $GROUP_NAME +done From 86b91c48d74edcef6b4a42522de85e15f0f90aad Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 20 Jul 2023 11:17:30 +0000 Subject: [PATCH 672/681] Upload New File --- pandora_server/util/load/README.MD | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pandora_server/util/load/README.MD diff --git a/pandora_server/util/load/README.MD b/pandora_server/util/load/README.MD new file mode 100644 index 0000000000..d042cb1503 --- /dev/null +++ b/pandora_server/util/load/README.MD @@ -0,0 +1,36 @@ +### Purpose of this toolkit + +This directory contains configuration files and small scripts to generate an environment with simulated data for testing purposes. + +### Generation of XML files to simulate agent load + +There is a tool that comes configured with Pandora FMS to generate test data (pandora_xml_stress) and that generates XML. It has different options and in this directory is provided a configuration file and all the dictionaries and additional files to generate data of 300 agents, with pseudo-random names (like for example "7fb8a1a734c24cc22a5c75eb"). + +These agents are defined in the "pandora_xml_stress.agents" file. If you want less agents, you can delete elements in this file. + +To execute the XML generation manually from the code repository: + + cd pandorafms/pandora_server/util/load + perl ../pandora_xml_stress.pl pandora_xml_stress.conf + +This will generate 300 XML in the /var/spool/pandora/data_in directory. + +If you create a scheduled execution of this command every 5 minutes (e.g. through cron), keep in mind that if the PandoraFMS server stops, it could have hundreds of thousands of XML files pending to be processed. + +Create /etc/cron.d/pandora_stress with this content: + + */5 * * * * root + + +### Generation of groups and users + +The script 'create_usersandgroups.sh' will take a list of names from the file 'usernames.txt' and through CLI will create those users in the local Pandora FMS. + +On the other hand, it will also create a series of groups, taking as source the names of the file 'groupnames.txt'. It will associate to each user a group of the existing ones with the profile "Operator (Read"). + +Finally, it will take all the agents available in Pandora FMS and it will distribute them in an equal and random way among the available groups. + +You should only run it once: + + cd pandorafms/pandora_server/util/load + ./create_userandgroups.sh From 7f3a90df375e6a57ad5edd46f1b31f87424a6cb0 Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 20 Jul 2023 11:17:45 +0000 Subject: [PATCH 673/681] Upload New File --- pandora_server/util/load/groupnames.txt | 44 +++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pandora_server/util/load/groupnames.txt diff --git a/pandora_server/util/load/groupnames.txt b/pandora_server/util/load/groupnames.txt new file mode 100644 index 0000000000..86c1426a88 --- /dev/null +++ b/pandora_server/util/load/groupnames.txt @@ -0,0 +1,44 @@ +Ali +Alisha +Amado +Angeline +Arlen +Arline +Barbra +Beth +Bette +Bradly +Brenton +Candace +Candy +Carroll +Cecelia +Chance +Chang +Chase +Chasity +Tracey +Vincent +Ward +Wiley +Willie +Winnie +zurc +Grasstongue +Khung +Mudblood +Grosk +Grumblehammer +Snun +Emberfang +Zotvind +Stormfist +Knigbrur +Rockclaw +Skalbrusk +Rivergut +Vitrurk +Coldpelt +Doddosk +Fistbasher +Skikkin \ No newline at end of file From 6cb4709539c3f6fd180caa8ad933dfda19c0f499 Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 20 Jul 2023 11:18:03 +0000 Subject: [PATCH 674/681] Upload New File --- .../load/pandora_xml_stress_module_source.txt | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pandora_server/util/load/pandora_xml_stress_module_source.txt diff --git a/pandora_server/util/load/pandora_xml_stress_module_source.txt b/pandora_server/util/load/pandora_xml_stress_module_source.txt new file mode 100644 index 0000000000..aa442fdc93 --- /dev/null +++ b/pandora_server/util/load/pandora_xml_stress_module_source.txt @@ -0,0 +1,38 @@ +0 +1 +0 +1 +0 +1 +0 +1 +0 +1 +0 +1 +0 +1 +0 +1 +0 +1 +0 +1 +0 +1 +0 +1 +0 +1 +0 +1 +0 +1 +0 +1 +12 +13 +12 +14 +12 +14 \ No newline at end of file From 42f23e667b11db0f6238be15c9a0c109c7b9ea07 Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 20 Jul 2023 11:18:18 +0000 Subject: [PATCH 675/681] Upload New File --- .../util/load/pandora_xml_stress.agents | 300 ++++++++++++++++++ 1 file changed, 300 insertions(+) create mode 100644 pandora_server/util/load/pandora_xml_stress.agents diff --git a/pandora_server/util/load/pandora_xml_stress.agents b/pandora_server/util/load/pandora_xml_stress.agents new file mode 100644 index 0000000000..da718018e0 --- /dev/null +++ b/pandora_server/util/load/pandora_xml_stress.agents @@ -0,0 +1,300 @@ +bf78e4acf01eb3144b5f3cf5 +83c2b346af90edc2fa0de4e1 +602ef1ca527c0bb7d144bf0a +4012470edc77bc97f58b3f80 +9daa3ecee84ed039bcf2efdc +3dae00ce55f6985ac26a4402 +3a8ae8e8d417712166f6df48 +257f378d433124706d442bbb +fa2025fd2f64462a43d94fae +d17d6fd3720184cb5a7d199d +4d9977b96f3b4e006e47112a +6242411ed2d7f324b70c86d9 +92ed7a8b9e1e786172ca02e1 +50aca7828dabff6449740082 +e7c7487ef15715ee44cc7844 +0f0d005d0d9f31afcf979437 +51ced8d82e7e851d61b93670 +824a318186adb6603b4b804a +387f85fe94caf0ebdfd15d63 +65833ad4e353ad573a14ef21 +3a276db7e3af8aa95872946f +df6b8c060d9f385db4e53bd8 +8999734b6f54032df4465189 +bec95961964493dbca9cf544 +34957a75a1e362783e3de10f +64ab08385a39067b8161cb68 +689544d5ec6199304feec7d1 +e926306ca1a952827d788828 +4ed79bf195c8287c443c86d2 +5094261d922982b388137a1f +f90f364975c489b465092a04 +6fc797c7f3918310af9e9afa +1c2be64167c08109c69e1130 +fea477977db6ac0d8021637f +4939f84a23aff2a97b412ada +385a5f99e3970b52f92c5b9e +6176e5d648b335db3b79322e +bf4d03212ee1eeeaa53cac26 +b7d0acbc714b76095a523286 +e3eb2fc6f548bbc8f7ac2f0c +93c08fcfe26a5cc9be667bb7 +c6120aa7367523294dd8cb94 +07548491524ec76d96db5e26 +29bc64bd950f74b678d45e57 +8733dcfbb5d8832ee9319bc1 +16b9e5a78847d99ca636e90c +4c9a17935849675164a7460b +6c47aa0691ca8447bd7690d9 +b1ec5a21f332b3d3c5b7e35e +3a0ff6da7e9c3ed12a8f9246 +ac823076dc634e47c51d3d67 +a0f7d6d23d0f6ad87889fdb2 +093c29ab1ff212ac9139b821 +6b5fc978a68a98e5c39d8e86 +334af374b4dee25929244b1e +ffa507c102d330433ff15b9e +89b03af9ca3428e7877fc6f2 +f10d7455b7386248e3b65acc +07e37df13934913378ae9aa0 +6b261e22ae3882a928d7e0b5 +f96c558c07671ac8d52cec6c +6be22d5bb4b2ba0751551ca1 +706fbe25372d5779225e2651 +eedc80256ab4d68cd477bcbe +6e2e97c594245092c5f9fc3e +3aa4e556f361196dc7c6102a +091fd7bfa2b8b7bb81b20ea4 +9ad434c3e7796273d7d1d8b5 +9e8f16f56ff86d1161196430 +17a3b7ce50bcb52325126aeb +edf98dbbeb2a5cf4d3baf70c +8de575ca92807d1652a9fa73 +33faeb45a5a04e410056585d +a8437131fa7d2ccfa015caf2 +7b478c40169b6bd1bd3fef83 +77a17435ca19143c7c18a490 +56bf42c56c42fb5334da25af +f646df9f903178fcffada9b8 +a390ec6c1d641f44a5b76d9a +deed99c701a0f4f2eaa551a4 +15197674acb20c324923d247 +e2517b8b94207380fa110334 +d62a50e795be6bd07c1f44c9 +0fd5b2606cb0e7a25e8a1370 +4f57d5b32737f75aff5fe8ed +ebcfdb50f0f1a6d3c0c059dc +dab99715dfe459bb357335c0 +aac40b9a6c4a9984adb09b14 +18f06ba95abb048598e865ab +0eff987eb95e5a438c4c8018 +fb5c6d027180ab974b0b7675 +a8e2cdea5a3df0c42f11fc24 +3ffa5c21a78d67d7ae358099 +16f9280e03f99e432db79b84 +a8e28177ffb5aeda7f474fdf +134ed984989a755e3dae8233 +70d364db21c5e85073e5b17e +ce2196095062f09ae9569c54 +6965e3eb85c3431e22a3d199 +f76187d491c04c130cfa96d2 +3af29cc38e85351595f2a513 +d4dfbc5f347ff7985e8eb232 +add60e5dff9a33115b996a70 +8519bf76f1c1cb8da26e270d +cb117a019377c03839dbb667 +c56e9ea3c4d373cdc301b423 +4f6afb90cbeeaf09756f7283 +a80172931917bcb8647edc96 +4a6f07d5d075bef6bf794db1 +5a0bbd407c6e224084987e88 +a325a700c253294582cf2546 +28197bd3d8c6ff0747deaf3d +23719c710abf2d43dc0061b8 +19640261e5cde16ee8484f20 +247a72fa19ac7e52955b1ac6 +882cf1711c2c463eb4389b9a +b9434493637d85cd4ae05ce6 +eafb645f5aae3b3d45eac64c +4944420fba4c2ed3a5eebda9 +fa9f5d02a4e6e0a9c09b1a05 +3411890bc1237a086f5d4532 +f50c455cbd5fb84566f3c3d1 +b1b9783f6345b4732dc35887 +722d8ba0f5ebc313c98a8c82 +be2a4afbab53363815416730 +4440b997bd12750c15baac3c +72ae565db9ea0b4686eacf6b +88e70d097307fe10d46d922a +5fcdfcd43be6e235ee8ae140 +8ba16c7ec192e2d93d3826db +79d1c21a40baa3bae9d38c60 +28f4a1897afbc8db42ddb3bd +b96aebdee9a0aa681c41f951 +28e63e948e80ef9351de678c +c0d69c65c6544abb90b0be4e +212d9e6df8d1cf8aa7e51979 +abf8c4265b09990aeddc0101 +c0cf6680054f443d0eb50a26 +2ce89791ce40e902ae9f3507 +4ce8e01633c1affb78fc238e +b4f152dc64a3daa63fd0055f +a56c545d8c4817fc6836fc96 +e4e91209ac4a94f6f9e5eed2 +31f7373460d648f208b677a4 +20fe6b8dbaedc3e1f7c86908 +be67e5298c830c0bb582556f +63f5d1404aea4377779edf35 +b03831cce718125cb9612c07 +5465b26fd45d86b059066cc2 +5351de84d2fd638b138ba27b +6c63000157aed37fa8c0c022 +8d3c18c7fbe518694c6bdb22 +615ec092b6f63bb14a2bb42e +61de25cf8e12926c28aeffdc +2b96bc1c8f6f81a5437b61bf +ba1f4fcf3954e0efe5d68c83 +ee5bd3e1a937b90562677f1d +0cf18ae18b0c680d00cb4d2e +abf72b0d66f90bd6e67c43c6 +f263d033bb07e0b8cd405224 +418ddf02720649b40db2dd67 +01d1a735aa980326d385ea65 +0cc3860bb0a3fd5822b25ea4 +b0b89dbebfab05fafd6cf9dd +2fcbb999444db5c0c77c2ec2 +f49a97b3531b8ab8d487c7a7 +ffb66d5003620e2fa47ef8ea +04da742ab6c99b5c44f9f0cc +dc310a9d42d7c367671ffbf9 +b0f5c4ee8d327449ef2103e6 +5bd2ce604ed7c820169f0ac2 +57f874a6e41baa5a1196b15f +b43142736205ad1011f4a5a6 +50cf8523e5090251516eecb0 +ebad61d47be209696f9d41aa +66bc5976a98266560d1867ff +3c37fc452e9ad36cd7adcb1a +4ac8c3db63a69ce883f3fcf5 +6c89e2bb90b9ab95f4adde3c +917de5ece0a5ef663a8f44e7 +b50eba76cf29aca3cf696d7e +74264c913ac1e141db78708a +2b6c93011f62cffb5c085886 +700617c377952010272b9522 +dac10c8ddf7c45e55d8028af +053328a6ff4f2773eebe76fe +2d7390260285c272688ae1e8 +fa30c9ee6fb1e2f00d7ccb77 +0ca6db378a05246f30c8b820 +9ad6f959de166cc1475040ea +23b4702f4dfb350085e77482 +4198a8ab80780c5d9b0d82d5 +baebd530dfc47ac77ea42d2a +636d2ab4e018b5542e429f5e +40ae44193af360eea68b6f0b +dd47b39e494a62a4f5b6bef8 +240339c9dcd159595c1edbf3 +0f11840efe364ca6bbb17f43 +8522e203fb4b53e2bd6d6f82 +f134d9b501fa40b17993beee +d0483306f2f972aacfb4fcea +926ee4e0a80455cfee517f8b +c188a327bc66df4878cb3e8b +c874083c1d932bb4ade6d028 +be2271d8da327f97e05c1c60 +9ca7451d3f261682ec717547 +9eb46e2a5fd072c5267d7432 +41e8f3f7733f87e16b773bad +f642220cd19f84154e4dd972 +fe3d9f6433883332b464b7ca +3e9648ccf60b1fa712ea8590 +b7da7292e9418889bc957bd7 +fb4a392d386eca19eec9215e +34188e4a6590877b2dbb67b0 +e233cb364659dea13dee1fd8 +757b8330465df34879414b7d +5e0f80102fee69d0742934b2 +d72124afc78e9b3f91550497 +21c77bfe67c6e99f73323f42 +afa8ce345db6300882858f93 +886cc8b32ed80f4c69edb990 +64ea275ce73ef4070cefca19 +c676f1ffe5bdce4e1d3643ed +baca61ab59568605e3ec8899 +1610892c53a071ed02d20c75 +3321fb7111d74e532932d262 +29583747ac9fbf0bf21c1574 +f51210b47a6e847dcfb52f94 +63c95735ba96c65d2d45b23d +679c4e3acb15ebec6ecc7529 +42da0760b02d50c6587a8c31 +e42de775dcfcc3c950c1cff5 +ae5791cf265badebd39c78d9 +f66c123309525eeb81b47e92 +7cddc2b9ed6b4df83c72fcbe +e69cc74632fdaa06f76f708a +7cfd19c2eeaef2c0537332be +d27cdcea69f4e49fbae06f4d +bdfaa2ec52319f0e6533e826 +d59452cdfce11e21682a791f +cbb74f2d35d54557abdbc2da +369a4e6f128475bc9f87ef42 +90bf992a98d0b768cbc50520 +1fea663421dae7b418b9b15f +f9fc5505565c43cebc1545f9 +d02a8f77fbb2b7f384a99949 +279ff35e17c7f6b6a043fde7 +9cf7725d3a97d9aa9e529ce6 +1f465b328b349502c0953b2d +283fad60fa48ea2075a0e516 +ef5d9e841a02665c54d8fa7f +b6023425cb4a1503726b3135 +7fb8a1a734c24cc22a5c75eb +da38d78e83c9288e4cd60cca +2a928a6498ae8e0b29675c25 +d2194ab5b0e48c2c1f213860 +53acafcd86a61ce55688ebef +65608eeebc7d9fe2912635ed +fafb0273e3b04deb1edb2628 +baf07d1f28416da065b6771f +c2ee8e58209102fdd0bb341c +f8e92e00670f65c29c4617c9 +a83661705134029ae344176d +fc02c24e172d12a29b17eede +2632f143ffe3f64e63e4ba32 +847120de4b72f59263d160f1 +5be36ff5b668eb93823974b2 +cdd8fe5081225519b5fc28af +53569cbaedb9265839290a6c +decca89ea0e8944fd93fcd24 +4b10511d840b7f5129ed6190 +5c4a1904de5f90f4d5dd749a +49c47514c3308df82fcd6b79 +15af3e182c00000eea12f8e5 +a9645c4a43ad211d9ae9a406 +dcffa4e5eee8f966b1edcdaf +75b25f796f1e392f45c3a737 +0ad5f0b96946ebcabd0457e9 +2f9128177cab74e0bad61189 +49ed14b81e0a166ccf335b4a +dfe100788326c45dfb84579c +2616f38caef9decae47e5023 +99b2d0eb14ac19d1cfedd86e +fb1d4c42ea70fad330b5c5ee +b6c560867faa3b41b1f5d4fa +1167fb22e86098ef684eb702 +a2e2c2ee8ec87d4e5d59eb22 +b228beac094e16a0fa3cb528 +ea0de9aad68deed0a4df3e71 +e50cb420497d928ef9827800 +3bb39890ca4a6da941e01782 +73391f2914465c3f2335e24a +f8b2f512cc0cbc024e2cd377 +4f816b0d36c934b44dbd5bc0 +817edf1e2637fef229752a5f +4466f97959df7247f7410fbe +cc85c727080e9d6eb75ef513 +7e27f012167ed8bedc4bd635 +98a445ff41a81a0a752aff25 +3b339e213dd613c4efd878c1 \ No newline at end of file From eb70d6502718efcab4f27aa88cee70bb83adc9be Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 20 Jul 2023 11:18:32 +0000 Subject: [PATCH 676/681] Upload New File --- .../util/load/pandora_xml_stress.conf | 200 ++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 pandora_server/util/load/pandora_xml_stress.conf diff --git a/pandora_server/util/load/pandora_xml_stress.conf b/pandora_server/util/load/pandora_xml_stress.conf new file mode 100644 index 0000000000..0dd2894e6a --- /dev/null +++ b/pandora_server/util/load/pandora_xml_stress.conf @@ -0,0 +1,200 @@ +# Sample configuration file for pandora_xmlstress +# (c) 2012, http://pandorafms.org +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Maximum number of threads, by default 5 +max_threads 4 + +# File containing a list of agent names (one per line). +agent_file pandora_xml_stress.agents + +# Directory where XML data files will be placed, by default /tmp. +# When sending files to a local Tentacle server make sure this directory +# and Pandora FMS Server's incomingdir are different. +temporal /tmp + +# Pandora FMS XML Stress log file, logs to stdout by default. +log_file pandora_xml_stress.log + +# XML version, by default 1.0. +xml_version 1.0 + +# XML encoding, by default UTF-8. +encoding UTF-8 + +# Operating system (shared by all agents), by default Linux. +os_name Linux + +# Operating system version (shared by all agents), by default 2.6. +os_version 2.6 + +# Agent group, by default Servers. +#group Servers + +# Agent interval, by default 300. +agent_interval 300 + +# Data file generation start date, by default now. +#time_from 2023-03-01 00:00:00 + +# Data file generation end date, by default now. +#time_to 2023-03-02 00:00:00 + +# Get conf from Pandora Server +get_and_send_agent_conf 0 + +# The directory to store the files conf agent (not in the server). +# directory_confs . + +# The directory to generate the next files conf agent for to send. +#directory_temp /tmp + +# Delay after generating the first data file for each agent to avoid +# race conditions when auto-creating the agent, by default 2. +startup_delay 0 + +# Timezone offset: Difference with the server timezone +timezone_offset 0 + +# Timezone offset range (to set a randomnuber of hours of difference with the +# server so timezone_offset can go from timezone_offset-timezone_offset_range +# to timezone_offset+timezone_offset_range +timezone_offset_range 0 + +# Agent position paramters +# Those parameters define the center and the zone where the agents will be +# randomly located. +# The base parameters define the central point of the sistem and the radius +# defines how far from that point the agents will be placed in any direction + +# Base latitude reference for all agents +latitude_base 40.42056 +# Base longitude reference for all agents +longitude_base -3.708187 +# Base altitude reference for all agents +altitude_base 0 +# This amount divided by 100 defines how far from each reference coordinate +# the agents will go +position_radius 10 + +# Address of the Tentacle server where XML files will be sent (optional). +server_ip 127.0.0.1 + +# Local copy XML files, by default 0 +local_copy 1 + +# Local dir for to copy XML files in local send method, by defaul /var/spool/pandora/data_in +local_dir /var/spool/pandora/data_in + +# Port of the Tentacle server, by default 41121. +# server_port 41121 + +# Module definitions. Similar to pandora_agent.conf. + +module_begin +module_name Connections opened +module_type generic_data +module_description Network connections used in this machine +module_exec type=RANDOM;variation=20;min=50;max=500 +module_unit conns +module_min_critical 450 +module_min_warning 400 +module_attenuation 0.33 +module_attenuation_wdays 0 6 +module_end + +module_begin +module_name Dropped Bits of nothing +module_type generic_data +module_description Simulation of big number with absolute nosense, real like life itself. +module_exec type=RANDOM;variation=5;min=-5000;max=500000000 +module_unit gamusins +module_end + +module_begin +module_name Network Traffic (Incoming) +module_type generic_data +module_description Network throughtput for incoming data +module_exec type=RANDOM;variation=50;min=0;max=1000000 +module_unit kbit/sec +module_min_critical 900000 +module_attenuation 0.5 +module_attenuation_wdays 0 6 +module_end + +module_begin +module_name Network Traffic (Outgoing) +module_type generic_data +module_description Network throughtput for Outgoing data +module_exec type=RANDOM;variation=50;min=0;max=1000000 +module_unit kbit/sec +module_min_critical 900000 +module_attenuation 0.1 +module_attenuation_wdays 0 6 +module_end + +module_begin +module_name Server Status A +module_type generic_proc +module_description Status of my super-important daemon / service / process +module_exec type=RANDOM;variation=1;min=0;max=500 +module_end + +module_begin +module_name Server Status B +module_type generic_proc +module_description Status of my super-important daemon / service / process +module_exec type=RANDOM;variation=1;min=0;max=300 +module_end + +module_begin +module_name Server Status C +module_type generic_proc +module_description Status of my super-important daemon / service / process +module_exec type=RANDOM;variation=1;min=0;max=1000 +module_end + +module_begin +module_name CPU Usage +module_type generic_data +module_description % of CPU usage in this machine +module_unit % +module_exec type=SCATTER;prob=5;avg=10;min=0;max=80 +module_min_critical 90 +module_min_warning 60 +module_end + +module_begin +module_name Disk_Free +module_type generic_data +module_description Disk space available in MB. +module_unit MB +module_exec type=CURVE;min=20;max=80;time_wave_length=3600;time_offset=0 +module_min_critical 0 +module_max_critical 10 +module_max_warning 20 +module_min_warning 10 +module_end + +module_begin +module_name Memory_free +module_type generic_data +module_unit MB +module_exec type=CURVE;min=5;max=8000;time_wave_length=360000;time_offset=0 +module_min_critical 0 +module_max_critical 50 +module_end + +module_begin +module_name System Log File +module_type generic_data_string +module_description Messages from the system in logfile format +module_exec type=RANDOM;variation=60;min=40;max=40 +module_end + +module_begin +module_name Module source +module_type generic_data +module_description Module data generated from source +module_exec type=SOURCE;src=pandora_xml_stress_module_source.txt +module_end \ No newline at end of file From a1dcd52631ac9f21c5c43c35c985ef76c34ede1a Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 20 Jul 2023 11:18:45 +0000 Subject: [PATCH 677/681] Upload New File --- pandora_server/util/load/usernames.txt | 34 ++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pandora_server/util/load/usernames.txt diff --git a/pandora_server/util/load/usernames.txt b/pandora_server/util/load/usernames.txt new file mode 100644 index 0000000000..c1709cf5ae --- /dev/null +++ b/pandora_server/util/load/usernames.txt @@ -0,0 +1,34 @@ +Martyna +Niklas +Murugan +Martin +Celeste +Agi +Yeshua +Lemminkainen +Xabier +Dominga +Moric +Gernot +Nia +Gurpreet +Khristofor +Ndubuisi +Kleopatra +Voestaae +Melba +Manish +Tóki +Pio +Jeong +Helena +Plácido +Djehutimesu +Tauno +Iordanus +Ragnar +Lucinde +Kailash +Artemio +Victorina +Sakine \ No newline at end of file From 6da7520dd15d66e07073ae067027c091e315e970 Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 21 Jul 2023 01:00:53 +0200 Subject: [PATCH 678/681] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index befff3be5c..d8cce649f8 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.772-230720 +Version: 7.0NG.772-230721 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 0f507262b8..1be2913ab7 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.772-230720" +pandora_version="7.0NG.772-230721" 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 066c703237..7e707482c6 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.772'; -use constant AGENT_BUILD => '230720'; +use constant AGENT_BUILD => '230721'; # 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 b6b857863e..944f3b80eb 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.772 -%define release 230720 +%define release 230721 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 7df3b5fca9..6c96bf9e2a 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.772 -%define release 230720 +%define release 230721 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 7ad2b9f219..fe18ba285c 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230720" +PI_BUILD="230721" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 656dff5ec3..de76a216ed 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230720} +{230721} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 8cb58c7095..1616463a5a 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.772 Build 230720") +#define PANDORA_VERSION ("7.0NG.772 Build 230721") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 009659b454..319833dcb9 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.772(Build 230720))" + VALUE "ProductVersion", "(7.0NG.772(Build 230721))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 66c16b35b1..6275863643 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.772-230720 +Version: 7.0NG.772-230721 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 a2c66fff09..03a59890a7 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.772-230720" +pandora_version="7.0NG.772-230721" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 99d33b658e..d3bf8bfe91 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC230720'; +$build_version = 'PC230721'; $pandora_version = 'v7.0NG.772'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 548f57b24b..5d42d4b911 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 a77349551b..def75f2c46 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.772 -%define release 230720 +%define release 230721 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 659b1dfcd1..3c67baac48 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.772 -%define release 230720 +%define release 230721 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 84d3f238e1..68310cf659 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230720" +PI_BUILD="230721" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index fbe7655596..098c3f8134 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.772 Build 230720"; +my $version = "7.0NG.772 Build 230721"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 79b4d5a020..8a295763c1 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.772 Build 230720"; +my $version = "7.0NG.772 Build 230721"; # save program name for logging my $progname = basename($0); From 13552e74f10a0273ccb268c7336858d4d047b30e Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 22 Jul 2023 01:00:52 +0200 Subject: [PATCH 679/681] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index d8cce649f8..45f24638bc 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.772-230721 +Version: 7.0NG.772-230722 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 1be2913ab7..c803c6ce75 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.772-230721" +pandora_version="7.0NG.772-230722" 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 7e707482c6..428a33337f 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.772'; -use constant AGENT_BUILD => '230721'; +use constant AGENT_BUILD => '230722'; # 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 944f3b80eb..31824de0aa 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.772 -%define release 230721 +%define release 230722 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 6c96bf9e2a..edb93d17fe 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.772 -%define release 230721 +%define release 230722 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 fe18ba285c..c4999037e7 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230721" +PI_BUILD="230722" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index de76a216ed..b5769316b0 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230721} +{230722} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 1616463a5a..7c4b6ad51d 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.772 Build 230721") +#define PANDORA_VERSION ("7.0NG.772 Build 230722") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 319833dcb9..70d875a9c0 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.772(Build 230721))" + VALUE "ProductVersion", "(7.0NG.772(Build 230722))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 6275863643..a6aaa0d368 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.772-230721 +Version: 7.0NG.772-230722 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 03a59890a7..7ece2ac5f0 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.772-230721" +pandora_version="7.0NG.772-230722" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index d3bf8bfe91..56bec96c69 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC230721'; +$build_version = 'PC230722'; $pandora_version = 'v7.0NG.772'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 5d42d4b911..ebcfd30c2c 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 def75f2c46..bb0aafc081 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.772 -%define release 230721 +%define release 230722 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 3c67baac48..a31ebf7948 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.772 -%define release 230721 +%define release 230722 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 68310cf659..aa89d789e0 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230721" +PI_BUILD="230722" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 098c3f8134..13b4d2f0d9 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.772 Build 230721"; +my $version = "7.0NG.772 Build 230722"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 8a295763c1..6dd53a8ee6 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.772 Build 230721"; +my $version = "7.0NG.772 Build 230722"; # save program name for logging my $progname = basename($0); From 3e6f88e812d9c4f589fef27c6f05f3bc5c84d03c Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 23 Jul 2023 01:00:51 +0200 Subject: [PATCH 680/681] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 45f24638bc..bbba255bab 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.772-230722 +Version: 7.0NG.772-230723 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 c803c6ce75..a5f526297e 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.772-230722" +pandora_version="7.0NG.772-230723" 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 428a33337f..100b2b859c 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.772'; -use constant AGENT_BUILD => '230722'; +use constant AGENT_BUILD => '230723'; # 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 31824de0aa..99c1b847e1 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.772 -%define release 230722 +%define release 230723 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index edb93d17fe..2f5ae5fba9 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.772 -%define release 230722 +%define release 230723 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 c4999037e7..65c526a5d4 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230722" +PI_BUILD="230723" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index b5769316b0..97afef570a 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230722} +{230723} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 7c4b6ad51d..78cd04ff84 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.772 Build 230722") +#define PANDORA_VERSION ("7.0NG.772 Build 230723") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 70d875a9c0..fda2c028d5 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.772(Build 230722))" + VALUE "ProductVersion", "(7.0NG.772(Build 230723))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index a6aaa0d368..4562cb3e95 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.772-230722 +Version: 7.0NG.772-230723 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 7ece2ac5f0..2bc2f3ab4d 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.772-230722" +pandora_version="7.0NG.772-230723" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 56bec96c69..13b19da488 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC230722'; +$build_version = 'PC230723'; $pandora_version = 'v7.0NG.772'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index ebcfd30c2c..eacac65142 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 bb0aafc081..6a1613e349 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.772 -%define release 230722 +%define release 230723 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index a31ebf7948..a8fba05acb 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.772 -%define release 230722 +%define release 230723 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index aa89d789e0..2607fab007 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230722" +PI_BUILD="230723" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 13b4d2f0d9..72028a47a9 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.772 Build 230722"; +my $version = "7.0NG.772 Build 230723"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 6dd53a8ee6..f123132979 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.772 Build 230722"; +my $version = "7.0NG.772 Build 230723"; # save program name for logging my $progname = basename($0); From c57fb14bc26f35f07f9bbfd1892462e622b8f126 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 24 Jul 2023 01:00:48 +0200 Subject: [PATCH 681/681] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index bbba255bab..2aa960e9e7 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.772-230723 +Version: 7.0NG.772-230724 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 a5f526297e..f79387b3d0 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.772-230723" +pandora_version="7.0NG.772-230724" 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 100b2b859c..e149a0a0f5 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.772'; -use constant AGENT_BUILD => '230723'; +use constant AGENT_BUILD => '230724'; # 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 99c1b847e1..7fab994392 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.772 -%define release 230723 +%define release 230724 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 2f5ae5fba9..c042b957e3 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.772 -%define release 230723 +%define release 230724 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 65c526a5d4..cc3d79d2fd 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230723" +PI_BUILD="230724" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 97afef570a..dee4dd1e49 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230723} +{230724} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 78cd04ff84..8a91448bf0 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.772 Build 230723") +#define PANDORA_VERSION ("7.0NG.772 Build 230724") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index fda2c028d5..629c349733 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.772(Build 230723))" + VALUE "ProductVersion", "(7.0NG.772(Build 230724))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 4562cb3e95..f8361ed03d 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.772-230723 +Version: 7.0NG.772-230724 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 2bc2f3ab4d..33216ccf44 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.772-230723" +pandora_version="7.0NG.772-230724" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 13b19da488..2f00645f00 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC230723'; +$build_version = 'PC230724'; $pandora_version = 'v7.0NG.772'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index eacac65142..5a934350c7 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 6a1613e349..876784ad7f 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.772 -%define release 230723 +%define release 230724 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index a8fba05acb..3698a44a03 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.772 -%define release 230723 +%define release 230724 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 2607fab007..da59fdd8ff 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230723" +PI_BUILD="230724" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 72028a47a9..2ef1276890 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.772 Build 230723"; +my $version = "7.0NG.772 Build 230724"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index f123132979..91f3cb2327 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.772 Build 230723"; +my $version = "7.0NG.772 Build 230724"; # save program name for logging my $progname = basename($0);