tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into ent-8521-wmic-incompatible-con-nueva-politica-de-seguridad-de-windows

This commit is contained in:
Ramon Novoa 2022-04-11 11:34:28 +02:00
parent 93031d08d7 773071946f
commit f074c9d1b1
28 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.761-220407
Version: 7.0NG.761-220411
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.761-220407"
pandora_version="7.0NG.761-220411"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -1015,7 +1015,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.761';
use constant AGENT_BUILD => '220407';
use constant AGENT_BUILD => '220411';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.761
%define release 220407
%define release 220411
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.761
%define release 220407
%define release 220411
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.761"
PI_BUILD="220407"
PI_BUILD="220411"
OS_NAME=`uname -s`
FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{220407}
{220411}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.761 Build 220407")
#define PANDORA_VERSION ("7.0NG.761 Build 220411")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.761(Build 220407))"
VALUE "ProductVersion", "(7.0NG.761(Build 220411))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.761-220407
Version: 7.0NG.761-220411
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.761-220407"
pandora_version="7.0NG.761-220411"
package_pear=0
package_pandora=1

2
pandora_console/extras/mr/53.sql
View File

@ -27,9 +27,9 @@ ALTER TABLE `treport_content` ADD COLUMN `render_definition` TEXT;
ALTER TABLE `treport_content_template` ADD COLUMN `macros_definition` TEXT;
ALTER TABLE `treport_content_template` ADD COLUMN `render_definition` TEXT;
DROP TABLE `tupdate_journal`;
DROP TABLE `tupdate`;
DROP TABLE `tupdate_package`;
DROP TABLE `tupdate_journal`;
CREATE TABLE `tupdate_journal` (
`id` SERIAL,

5
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -1065,9 +1065,9 @@ if ($update_agent) {
if ($action_delete_ip) {
$delete_ip = get_parameter_post('address_list');
if (empty($direccion_agente) === true) {
$direccideon_agente = agents_delete_address($id_agente, $delete_ip);
$direccion_agente = agents_delete_address($id_agente, $delete_ip, true);
} else {
agents_delete_address($id_agente, $delete_ip);
$direccion_agente = agents_delete_address($id_agente, $delete_ip, true);
}
}
@ -1089,7 +1089,6 @@ if ($update_agent) {
'icon_path' => $icon_path,
'update_gis_data' => $update_gis_data,
'url_address' => $url_description,
'url_address' => $url_description,
'quiet' => $quiet,
'cps' => $cps,
'safe_mode_module' => $safe_mode_module,

2
pandora_console/include/config_process.php
View File

@ -20,7 +20,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC220407';
$build_version = 'PC220411';
$pandora_version = 'v7.0NG.761';
// Do not overwrite default timezone set if defined.

11
pandora_console/include/functions_agents.php
View File

@ -2118,7 +2118,7 @@ function agents_add_address($id_agent, $ip_address)
* @param int Agent id
* @param string IP address to unassign
*/
function agents_delete_address($id_agent, $ip_address)
function agents_delete_address($id_agent, $ip_address, $return=false)
{
global $config;
@ -2151,13 +2151,20 @@ function agents_delete_address($id_agent, $ip_address)
$new_ip = reset($new_ips);
}
// Change main address in agent to first one in the list
// Change main address in agent to first one in the list.
db_process_sql_update(
'tagente',
['direccion' => $new_ip],
['id_agente' => $id_agent]
);
} else {
$new_ip = agents_get_address($id_agent);
if (empty($new_ip)) {
$new_ip = '';
}
}
if ($return === true) {
return $new_ip;
}
}

2
pandora_console/install.php
View File

@ -129,7 +129,7 @@
<div style='height: 10px'>
<?php
$version = '7.0NG.761';
$build = '220407';
$build = '220411';
$banner = "v$version Build $build";
error_reporting(0);

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.761
%define release 220407
%define release 220411
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.761
%define release 220407
%define release 220411
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.761
%define release 220407
%define release 220411
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.761-220407
Version: 7.0NG.761-220411
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.761-220407"
pandora_version="7.0NG.761-220411"
package_cpan=0
package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -46,7 +46,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.761";
my $pandora_build = "220407";
my $pandora_build = "220411";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.761";
my $pandora_build = "220407";
my $pandora_build = "220411";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.761
%define release 220407
%define release 220411
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.761
%define release 220407
%define release 220411
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.761"
PI_BUILD="220407"
PI_BUILD="220411"
MODE=$1
if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.761 Build 220407";
my $version = "7.0NG.761 Build 220411";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "7.0NG.761 Build 220407";
my $version = "7.0NG.761 Build 220411";
# save program name for logging
my $progname = basename($0);