From c9779ef0a8dd49e67830247ca3ab6dbcb7f75a94 Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Thu, 18 Jul 2019 18:21:20 +0200 Subject: [PATCH 1/5] fixed pandora manage disable agent software --- pandora_server/util/pandora_manage.pl | 60 ++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 2 deletions(-) mode change 100644 => 100755 pandora_server/util/pandora_manage.pl diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl old mode 100644 new mode 100755 index 081815dc87..4bb14f9c11 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -306,10 +306,66 @@ sub pandora_enable_group ($$$) { my ($conf, $dbh, $group) = @_; if ($group == 0){ - db_do ($dbh, "UPDATE tagente SET disabled = 0"); + # Extraigo todos los nombres de los agentes de pandora si es para all = 0 + # my @agents = get_db_rows ($dbh, 'SELECT nombre FROM tagente'); + + my @agents = glob($conf->{incomingdir}.'/conf/*'); + + #my %remote_agents = map { + # if ( $_ =~ /.*\/(.*?)\.conf$/) { + # $1 => 1 + # } else { + # undef + # } + #} @agents; + + use Data::Dumper; + + foreach my $route_agent (@agents) { + print Dumper('++++++++++++++++++++++++++++++++++++++++++++++++++++++'); + # Leo el conf de cada agente + #my $conf_txt = enterprise_hook('read_agent_conf_file',[$conf, $remote_agent]); + + #my $agent_conf_file = $pa_config->{incomingdir}.'/conf/'.md5(encode_utf8(safe_output($remote_agent))).'.conf'; + + # If the module is not local, do nothing + if(!defined($route_agent) || !(-f $route_agent)){ + next; + } + + if ($route_agent =~ /.srv./) { + next; + } + + my $conf_file_txt = read_file($route_agent); + if(!$conf_file_txt) { + next; + } + + my $validate_conf = enterprise_hook('validate_readed_conf_file',[$conf_file_txt]); + print Dumper($validate_conf); + if (!$validate_conf) { + next; + } + + print Dumper($conf_file_txt); + + print Dumper('-----------------------------------------------------------'); + + # # De los agentes que existan + # # checheo el campo disabled se lo pongo a 0 con expresion regular imagino + # my $content = $conf_txt + + # # Escribo el conf + # write_agent_conf_file($pa_config, $agent_name, $content); + } + + # actualizo la bbdd + db_do ($dbh, "UPDATE tagente SET disabled = 0"); } else { - db_do ($dbh, "UPDATE tagente SET disabled = 0 WHERE id_grupo = $group"); + # my @remote_agents = get_db_rows ($dbh, 'SELECT nombre FROM tagente WHERE id_grupo = ?', $group); + db_do ($dbh, "UPDATE tagente SET disabled = 0 WHERE id_grupo = $group"); } exit; } From 6e68b8dc5ecdceb4c4e2f01da6f4d65b1a784a06 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 24 Jul 2019 00:01:09 +0200 Subject: [PATCH 2/5] 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 5be35552f1..1d5c5058cc 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.736-190723 +Version: 7.0NG.736-190724 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 eef4bfae8e..48385a769d 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.736-190723" +pandora_version="7.0NG.736-190724" 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 ce41062e20..ca12bd66a9 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.736'; -use constant AGENT_BUILD => '190723'; +use constant AGENT_BUILD => '190724'; # 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 75145a8afd..abc7943c66 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.736 -%define release 190723 +%define release 190724 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 7f80fcdc45..1c2d7b3759 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.736 -%define release 190723 +%define release 190724 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 1d5aeb23a7..3d0f4de1a6 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.736" -PI_BUILD="190723" +PI_BUILD="190724" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 3ab08b03cc..6ea94544cc 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190723} +{190724} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 09c8d35648..0a5165bac6 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.736(Build 190723)") +#define PANDORA_VERSION ("7.0NG.736(Build 190724)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index f579c11cfd..728e20d24d 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.736(Build 190723))" + VALUE "ProductVersion", "(7.0NG.736(Build 190724))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 1b555bb37d..91a594a97f 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.736-190723 +Version: 7.0NG.736-190724 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 387441d8a6..7c46037209 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.736-190723" +pandora_version="7.0NG.736-190724" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 30e0681db7..9fc521ab78 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 = 'PC190723'; +$build_version = 'PC190724'; $pandora_version = 'v7.0NG.736'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 5f346771e1..74b0a65b4d 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index f9e645b478..809a519fc3 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.736 -%define release 190723 +%define release 190724 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 9df530cac2..5547027379 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.736 -%define release 190723 +%define release 190724 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index a7311a8f48..e74ff8d51a 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.736" -PI_BUILD="190723" +PI_BUILD="190724" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index f0fe65093e..4e2bafcec9 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.736 PS190723"; +my $version = "7.0NG.736 PS190724"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 1fbaef31a8..2091f2c584 100644 --- 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.736 PS190723"; +my $version = "7.0NG.736 PS190724"; # save program name for logging my $progname = basename($0); From ca19e25f74fef275fc8052f36b1ebc648fe6ab68 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 24 Jul 2019 16:00:25 +0200 Subject: [PATCH 3/5] SQL Query modified for solve duplicate events issue --- pandora_console/include/functions_events.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index c8ad0a5d78..4c57dfd4b0 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -1210,12 +1210,12 @@ function events_get_all( $server_join = ''; if (is_metaconsole()) { - $server_join = ' LEFT JOIN tmetaconsole_setup ts - ON ts.id = te.server_id'; + $server_join = ' INNER JOIN tmetaconsole_setup ts + ON ts.id = te.server_id AND ts.server_name = ta.server_name'; if (!empty($filter['server_id'])) { $server_join = sprintf( - ' LEFT JOIN tmetaconsole_setup ts - ON ts.id = te.server_id AND ts.id= %d', + ' INNER JOIN tmetaconsole_setup ts + ON ts.id = te.server_id AND ts.server_name = ta.server_name AND ts.id= %d', $filter['server_id'] ); } From 94553df28fcf81e9d2c5b3f6594db6bdc0ef3b70 Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Wed, 24 Jul 2019 16:58:31 +0200 Subject: [PATCH 4/5] Fixed write in conf agent from CLI --- pandora_server/util/pandora_manage.pl | 159 ++++++++++++++++---------- 1 file changed, 100 insertions(+), 59 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 4bb14f9c11..305da9d0a1 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -284,19 +284,94 @@ sub api_call($$$;$$$$) { return $content; } + +############################################################################### +# Update token conf file agent +############################################################################### +sub update_conf_txt ($$$$) { + my ($conf, $agent_name, $token, $value) = @_; + + # Read the conf of each agent. + my $conf_file_txt = enterprise_hook( + 'read_agent_conf_file', + [ + $conf, + $agent_name + ] + ); + + # Check if there is agent conf. + if(!$conf_file_txt){ + return 0; + } + + my $updated = 0; + my $txt_content = ""; + + my @lines = split /\n/, $conf_file_txt; + + foreach my $line (@lines) { + if ($line =~ /^\s*$token\s/ || $line =~ /^#$token\s/ || $line =~ /^#\s$token\s/) { + $txt_content .= $token.' '.$value."\n"; + $updated = 1; + } else { + $txt_content .= $line."\n"; + } + } + + if ($updated == 0) { + $txt_content .= "\n$token $value\n"; + } + + # Write the conf. + my $result = enterprise_hook( + 'write_agent_conf_file', + [ + $conf, + $agent_name, + $txt_content + ] + ); + + return $result; +} + + ############################################################################### # Disable a entire group ############################################################################### sub pandora_disable_group ($$$) { my ($conf, $dbh, $group) = @_; + my @agents_bd = []; + my $result = 0; + if ($group == 0){ + # Extract all the names of the pandora agents if it is for all = 0. + @agents_bd = get_db_rows ($dbh, 'SELECT nombre FROM tagente'); + + # Update bbdd. db_do ($dbh, "UPDATE tagente SET disabled = 1"); } else { + # Extract all the names of the pandora agents if it is for group. + @agents_bd = get_db_rows ($dbh, 'SELECT nombre FROM tagente WHERE id_grupo = ?', $group); + + # Update bbdd. db_do ($dbh, "UPDATE tagente SET disabled = 1 WHERE id_grupo = $group"); } - exit; + + foreach my $name_agent (@agents_bd) { + # Check the standby field I put it to 0. + my $new_conf = update_conf_txt( + $conf, + $name_agent->{'nombre'}, + 'standby', + '1' + ); + } + + return $result; } ############################################################################### @@ -305,69 +380,35 @@ sub pandora_disable_group ($$$) { sub pandora_enable_group ($$$) { my ($conf, $dbh, $group) = @_; + my @agents_bd = []; + my $result = 0; + if ($group == 0){ - # Extraigo todos los nombres de los agentes de pandora si es para all = 0 - # my @agents = get_db_rows ($dbh, 'SELECT nombre FROM tagente'); + # Extract all the names of the pandora agents if it is for all = 0. + @agents_bd = get_db_rows ($dbh, 'SELECT nombre FROM tagente'); - my @agents = glob($conf->{incomingdir}.'/conf/*'); - - #my %remote_agents = map { - # if ( $_ =~ /.*\/(.*?)\.conf$/) { - # $1 => 1 - # } else { - # undef - # } - #} @agents; - - use Data::Dumper; - - foreach my $route_agent (@agents) { - print Dumper('++++++++++++++++++++++++++++++++++++++++++++++++++++++'); - # Leo el conf de cada agente - #my $conf_txt = enterprise_hook('read_agent_conf_file',[$conf, $remote_agent]); - - #my $agent_conf_file = $pa_config->{incomingdir}.'/conf/'.md5(encode_utf8(safe_output($remote_agent))).'.conf'; - - # If the module is not local, do nothing - if(!defined($route_agent) || !(-f $route_agent)){ - next; - } - - if ($route_agent =~ /.srv./) { - next; - } - - my $conf_file_txt = read_file($route_agent); - if(!$conf_file_txt) { - next; - } - - my $validate_conf = enterprise_hook('validate_readed_conf_file',[$conf_file_txt]); - print Dumper($validate_conf); - if (!$validate_conf) { - next; - } - - print Dumper($conf_file_txt); - - print Dumper('-----------------------------------------------------------'); - - # # De los agentes que existan - # # checheo el campo disabled se lo pongo a 0 con expresion regular imagino - # my $content = $conf_txt - - # # Escribo el conf - # write_agent_conf_file($pa_config, $agent_name, $content); - } - - # actualizo la bbdd - db_do ($dbh, "UPDATE tagente SET disabled = 0"); + # Update bbdd. + $result = db_do ($dbh, "UPDATE tagente SET disabled = 0"); } else { - # my @remote_agents = get_db_rows ($dbh, 'SELECT nombre FROM tagente WHERE id_grupo = ?', $group); - db_do ($dbh, "UPDATE tagente SET disabled = 0 WHERE id_grupo = $group"); + # Extract all the names of the pandora agents if it is for group. + @agents_bd = get_db_rows ($dbh, 'SELECT nombre FROM tagente WHERE id_grupo = ?', $group); + + # Update bbdd. + $result = db_do ($dbh, "UPDATE tagente SET disabled = 0 WHERE id_grupo = $group"); } - exit; + + foreach my $name_agent (@agents_bd) { + # Check the standby field I put it to 0. + my $new_conf = update_conf_txt( + $conf, + $name_agent->{'nombre'}, + 'standby', + '0' + ); + } + + return $result; } ############################################################################## From 3f90ebc938bfbb7c0cda1c0cef009a872246707b Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 25 Jul 2019 00:01:09 +0200 Subject: [PATCH 5/5] 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 1d5c5058cc..26b9df1f46 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.736-190724 +Version: 7.0NG.736-190725 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 48385a769d..c70708de5a 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.736-190724" +pandora_version="7.0NG.736-190725" 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 ca12bd66a9..d567cc49d2 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.736'; -use constant AGENT_BUILD => '190724'; +use constant AGENT_BUILD => '190725'; # 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 abc7943c66..f8c0128d83 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.736 -%define release 190724 +%define release 190725 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 1c2d7b3759..4f8c80978c 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.736 -%define release 190724 +%define release 190725 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 3d0f4de1a6..5506851c54 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.736" -PI_BUILD="190724" +PI_BUILD="190725" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 6ea94544cc..cc3e10c2a8 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190724} +{190725} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 0a5165bac6..01c70cac0b 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.736(Build 190724)") +#define PANDORA_VERSION ("7.0NG.736(Build 190725)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 728e20d24d..83d2c65706 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.736(Build 190724))" + VALUE "ProductVersion", "(7.0NG.736(Build 190725))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 91a594a97f..0193272cac 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.736-190724 +Version: 7.0NG.736-190725 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 7c46037209..4d0cd0f783 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.736-190724" +pandora_version="7.0NG.736-190725" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 9fc521ab78..43e243069f 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 = 'PC190724'; +$build_version = 'PC190725'; $pandora_version = 'v7.0NG.736'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 74b0a65b4d..59353cd592 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 809a519fc3..3b21862006 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.736 -%define release 190724 +%define release 190725 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 5547027379..dd6760fc68 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.736 -%define release 190724 +%define release 190725 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index e74ff8d51a..f6f457825d 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.736" -PI_BUILD="190724" +PI_BUILD="190725" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 4e2bafcec9..3f768fa876 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.736 PS190724"; +my $version = "7.0NG.736 PS190725"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 2091f2c584..ed939f3857 100644 --- 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.736 PS190724"; +my $version = "7.0NG.736 PS190725"; # save program name for logging my $progname = basename($0);