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

Merged some changes from 6.0 that affect incremental modules.

This commit is contained in:
Ramon Novoa 2015-08-12 10:43:14 +02:00
parent aa1779832f
commit f1f2c2f7e8
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1142,9 +1142,8 @@ sub pandora_process_module ($$$$$$$$$;$) {
} }
# Process data # Process data
my $processed_data = process_data ($pa_config, $data_object, $module, $module_type, $utimestamp, $dbh); my $processed_data = process_data ($pa_config, $data_object, $agent, $module, $module_type, $utimestamp, $dbh);
if (! defined ($processed_data)) { if (! defined ($processed_data)) {
logger($pa_config, "Received invalid data '" . $data_object->{'data'} . "' from agent '" . $agent->{'nombre'} . "' module '" . $module->{'nombre'} . "' agent " . (defined ($agent) ? "'" . $agent->{'nombre'} . "'" : 'ID ' . $module->{'id_agente'}) . ".", 3);
pandora_update_module_on_error ($pa_config, $module, $dbh); pandora_update_module_on_error ($pa_config, $module, $dbh);
return; return;
} }
@ -3279,8 +3278,9 @@ sub on_demand_macro($$$$$$) {
########################################################################## ##########################################################################
# Process module data. # Process module data.
########################################################################## ##########################################################################
sub process_data ($$$$$$) { sub process_data ($$$$$$$) {
my ($pa_config, $data_object, $module, $module_type, $utimestamp, $dbh) = @_; my ($pa_config, $data_object, $agent, $module,
$module_type, $utimestamp, $dbh) = @_;
if ($module_type eq "log4x") { if ($module_type eq "log4x") {
return log4x_get_severity_num($data_object); return log4x_get_severity_num($data_object);
@ -3292,13 +3292,17 @@ sub process_data ($$$$$$) {
if ($module_type =~ m/_string$/) { if ($module_type =~ m/_string$/) {
# Empty strings are not allowed # Empty strings are not allowed
return undef if ($data eq ''); if ($data eq '') {
logger($pa_config, "Received invalid data '" . $data_object->{'data'} . "' from agent '" . $agent->{'nombre'} . "' module '" . $module->{'nombre'} . "' agent " . (defined ($agent) ? "'" . $agent->{'nombre'} . "'" : 'ID ' . $module->{'id_agente'}) . ".", 3);
return undef;
}
return $data; return $data;
} }
# Not a number # Not a number
if (! is_numeric ($data)) { if (! is_numeric ($data)) {
logger($pa_config, "Received invalid data '" . $data_object->{'data'} . "' from agent '" . $agent->{'nombre'} . "' module '" . $module->{'nombre'} . "' agent " . (defined ($agent) ? "'" . $agent->{'nombre'} . "'" : 'ID ' . $module->{'id_agente'}) . ".", 3);
return undef; return undef;
} }
@ -3306,12 +3310,14 @@ sub process_data ($$$$$$) {
$data =~ s/\,/\./; $data =~ s/\,/\./;
# Out of bounds # Out of bounds
return undef if (($module->{'max'} != $module->{'min'}) && if (($module->{'max'} != $module->{'min'}) && ($data > $module->{'max'} || $data < $module->{'min'})) {
($data > $module->{'max'} || $data < $module->{'min'})); logger($pa_config, "Received invalid data '" . $data_object->{'data'} . "' from agent '" . $agent->{'nombre'} . "' module '" . $module->{'nombre'} . "' agent " . (defined ($agent) ? "'" . $agent->{'nombre'} . "'" : 'ID ' . $module->{'id_agente'}) . ".", 3);
return undef;
}
# Process INC modules # Process INC modules
if ($module_type =~ m/_inc$/) { if ($module_type =~ m/_inc$/) {
$data = process_inc_data ($pa_config, $data, $module, $utimestamp, $dbh); $data = process_inc_data ($pa_config, $data, $agent, $module, $utimestamp, $dbh);
# No previous data or error. # No previous data or error.
return undef unless defined ($data); return undef unless defined ($data);
@ -3335,7 +3341,7 @@ sub process_data ($$$$$$) {
# Process data of type *_inc. # Process data of type *_inc.
########################################################################## ##########################################################################
sub process_inc_data ($$$$$) { sub process_inc_data ($$$$$) {
my ($pa_config, $data, $module, $utimestamp, $dbh) = @_; my ($pa_config, $data, $agent, $module, $utimestamp, $dbh) = @_;
my $data_inc = get_db_single_row ($dbh, 'SELECT * FROM tagente_datos_inc WHERE id_agente_modulo = ?', $module->{'id_agente_modulo'}); my $data_inc = get_db_single_row ($dbh, 'SELECT * FROM tagente_datos_inc WHERE id_agente_modulo = ?', $module->{'id_agente_modulo'});
@ -3348,10 +3354,22 @@ sub process_inc_data ($$$$$) {
return undef; return undef;
} }
# Out of order data
if ($utimestamp < $data_inc->{'utimestamp'}) {
logger($pa_config, "Received old data for incremental module " . $module->{'nombre'} . "(module id " . $module->{'id_agente_modulo'} . ").", 3);
return undef;
}
# Should not happen
if ($utimestamp == $data_inc->{'utimestamp'}) {
logger($pa_config, "Duplicate timestamp for incremental module " . $module->{'nombre'} . "(module id " . $module->{'id_agente_modulo'} . ").", 3);
return undef;
}
# Negative increment, reset inc data # Negative increment, reset inc data
if ($data < $data_inc->{'datos'} || $utimestamp < $data_inc->{'utimestamp'}) { if ($data < $data_inc->{'datos'}) {
db_do ($dbh, 'UPDATE tagente_datos_inc SET datos = ?, utimestamp = ? WHERE id_agente_modulo = ?', $data, $utimestamp, $module->{'id_agente_modulo'}); db_do ($dbh, 'UPDATE tagente_datos_inc SET datos = ?, utimestamp = ? WHERE id_agente_modulo = ?', $data, $utimestamp, $module->{'id_agente_modulo'});
logger($pa_config, "Discarding data and resetting counter for incremental module " . $module->{'nombre'} . "(module id " . $module->{'id_agente_modulo'} . ").", 10); logger($pa_config, "Discarding data and resetting counter for incremental module " . $module->{'nombre'} . "(module id " . $module->{'id_agente_modulo'} . ").", 3);
# Prevent the module from becoming unknown! # Prevent the module from becoming unknown!
db_do ($dbh, 'UPDATE tagente_estado SET utimestamp = ? WHERE id_agente_modulo = ?', time(), $module->{'id_agente_modulo'}); db_do ($dbh, 'UPDATE tagente_estado SET utimestamp = ? WHERE id_agente_modulo = ?', time(), $module->{'id_agente_modulo'});
@ -3359,9 +3377,6 @@ sub process_inc_data ($$$$$) {
return undef; return undef;
} }
# Should not happen
return undef if ($utimestamp == $data_inc->{'utimestamp'});
# Update inc data # Update inc data
db_do ($dbh, 'UPDATE tagente_datos_inc SET datos = ?, utimestamp = ? WHERE id_agente_modulo = ?', $data, $utimestamp, $module->{'id_agente_modulo'}); db_do ($dbh, 'UPDATE tagente_datos_inc SET datos = ?, utimestamp = ? WHERE id_agente_modulo = ?', $data, $utimestamp, $module->{'id_agente_modulo'});