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

2007-04-24 Sancho Lerena <slerena@artica.es> 

* pandora_db.pm: Added sanity checks to avoid problems when some
        modules coming without names or cannot locate a valid agent.

        * pandora_server.pl: Added sanity checks to avoid unnamed modules




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@444 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2007-04-24 13:53:34 +00:00
parent 35843e8743
commit 7285014751
3 changed files with 137 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_server/ChangeLog
View File

@ -1,3 +1,10 @@
2007-04-24 Sancho Lerena <slerena@artica.es>
* pandora_db.pm: Added sanity checks to avoid problems when some
modules coming without names or cannot locate a valid agent.
* pandora_server.pl: Added sanity checks to avoid unnamed modules
2007-04-21 Sancho Lerena <slerena@gmail.com> 2007-04-21 Sancho Lerena <slerena@gmail.com>
* pandora_tools.pm: Fixed sqlWrap() function. * pandora_tools.pm: Fixed sqlWrap() function.

36
pandora_server/bin/pandora_db.pm
View File

@ -1275,24 +1275,33 @@ sub dame_modulo_id (%$$) {
########################################################################## ##########################################################################
## SUB dame_agente_modulo_id (id_agente, id_tipomodulo, nombre) ## SUB dame_agente_modulo_id (id_agente, id_tipomodulo, nombre)
## Return agente_modulo ID, from tabla tagente_modulo, given id_agente, id_tipomodulo and name ## Return agente_modulo ID, from tabla tagente_modulo,
## given id_agente, id_tipomodulo and name
########################################################################## ##########################################################################
sub dame_agente_modulo_id (%$$$$) { sub dame_agente_modulo_id (%$$$$) {
my $pa_config = $_[0]; my $pa_config = $_[0];
my $id_agente = $_[1]; my $id_agente = $_[1];
my $id_tipomodulo = $_[2]; my $id_tipomodulo = $_[2];
my $nombre = $_[3]; my $name = $_[3];
my $dbh = $_[4]; my $dbh = $_[4];
my $id_agentemodulo; my $id_agentemodulo;
my @data; my @data;
# Sanity checks
if (!defined($name)){
return -1;
}
if (!defined($id_agente) || ($id_agente < 0)){
return -1;
}
# Calculate agent ID using select by its name # Calculate agent ID using select by its name
my $query_idag = "select * from tagente_modulo where id_agente = '$id_agente' and id_tipo_modulo = '$id_tipomodulo' and nombre = '$nombre'"; my $query_idag = "select * from tagente_modulo where id_agente = '$id_agente' and id_tipo_modulo = '$id_tipomodulo' and nombre = '$name'";
my $s_idag = $dbh->prepare($query_idag); my $s_idag = $dbh->prepare($query_idag);
$s_idag ->execute; $s_idag ->execute;
if ($s_idag->rows == 0) { if ($s_idag->rows == 0) {
logger($pa_config, "ERROR dame_agente_modulo_id(): Cannot find agente_modulo called $nombre",2); logger($pa_config, "ERROR dame_agente_modulo_id(): Cannot find a module called $name", 2);
logger($pa_config, "ERROR: SQL Query is $query_idag ",2); logger($pa_config, "ERROR: SQL Query is $query_idag ",10);
$id_agentemodulo = -1; $id_agentemodulo = -1;
} else { } else {
@data = $s_idag->fetchrow_array(); @data = $s_idag->fetchrow_array();
@ -1511,9 +1520,16 @@ sub crea_agente_modulo (%$$$$$$$) {
my $descripcion = $_[6]; my $descripcion = $_[6];
my $dbh = $_[7]; my $dbh = $_[7];
# Sanity checks
if (!defined($nombre_modulo)){
return -1;
}
my $modulo_id = dame_modulo_id ($pa_config, $tipo_modulo, $dbh); my $modulo_id = dame_modulo_id ($pa_config, $tipo_modulo, $dbh);
my $agente_id = dame_agente_id ($pa_config, $nombre_agente, $dbh); my $agente_id = dame_agente_id ($pa_config, $nombre_agente, $dbh);
if (!defined($id_agente) || ($id_agente < 0)){
return -1;
}
if ((!defined($max)) || ($max eq "")){ if ((!defined($max)) || ($max eq "")){
$max = 0; $max = 0;
} }

195
pandora_server/bin/pandora_server.pl
View File

@ -36,7 +36,7 @@ use pandora_tools;
use pandora_db; use pandora_db;
# FLUSH in each IO, only for DEBUG, very slow ! # FLUSH in each IO, only for DEBUG, very slow !
$| = 1; $| = 0;
my %pa_config; my %pa_config;
@ -58,19 +58,7 @@ if ($pa_config{"daemon"} eq "1" ){
threads->new( \&pandora_keepalived, \%pa_config); threads->new( \&pandora_keepalived, \%pa_config);
# Module processor subsystem # Module processor subsystem
pandora_dataserver(\%pa_config); pandora_dataserver (\%pa_config);
#------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------
#--------------------- Main Perl Code below this line-----------------------
#------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------
########################################################################## ##########################################################################
# Main loop # Main loop
@ -90,16 +78,19 @@ sub pandora_dataserver {
while (defined($onefile = readdir(DIR))){ while (defined($onefile = readdir(DIR))){
push @file_list,$onefile; # Push in a stack all directory entries for this loop push @file_list,$onefile; # Push in a stack all directory entries for this loop
} }
while (defined($onefile = pop @file_list)) { # Begin to process files while (defined($onefile = pop @file_list)) { # Begin to process files
threads->yield; threads->yield;
$file_data = "$pa_config->{'incomingdir'}/$onefile"; $file_data = "$pa_config->{'incomingdir'}/$onefile";
next if $onefile =~ /^\.\.?$/; # Skip . and .. directory next if $onefile =~ /^\.\.?$/; # Skip . and .. directory
if ( $onefile =~ /([\-\:\;\.\,\_\s\a\*\=\(\)a-zA-Z0-9]*).data\z/ ) { # First filter any file that doesnt like ".data"
# First filter any file that doesnt like ".data"
if ( $onefile =~ /([\-\:\;\.\,\_\s\a\*\=\(\)a-zA-Z0-9]*).data\z/ ) {
$agent_filename = $1; $agent_filename = $1;
$file_md5 = "$pa_config->{'incomingdir'}/$agent_filename.checksum"; $file_md5 = "$pa_config->{'incomingdir'}/$agent_filename.checksum";
if (( -e $file_md5 ) or ($pa_config->{'pandora_check'} == 0)){ # If check is disabled, ignore if file_md5 exists # If check is disabled, ignore if file_md5 exists
# Verify integrity if (( -e $file_md5 ) or ($pa_config->{'pandora_check'} == 0)){
my $check_result; # Verify integrity
my $check_result;
$check_result = md5check ($file_data,$file_md5); $check_result = md5check ($file_data,$file_md5);
if (($pa_config->{'pandora_check'} == 0) || ($check_result == 1)){ if (($pa_config->{'pandora_check'} == 0) || ($check_result == 1)){
# PERL cannot "free" memory on user demmand, so # PERL cannot "free" memory on user demmand, so
@ -108,45 +99,45 @@ sub pandora_dataserver {
# In Pandora 1.1 in "standard" PERL Implementations, we could # In Pandora 1.1 in "standard" PERL Implementations, we could
# have a memory leak problem. This is solved now :-) # have a memory leak problem. This is solved now :-)
# Source : http://www.rocketaware.com/perl/perlfaq3/ # Source : http://www.rocketaware.com/perl/perlfaq3/
# Procesa_Datos its the main function to process datafile # Procesa_Datos its the main function to process datafile
my $config; # Hash Reference, used to store XML data my $config; # Hash Reference, used to store XML data
# But first we needed to verify integrity of data file # But first we needed to verify integrity of data file
if ($pa_config->{'pandora_check'} == 1){ if ($pa_config->{'pandora_check'} == 1){
logger ($pa_config, "Integrity of Datafile using MD5 is verified: $file_data",3); logger ($pa_config, "Integrity of Datafile using MD5 is verified: $file_data",3);
} }
eval { # XML Processing error catching procedure. Critical due XML was no validated eval { # XML Processing error catching procedure. Critical due XML was no validated
logger ($pa_config, "Ready to parse $file_data",4); logger ($pa_config, "Ready to parse $file_data",4);
$config = XMLin($file_data, forcearray=>'module'); $config = XMLin($file_data, forcearray=>'module');
}; };
if ($@) { if ($@) {
logger ($pa_config, "[ERROR] Error processing XML contents in $file_data",0); logger ($pa_config, "[ERROR] Error processing XML contents in $file_data",0);
copy ($file_data,$file_data."_BADXML"); copy ($file_data,$file_data."_BADXML");
if (($pa_config->{'pandora_check'} == 1) && ( -e $file_md5 )) { if (($pa_config->{'pandora_check'} == 1) && ( -e $file_md5 )) {
copy ($file_md5,$file_md5."_BADCHECKSUM"); copy ($file_md5,$file_md5."_BADCHECKSUM");
} }
} }
procesa_datos($pa_config, $config, $dbh); procesa_datos ($pa_config, $config, $dbh);
undef $config; undef $config;
# If _everything_ its ok.. # If _everything_ its ok..
# delete files # delete files
unlink ($file_data); unlink ($file_data);
if ( -e $file_md5 ) { if ( -e $file_md5 ) {
unlink ($file_md5); unlink ($file_md5);
} }
} else { # md5 check fails } else { # md5 check fails
logger ( $pa_config, "[ERROR] MD5 Checksum failed! for $file_data",0); logger ( $pa_config, "[ERROR] MD5 Checksum failed! for $file_data",0);
# delete files # delete files
unlink ($file_data); unlink ($file_data);
if ( -e $file_md5 ) { if ( -e $file_md5 ) {
unlink ($file_md5); unlink ($file_md5);
} }
} }
} # No checksum file, ignore file } # No checksum file, ignore file
} }
} }
closedir(DIR); closedir(DIR);
threads->yield; threads->yield;
sleep $pa_config->{"server_threshold"}; sleep $pa_config->{"server_threshold"};
} }
} # End of main loop function } # End of main loop function
@ -161,8 +152,8 @@ sub pandora_keepalived {
while ( 1 ){ while ( 1 ){
sleep $pa_config->{"server_threshold"}; sleep $pa_config->{"server_threshold"};
threads->yield; threads->yield;
keep_alive_check($pa_config,$dbh); keep_alive_check ($pa_config, $dbh);
pandora_serverkeepaliver($pa_config,0,$dbh); # 0 for dataserver pandora_serverkeepaliver ($pa_config, 0, $dbh); # 0 for dataserver
} }
} }
@ -173,14 +164,16 @@ sub pandora_keepalived {
########################################################################## ##########################################################################
sub keep_alive_check { sub keep_alive_check {
# Search of any defined alert for any agent/module table entry # Search of any defined alert for any agent/module table entry
my $pa_config = $_[0]; my $pa_config = $_[0];
my $dbh = $_[1]; my $dbh = $_[1];
my $query_idag = "select * from talerta_agente_modulo"; my $query_idag = "SELECT * FROM talerta_agente_modulo";
my $s_idag = $dbh->prepare($query_idag); my $s_idag = $dbh->prepare($query_idag);
$s_idag ->execute; $s_idag ->execute;
my @data; my $err; my $flag; my @data;
my $err;
my $flag;
if ($s_idag->rows != 0) { if ($s_idag->rows != 0) {
while (@data = $s_idag->fetchrow_array()) { while (@data = $s_idag->fetchrow_array()) {
@ -207,17 +200,23 @@ sub keep_alive_check {
# If we need to update MYSQL last_fired will use $ahora_mysql # If we need to update MYSQL last_fired will use $ahora_mysql
# Calculate if INTERVAL x2 for this agent is bigger than sub last contact date with actual date # Calculate if INTERVAL x2 for this agent is bigger than sub last contact date with actual date
my $nombre_agente = dame_nombreagente_agentemodulo($pa_config, $id_agente_modulo, $dbh); my $nombre_agente = dame_nombreagente_agentemodulo ($pa_config, $id_agente_modulo, $dbh);
my $id_agente = dame_agente_id($pa_config, $nombre_agente, $dbh); my $id_agente = dame_agente_id ($pa_config, $nombre_agente, $dbh);
if (dame_desactivado($pa_config, $id_agente, $dbh) == 0){ if (dame_desactivado ($pa_config, $id_agente, $dbh) == 0){
my $fecha_ultimocontacto = dame_ultimo_contacto($pa_config,$id_agente,$dbh); my $fecha_ultimocontacto = dame_ultimo_contacto ($pa_config,$id_agente,$dbh);
my $intervalo = dame_intervalo($pa_config, $id_agente, $dbh); # Seconds my $intervalo = dame_intervalo ($pa_config, $id_agente, $dbh); # Seconds
my $intervalo_2 = $intervalo*2; my $intervalo_2 = $intervalo * 2;
$fecha_ultimocontacto = ParseDate($fecha_ultimocontacto); $fecha_ultimocontacto = ParseDate ($fecha_ultimocontacto);
my $fecha_limite = DateCalc($fecha_ultimocontacto,"+ $intervalo_2 seconds",\$err); my $fecha_limite = DateCalc ($fecha_ultimocontacto,"+ $intervalo_2 seconds", \$err);
$flag = Date_Cmp($fecha_actual,$fecha_limite); $flag = Date_Cmp ($fecha_actual,$fecha_limite);
if ( $flag >= 0) { $alert_fired = 1 } else { $alert_fired=0 } ; if ( $flag >= 0) {
if (( $flag >= 0 ) && ($max_alerts >= $times_fired)){ # Calculate if max_alerts for this time is exhausted $alert_fired = 1;
} else {
$alert_fired = 0;
}
# Calculate if max_alerts for this time is exhausted
if (( $flag >= 0 ) && ($max_alerts >= $times_fired)){
# Alert Trigger is ON ! # Alert Trigger is ON !
# Check if alert is fired by event-success # Check if alert is fired by event-success
my $time_threshold = $threshold; # from defined alert my $time_threshold = $threshold; # from defined alert
@ -291,46 +290,60 @@ sub procesa_datos {
my $datos = $_[1]; my $datos = $_[1];
my $dbh = $_[2]; my $dbh = $_[2];
my $tipo_modulo; my $agent_name; my $tipo_modulo;
my $timestamp; my $interval; my $agent_name;
my $os_version; my $agent_version; my $timestamp;
my $id_agente; my $module_name; my $interval;
my $os_version;
my $agent_version;
my $id_agente;
my $module_name;
$agent_name = $datos->{'agent_name'}; $agent_name = $datos->{'agent_name'};
$timestamp = $datos->{'timestamp'}; $timestamp = $datos->{'timestamp'};
$agent_version = $datos->{'version'}; $agent_version = $datos->{'version'};
$interval = $datos->{'interval'}; $interval = $datos->{'interval'};
$os_version = $datos->{'os_version'}; $os_version = $datos->{'os_version'};
# Check for parameteres, not all version agentes gives the same parameters !
if (length($interval) == 0){ $interval = -1; } # No update for interval ! # Check for parameteres, not all version agents gives the same parameters !
if (length($os_version) == 0){ $os_version = "N/A"; } # No update for interval ! if (length($interval) == 0){
$interval = -1; # No update for interval !
}
if (length($os_version) == 0){
$os_version = "N/A";
}
if (defined $agent_name){ if (defined $agent_name){
$id_agente = dame_agente_id($pa_config,$agent_name,$dbh); $id_agente = dame_agente_id($pa_config,$agent_name,$dbh);
if ($id_agente > 0) { if ($id_agente > 0) {
pandora_lastagentcontact($pa_config, $timestamp, $agent_name, $os_version, $agent_version, $interval, $dbh); pandora_lastagentcontact ($pa_config, $timestamp, $agent_name, $os_version, $agent_version, $interval, $dbh);
foreach my $part(@{$datos->{module}}) { foreach my $part(@{$datos->{module}}) {
$tipo_modulo = $part->{type}->[0]; $tipo_modulo = $part->{type}->[0];
$module_name = $part->{name}->[0]; $module_name = $part->{name}->[0];
logger($pa_config, "Processing packet Name ( ".$module_name." ) type ( $tipo_modulo ) for agent ( $agent_name )",5); if (defined($module_name)){ # Skip modules without names
if ($tipo_modulo eq 'generic_data') { logger($pa_config, "Processing module Name ( $module_name ) type ( $tipo_modulo ) for agent ( $agent_name )", 5);
module_generic_data($pa_config, $part,$timestamp,$agent_name,"generic_data", $dbh); if ($tipo_modulo eq 'generic_data') {
} module_generic_data ($pa_config, $part, $timestamp, $agent_name, "generic_data", $dbh);
elsif ($tipo_modulo eq 'generic_data_inc') { }
module_generic_data_inc($pa_config, $part,$timestamp,$agent_name,"generic_data_inc", $dbh); elsif ($tipo_modulo eq 'generic_data_inc') {
} module_generic_data_inc ($pa_config, $part, $timestamp, $agent_name,"generic_data_inc", $dbh);
elsif ($tipo_modulo eq 'generic_data_string') { }
module_generic_data_string($pa_config,$part,$timestamp,$agent_name,"generic_data_string", $dbh); elsif ($tipo_modulo eq 'generic_data_string') {
} module_generic_data_string ($pa_config, $part, $timestamp, $agent_name,"generic_data_string", $dbh);
elsif ($tipo_modulo eq 'generic_proc') { }
module_generic_proc($pa_config,$part,$timestamp,$agent_name,"generic_proc", $dbh); elsif ($tipo_modulo eq 'generic_proc') {
} module_generic_proc ($pa_config, $part, $timestamp, $agent_name, "generic_proc", $dbh);
else { }
logger($pa_config,"ERROR: Received data from an unknown module ($tipo_modulo)",2); else {
} logger($pa_config, "ERROR: Received data from an unknown module ($tipo_modulo)", 2);
}
}
} }
} else { } else {
logger($pa_config,"ERROR: There is no agent defined with name $agent_name ($id_agente)",2); logger($pa_config, "ERROR: There is no agent defined with name $agent_name ($id_agente)", 2);
} }
} else { } else {
logger($pa_config,"ERROR: Received data from an unnamed agent",1); logger($pa_config, "ERROR: Received data from an unknown agent", 1);
} }
} }