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

Merge branch 'ent-5620-nuevo-compilador-para-backend' into master-alt

This commit is contained in:
Ramon Novoa 2021-06-24 12:58:44 +02:00
parent 5857c047e2 6b4cb8d9df
commit f9b090d857
43 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_agents/unix/pandora_agent
View File

@ -39,7 +39,7 @@ BEGIN {
use File::Copy; use File::Copy;
use Scalar::Util qw(looks_like_number); use Scalar::Util qw(looks_like_number);
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
################################################################################ ################################################################################
# Erase blank spaces before and after the string # Erase blank spaces before and after the string
@ -312,7 +312,7 @@ BEGIN {
$YAML = 1; $YAML = 1;
} }
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
our @ISA = ("Exporter"); our @ISA = ("Exporter");
our %EXPORT_TAGS = ( 'all' => [ qw( ) ] ); our %EXPORT_TAGS = ( 'all' => [ qw( ) ] );
@ -1003,7 +1003,7 @@ use IO::Socket;
use Sys::Syslog; use Sys::Syslog;
use Time::Local; use Time::Local;
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
# Agent XML data # Agent XML data
my $Xml; my $Xml;

8
pandora_agents/unix/pandora_agent_daemon
View File

@ -42,6 +42,8 @@ pidof_pandora () {
elif [ "$OS_NAME" = "SunOS" ] elif [ "$OS_NAME" = "SunOS" ]
then then
ZONENAME_CMD="/bin/zonename" ZONENAME_CMD="/bin/zonename"
# Has to be run from sources. The binary version inserts blanks between
# $DAEMON and $PANDORA_PATH.
TRUNCATED_DAEMON=`echo "$DAEMON $PANDORA_PATH" | cut -c1-20` TRUNCATED_DAEMON=`echo "$DAEMON $PANDORA_PATH" | cut -c1-20`
if [ -x $ZONENAME_CMD ] if [ -x $ZONENAME_CMD ]
then then
@ -59,7 +61,7 @@ pidof_pandora () {
then then
# Virtuozzo/OpenVZ # Virtuozzo/OpenVZ
local _pid _ctid _pids local _pid _ctid _pids
_pids=`ps -Af | grep "$DAEMON $PANDORA_PATH" | grep -v grep | awk '{ print $2 }'` _pids=`ps -Af | grep "$DAEMON" | grep "$PANDORA_PATH" | grep -v grep | awk '{ print $2 }'`
[ "$_pids" ] && for _pid in $_pids [ "$_pids" ] && for _pid in $_pids
do do
_ctid=`/usr/sbin/vzpid $_pid | awk '$1 == '$_pid' { print $2 }'` _ctid=`/usr/sbin/vzpid $_pid | awk '$1 == '$_pid' { print $2 }'`
@ -71,9 +73,9 @@ pidof_pandora () {
done done
elif [ "$OS_NAME" = "AIX" ]; then elif [ "$OS_NAME" = "AIX" ]; then
# AIX # AIX
PANDORA_PID=`ps -ef | grep "$DAEMON $PANDORA_PATH" | grep -v grep | awk '{ print $2 }'` PANDORA_PID=`ps -ef | grep "$DAEMON" | grep "$PANDORA_PATH" | grep -v grep | awk '{ print $2 }'`
else else
PANDORA_PID=`ps -Afw | grep "$DAEMON $PANDORA_PATH" | grep -v grep | awk '{ print $2 }'` PANDORA_PID=`ps -Afw | grep "$DAEMON" | grep "$PANDORA_PATH" | grep -v grep | awk '{ print $2 }'`
fi fi
echo $PANDORA_PID echo $PANDORA_PID

2
pandora_agents/unix/pandora_revent
View File

@ -14,7 +14,7 @@ use strict;
use LWP::Simple; use LWP::Simple;
use LWP::UserAgent; use LWP::UserAgent;
use MIME::Base64; use MIME::Base64;
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
# Init # Init

2
pandora_agents/win32/omnishell/omnishell_client.pl
View File

@ -11,7 +11,7 @@ use strict;
use warnings; use warnings;
use File::Basename; use File::Basename;
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::PluginTools; use PandoraFMS::PluginTools;
use PandoraFMS::Omnishell; use PandoraFMS::Omnishell;

2
pandora_plugins/MySQL/pandora_mysql.pl
View File

@ -5,7 +5,7 @@
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use strict; use strict;
use Data::Dumper; use Data::Dumper;

2
pandora_plugins/intel_dcm/intel_dcm_discovery.pl
View File

@ -12,7 +12,7 @@ use NetAddr::IP;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

2
pandora_server/bin/pandora_server
View File

@ -24,7 +24,7 @@ use threads;
use Digest::MD5 qw(md5_hex); use Digest::MD5 qw(md5_hex);
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
# Pandora Modules # Pandora Modules
use PandoraFMS::DB; use PandoraFMS::DB;

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

@ -22,7 +22,7 @@ use POSIX qw(strftime);
use Time::Local; use Time::Local;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

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

@ -145,7 +145,7 @@ if (!$@) {
} }
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::DB; use PandoraFMS::DB;
use PandoraFMS::Config; use PandoraFMS::Config;

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

@ -22,7 +22,7 @@ use warnings;
use DBI; use DBI;
use Carp qw/croak/; use Carp qw/croak/;
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
#use Data::Dumper; #use Data::Dumper;

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

@ -41,7 +41,7 @@ use Encode::Locale ();
use LWP::Simple; use LWP::Simple;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

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

@ -31,7 +31,7 @@ use Encode qw(encode_utf8);
use MIME::Base64; use MIME::Base64;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

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

@ -53,7 +53,7 @@ use warnings;
use Geo::IP; use Geo::IP;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::DB; use PandoraFMS::DB;
use PandoraFMS::Tools; use PandoraFMS::Tools;

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

@ -30,7 +30,7 @@ use HTML::Entities;
use POSIX qw(strftime); use POSIX qw(strftime);
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

4
pandora_server/lib/PandoraFMS/Omnishell.pm
View File

@ -10,7 +10,7 @@ use warnings;
use File::Copy; use File::Copy;
use Scalar::Util qw(looks_like_number); use Scalar::Util qw(looks_like_number);
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::PluginTools qw/init read_configuration read_file empty trim/; use PandoraFMS::PluginTools qw/init read_configuration read_file empty trim/;
my $YAML = 0; my $YAML = 0;
@ -24,7 +24,7 @@ if ($@) {
$YAML = 1; $YAML = 1;
} }
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
our @ISA = ("Exporter"); our @ISA = ("Exporter");
our %EXPORT_TAGS = ( 'all' => [ qw( ) ] ); our %EXPORT_TAGS = ( 'all' => [ qw( ) ] );

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

@ -30,7 +30,7 @@ use JSON qw(decode_json);
use Encode qw(encode_utf8 decode_utf8); use Encode qw(encode_utf8 decode_utf8);
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

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

@ -29,7 +29,7 @@ use Net::Ping;
use POSIX qw(strftime); use POSIX qw(strftime);
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

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

@ -25,7 +25,7 @@ use threads::shared;
use Thread::Semaphore; use Thread::Semaphore;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::DB; use PandoraFMS::DB;
use PandoraFMS::Core; use PandoraFMS::Core;

2
pandora_server/lib/PandoraFMS/Recon/Base.pm
View File

@ -12,7 +12,7 @@ use IO::Socket::INET;
use POSIX qw/ceil/; use POSIX qw/ceil/;
use Socket qw/inet_aton/; use Socket qw/inet_aton/;
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::Recon::NmapParser; use PandoraFMS::Recon::NmapParser;
use PandoraFMS::Recon::Util; use PandoraFMS::Recon::Util;

2
pandora_server/lib/PandoraFMS/Recon/Util.pm
View File

@ -7,7 +7,7 @@ use strict;
use warnings; use warnings;
# Default lib dir for RPM and DEB packages. # Default lib dir for RPM and DEB packages.
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use Socket qw/inet_aton/; use Socket qw/inet_aton/;

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

@ -31,7 +31,7 @@ use XML::Simple;
use Scalar::Util qw(looks_like_number); use Scalar::Util qw(looks_like_number);
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

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

@ -25,7 +25,7 @@ use threads;
use threads::shared; use threads::shared;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::DB; use PandoraFMS::DB;
use PandoraFMS::Core; use PandoraFMS::Core;

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

@ -34,7 +34,7 @@ use threads::shared;
use JSON; use JSON;
use Encode qw/decode_utf8 encode_utf8/; use Encode qw/decode_utf8 encode_utf8/;
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Sendmail; use PandoraFMS::Sendmail;
# New in 3.2. Used to sendmail internally, without external scripts # New in 3.2. Used to sendmail internally, without external scripts

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

@ -28,7 +28,7 @@ use POSIX qw(strftime);
use HTML::Entities; use HTML::Entities;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

2
pandora_server/util/agent_gis_update.pl
View File

@ -26,7 +26,7 @@ use POSIX qw(strftime);
use Time::HiRes qw(usleep); use Time::HiRes qw(usleep);
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Core; use PandoraFMS::Core;
use PandoraFMS::Config; use PandoraFMS::Config;

2
pandora_server/util/gpx2pandora_agent_data.pl
View File

@ -13,7 +13,7 @@ use Sys::Hostname;
use POSIX qw(strftime); use POSIX qw(strftime);
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;

2
pandora_server/util/pandora_database_check.pl
View File

@ -31,7 +31,7 @@ use POSIX qw(strftime);
use Time::HiRes qw( clock_gettime clock ) ; use Time::HiRes qw( clock_gettime clock ) ;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

2
pandora_server/util/pandora_db.pl
View File

@ -27,7 +27,7 @@ use File::Path qw(rmtree);
use Time::HiRes qw(usleep); use Time::HiRes qw(usleep);
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Core; use PandoraFMS::Core;
use PandoraFMS::Tools; use PandoraFMS::Tools;

2
pandora_server/util/pandora_dbstress.pl
View File

@ -35,7 +35,7 @@ use Math::Trig; # Math functions
use Time::HiRes qw ( clock_gettime CLOCK_REALTIME); use Time::HiRes qw ( clock_gettime CLOCK_REALTIME);
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
# Pandora Modules # Pandora Modules
use PandoraFMS::Config; use PandoraFMS::Config;

2
pandora_server/util/pandora_manage.pl
View File

@ -24,7 +24,7 @@ use LWP::Simple;
use Data::Dumper; use Data::Dumper;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

2
pandora_server/util/pandora_migrate_logs.pl
View File

@ -13,7 +13,7 @@ use JSON;
use IO::Socket::INET; use IO::Socket::INET;
use File::Copy; use File::Copy;
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Config; use PandoraFMS::Config;
use PandoraFMS::Tools; use PandoraFMS::Tools;

2
pandora_server/util/pandora_migrate_plugins.pl
View File

@ -18,7 +18,7 @@ use Data::Dumper;
use JSON qw(encode_json); use JSON qw(encode_json);
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

2
pandora_server/util/pandora_migrate_recon_scripts.pl
View File

@ -18,7 +18,7 @@ use Data::Dumper;
use JSON qw(encode_json); use JSON qw(encode_json);
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

2
pandora_server/util/pandora_perf_report.pl
View File

@ -10,7 +10,7 @@ use POSIX qw (strftime floor);
use Sys::Hostname; use Sys::Hostname;
use Time::HiRes qw(gettimeofday tv_interval); use Time::HiRes qw(gettimeofday tv_interval);
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
# Pandora Modules. # Pandora Modules.
use PandoraFMS::Config; use PandoraFMS::Config;

2
pandora_server/util/pandora_recode_db.pl
View File

@ -16,7 +16,7 @@ use POSIX;
use HTML::Entities; # Encode or decode strings with HTML entities use HTML::Entities; # Encode or decode strings with HTML entities
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

2
pandora_server/util/pandora_revent.pl
View File

@ -14,7 +14,7 @@ use strict;
use LWP::Simple; use LWP::Simple;
use LWP::UserAgent; use LWP::UserAgent;
use MIME::Base64; use MIME::Base64;
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
# Init # Init

2
pandora_server/util/pandora_server
View File

@ -81,7 +81,7 @@ function pidof_pandora () {
# in a "strech" term, ps aux don't report more than COLUMNS # in a "strech" term, ps aux don't report more than COLUMNS
# characters and this will not work. # characters and this will not work.
COLUMNS=300 COLUMNS=300
PANDORA_PID=`ps aux | grep "$PANDORA_DAEMON $PANDORA_HOME" | grep -v grep | tail -1 | awk '{ print $2 }'` PANDORA_PID=`ps aux | grep "$PANDORA_DAEMON" | grep "$PANDORA_HOME" | grep -v grep | tail -1 | awk '{ print $2 }'`
echo $PANDORA_PID echo $PANDORA_PID
} }

