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-4467-barra-de-busqueda-como-interprete-de-ordenes

This commit is contained in:
marcos 2019-12-05 15:05:54 +01:00
parent fbb1e53362 0263060639
commit a89a64cc1b
26 changed files with 85 additions and 25 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 package: pandorafms-agent-unix
Version: 7.0NG.741-191203 Version: 7.0NG.741-191205
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.741-191203" pandora_version="7.0NG.741-191205"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -55,7 +55,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.741'; use constant AGENT_VERSION => '7.0NG.741';
use constant AGENT_BUILD => '191203'; use constant AGENT_BUILD => '191205';
# Agent log default file size maximum and instances # Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000; 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 name pandorafms_agent_unix
%define version 7.0NG.741 %define version 7.0NG.741
%define release 191203 %define release 191205
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

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

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.741" PI_VERSION="7.0NG.741"
PI_BUILD="191203" PI_BUILD="191205"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{191203} {191205}
ViewReadme ViewReadme
{Yes} {Yes}

2
pandora_agents/win32/pandora.cc
View File

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

2
pandora_agents/win32/versioninfo.rc
View File

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

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.741-191203 Version: 7.0NG.741-191205
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.741-191203" pandora_version="7.0NG.741-191205"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

2
pandora_console/include/config_process.php
View File

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

2
pandora_console/install.php
View File

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

2
pandora_console/pandora_console.redhat.spec
View File

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

2
pandora_console/pandora_console.rhel7.spec
View File

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

2
pandora_console/pandora_console.spec
View File

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

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.741-191203 Version: 7.0NG.741-191205
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.741-191203" pandora_version="7.0NG.741-191205"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

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

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

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

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

60
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -145,6 +145,7 @@ our @EXPORT = qw(
ip_to_long ip_to_long
get_enabled_servers get_enabled_servers
dateTimeToTimestamp dateTimeToTimestamp
get_user_agent
); );
# ID of the different servers # ID of the different servers
@ -2124,6 +2125,65 @@ sub get_enabled_servers {
# End of function declaration # End of function declaration
# End of defined Code # End of defined Code
################################################################################
# Initialize a LWP::User agent
################################################################################
sub get_user_agent {
my $pa_config = shift;
my $ua;
eval {
if (!(defined($pa_config->{'lwp_timeout'})
&& is_numeric($pa_config->{'lwp_timeout'}))
) {
$pa_config->{'lwp_timeout'} = 3;
}
$ua = LWP::UserAgent->new(
'keep_alive' => "10"
);
# Configure LWP timeout.
$ua->timeout($pa_config->{'lwp_timeout'});
# Enable environmental proxy settings
$ua->env_proxy;
# Enable in-memory cookie management
$ua->cookie_jar( {} );
if (!defined($pa_config->{'ssl_verify'})
|| (defined($pa_config->{'ssl_verify'})
&& $pa_config->{'ssl_verify'} eq "0")
) {
# Disable verify host certificate (only needed for self-signed cert)
$ua->ssl_opts( 'verify_hostname' => 0 );
$ua->ssl_opts( 'SSL_verify_mode' => 0x00 );
# Disable library extra checks
BEGIN {
$ENV{PERL_NET_HTTPS_SSL_SOCKET_CLASS} = "Net::SSL";
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
}
}
};
if($@) {
logger($pa_config, 'Failed to initialize LWP::UserAgent', 5);
# Failed
return;
}
return $ua;
}
1; 1;
__END__ __END__

2
pandora_server/pandora_server.redhat.spec
View File

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

2
pandora_server/pandora_server.spec
View File

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

2
pandora_server/pandora_server_installer
View File

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

2
pandora_server/util/pandora_db.pl
View File

@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.741 PS191203"; my $version = "7.0NG.741 PS191205";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

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