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

2012-11-28 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Core.pm: Added fired alert count.

	* lib/PandoraFMS/DataServer.pm: Do not process more than one XML from
	  the same agent at the same time.

	* util/pandora_db.pl: Recalculate total module count.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7196 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2012-11-28 14:33:26 +00:00
parent 8b7c5b8e7f
commit 21dd3eb0e3
4 changed files with 61 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_server/ChangeLog
View File

@ -1,3 +1,12 @@
2012-11-28 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added fired alert count.
* lib/PandoraFMS/DataServer.pm: Do not process more than one XML from
the same agent at the same time.
* util/pandora_db.pl: Recalculate total module count.
2012-11-26 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Core.pm: Fixed unintended executions and wrong event

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

@ -476,6 +476,11 @@ sub pandora_process_alert ($$$$$$$$;$) {
db_do($dbh, 'UPDATE ' . $table . ' SET times_fired = 0,
internal_counter = 0 WHERE id = ?', $id);
# Update fired alert count
if (defined ($agent)) {
db_do ($dbh, 'UPDATE tagente SET fired_count=fired_count-1 WHERE id_agente=?', $agent->{'id_agente'});
}
# Critical_instructions, warning_instructions, unknown_instructions
my $critical_instructions = get_db_value ($dbh, 'SELECT critical_instructions FROM tagente_modulo WHERE id_agente_modulo = ?', $alert->{'id_agent_module'});
my $warning_instructions = get_db_value ($dbh, 'SELECT warning_instructions FROM tagente_modulo WHERE id_agente_modulo = ?', $alert->{'id_agent_module'});
@ -509,6 +514,11 @@ sub pandora_process_alert ($$$$$$$$;$) {
db_do($dbh, 'UPDATE talert_template_module_actions SET last_execution = 0 WHERE id_alert_template_module = ?', $id);
}
# Update fired alert count
if (defined ($agent)) {
db_do ($dbh, 'UPDATE tagente SET fired_count=fired_count-1 WHERE id_agente=?', $agent->{'id_agente'});
}
pandora_execute_alert ($pa_config, $data, $agent, $module, $alert, 0, $dbh, $timestamp, $extra_macros);
return;
}
@ -550,6 +560,12 @@ sub pandora_process_alert ($$$$$$$$;$) {
db_do($dbh, 'UPDATE ' . $table . ' SET times_fired = ?,
last_fired = ?, internal_counter = ? ' . $new_interval . ' WHERE id = ?',
$alert->{'times_fired'}, $utimestamp, $alert->{'internal_counter'}, $id);
# Update fired alert count
if (defined ($agent)) {
db_do ($dbh, 'UPDATE tagente SET fired_count=fired_count+1 WHERE id_agente=?', $agent->{'id_agente'});
}
pandora_execute_alert ($pa_config, $data, $agent, $module, $alert, 1, $dbh, $timestamp, $extra_macros);
return;
}

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

@ -45,6 +45,7 @@ our @ISA = qw(PandoraFMS::ProducerConsumerServer);
# Global variables
my @TaskQueue :shared;
my %PendingTasks :shared;
my %Agents :shared;
my $Sem :shared = Thread::Semaphore->new;
my $TaskSem :shared = Thread::Semaphore->new (0);
my $AgentSem :shared = Thread::Semaphore->new (1);
@ -96,8 +97,18 @@ sub data_producer ($) {
while (my $file = readdir (DIR)) {
# Data files must have the extension .data
next if ($file !~ /^.*\.data$/);
next if ($file !~ /^(.*)[\._]\d+\.data$/);
# Do not process more than one XML from the same agent at the same time
my $agent_name = $1;
$AgentSem->down ();
if (defined ($Agents{$agent_name})) {
$AgentSem->up ();
next;
}
$Agents{$agent_name} = 1;
$AgentSem->up ();
push (@files, $file);
$file_count++;
@ -128,6 +139,8 @@ sub data_consumer ($$) {
my ($self, $task) = @_;
my ($pa_config, $dbh) = ($self->getConfig (), $self->getDBH ());
return unless ($task =~ /^(.*)[\._]\d+\.data$/);
my $agent_name = $1;
my $file_name = $pa_config->{'incomingdir'};
my $xml_err;
@ -136,7 +149,11 @@ sub data_consumer ($$) {
$file_name .= $task;
# Double check that the file exists
return unless (-f $file_name);
if (! -f $file_name) {
$AgentSem->down ();
delete ($Agents{$agent_name});
$AgentSem->up ();
}
# Try to parse the XML 2 times, with a delay between tries of 2 seconds
my $xml_data;
@ -162,15 +179,25 @@ sub data_consumer ($$) {
$xml_data->{'timestamp'} = strftime ("%Y-%m-%d %H:%M:%S", localtime((stat($file_name))[9])) if ($pa_config->{'use_xml_timestamp'} eq '1' || ! defined ($xml_data->{'timestamp'}));
# Double check that the file exists
return unless (-f $file_name);
if (! -f $file_name) {
$AgentSem->down ();
delete ($Agents{$agent_name});
$AgentSem->up ();
}
unlink ($file_name);
process_xml_data ($self->getConfig (), $file_name, $xml_data, $self->getServerID (), $self->getDBH ());
$AgentSem->down ();
delete ($Agents{$agent_name});
$AgentSem->up ();
return;
}
rename($file_name, $file_name . '_BADXML');
pandora_event ($pa_config, "Unable to process XML data file '$file_name': $xml_err", 0, 0, 0, 0, 0, 'error', 0, $dbh);
$AgentSem->down ();
delete ($Agents{$agent_name});
$AgentSem->up ();
}
###############################################################################
@ -303,12 +330,10 @@ sub process_xml_data ($$$$$) {
$address = $data->{'address'} if (defined ($data->{'address'}));
# Get agent id
$AgentSem->down ();
my $agent_id = get_agent_id ($dbh, $agent_name);
if ($agent_id < 1) {
if ($pa_config->{'autocreate'} == 0) {
logger($pa_config, "ERROR: There is no agent defined with name $agent_name", 3);
$AgentSem->up ();
return;
}
@ -320,7 +345,6 @@ sub process_xml_data ($$$$$) {
$group_id = $pa_config->{'autocreate_group'};
if (! defined (get_group_name ($dbh, $group_id))) {
logger($pa_config, "Group id $group_id does not exist (check autocreate_group config token)", 3);
$AgentSem->up ();
return;
}
}
@ -344,7 +368,6 @@ sub process_xml_data ($$$$$) {
$description, $interval, $dbh, $timezone_offset, $longitude, $latitude, $altitude, $position_description, $custom_id, $url_address);
if (! defined ($agent_id)) {
$AgentSem->up ();
return;
}
@ -377,7 +400,6 @@ sub process_xml_data ($$$$$) {
}
}
}
$AgentSem->up ();
# Check if agent is disabled and return if it's disabled. Disabled agents doesnt process data
# in order to avoid not only events, also possible invalid data coming from agents.

11
pandora_server/util/pandora_db.pl
View File

@ -538,11 +538,12 @@ sub pandora_checkdb_consistency {
my @agents = get_db_rows ($dbh, 'SELECT id_agente FROM tagente');
foreach my $agent (@agents) {
my $id_agente = $agent->{'id_agente'};
db_do ($dbh, 'UPDATE tagente SET normal_count=(SELECT COUNT(*) FROM tagente_estado WHERE id_agente=' . $id_agente . ' AND estado=0 AND utimestamp<>0),
critical_count=(SELECT COUNT(*) FROM tagente_estado WHERE id_agente=' . $id_agente . ' AND estado=1),
warning_count=(SELECT COUNT(*) FROM tagente_estado WHERE id_agente=' . $id_agente . ' AND estado=2),
unknown_count=(SELECT COUNT(*) FROM tagente_estado WHERE id_agente=' . $id_agente . ' AND estado=3),
notinit_count=(SELECT COUNT(*) FROM tagente_estado WHERE id_agente=' . $id_agente . ' AND utimestamp=0)
db_do ($dbh, 'UPDATE tagente SET normal_count=(SELECT COUNT(*) FROM tagente_estado WHERE id_agente=' . $id_agente . ' AND estado=0 AND utimestamp<>0 AND disabled=0),
critical_count=(SELECT COUNT(*) FROM tagente_estado WHERE id_agente=' . $id_agente . ' AND estado=1 AND disabled=0),
warning_count=(SELECT COUNT(*) FROM tagente_estado WHERE id_agente=' . $id_agente . ' AND estado=2 AND disabled=0),
unknown_count=(SELECT COUNT(*) FROM tagente_estado WHERE id_agente=' . $id_agente . ' AND estado=3 AND disabled=0),
notinit_count=(SELECT COUNT(*) FROM tagente_estado WHERE id_agente=' . $id_agente . ' AND utimestamp=0 AND disabled=0),
total_count=(SELECT COUNT(*) FROM tagente_estado WHERE id_agente=' . $id_agente . ' AND disabled=0)
WHERE id_agente = ' . $id_agente);
}
}