2
pandora_server/util/pandora_smpp.pl
View File

@ -5,7 +5,7 @@ use warnings;
use Net::SMPP; use Net::SMPP;
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::PluginTools qw(read_configuration); use PandoraFMS::PluginTools qw(read_configuration);
my $HELP =<<EO_H; my $HELP =<<EO_H;

2
pandora_server/util/pandora_sync_db.pl
View File

@ -16,7 +16,7 @@ use POSIX;
use HTML::Entities; # Encode or decode strings with HTML entities use HTML::Entities; # Encode or decode strings with HTML entities
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

2
pandora_server/util/plugin/pandora_snmp_bandwidth.pl
View File

@ -21,7 +21,7 @@ use warnings;
use POSIX qw(strftime); use POSIX qw(strftime);
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::PluginTools; use PandoraFMS::PluginTools;
use Data::Dumper; use Data::Dumper;

2
pandora_server/util/recon_scripts/ipmi-recon.pl
View File

@ -12,7 +12,7 @@ use NetAddr::IP;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;

2
pandora_server/util/recon_scripts/snmp-recon.pl
View File

@ -6,7 +6,7 @@ use strict;
use warnings; use warnings;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use POSIX qw/strftime/; use POSIX qw/strftime/;
use Socket qw/inet_aton/; use Socket qw/inet_aton/;

2
pandora_server/util/recon_scripts/wmi-recon.pl
View File

@ -9,7 +9,7 @@ use strict;
use warnings; use warnings;
# Default lib dir for RPM and DEB packages # Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5'; BEGIN { push @INC, '/usr/lib/perl5'; }
use PandoraFMS::Tools; use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;