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

2007-10-08 Sancho Lerena <slerena@gmail.com> 

* lib/PandoraFMS/Config.pm: Updated build number.

        * lib/PandoraFMS/DB.pm: Fixed some problems with alert recovery/expired method,
        that causes to do not recognize expired alerts in some situations (min_alert=0).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@669 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2007-10-08 14:07:51 +00:00
parent e79fbfb592
commit 1570ca0816
3 changed files with 44 additions and 48 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-10-08 Sancho Lerena <slerena@gmail.com>
* lib/PandoraFMS/Config.pm: Updated build number.
* lib/PandoraFMS/DB.pm: Fixed some problems with alert recovery/expired method,
that causes to do not recognize expired alerts in some situations (min_alert=0).
2007-10-04 Sancho Lerena <slerena@gmail.com> 2007-10-04 Sancho Lerena <slerena@gmail.com>
* lib/PandoraFMS/DB.pm: Fixed a missing $ in sub header definition for args :( * lib/PandoraFMS/DB.pm: Fixed a missing $ in sub header definition for args :(

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

@ -35,7 +35,7 @@ our @EXPORT = qw( pandora_help_screen
# 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 = "1.3beta3"; my $pandora_version = "1.3beta3";
my $pandora_build="PS071004"; my $pandora_build="PS071008";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

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

@ -195,7 +195,7 @@ sub pandora_calcula_alerta (%$$$$$$) {
# Check timer threshold for this alert # Check timer threshold for this alert
if ( $flag >= 0 ) { # Out limits !, reset $times_fired, but do not write to if ( $flag >= 0 ) { # Out limits !, reset $times_fired, but do not write to
# database until a real alarm was fired # database until a real alarm was fired
if ($times_fired > 1){ if ($times_fired > 0){
$times_fired = 0; $times_fired = 0;
$internal_counter=0; $internal_counter=0;
} }
@ -208,29 +208,31 @@ sub pandora_calcula_alerta (%$$$$$$) {
if (($internal_counter >= $min_alerts) && ($times_fired < $max_alerts)){ if (($internal_counter >= $min_alerts) && ($times_fired < $max_alerts)){
# The new alert is between last valid time + threshold and between max/min limit to alerts in this gap of time. # The new alert is between last valid time + threshold and between max/min limit to alerts in this gap of time.
$times_fired++; $times_fired++;
# $internal_counter++; # No need increment this more if ($internal_counter == 0){
my $query_idag = "UPDATE talerta_agente_modulo SET times_fired = $times_fired, last_fired = '$ahora_mysql', internal_counter = $internal_counter WHERE id_aam = $id_aam "; $internal_counter++;
$dbh->do($query_idag); }
$dbh->do("UPDATE talerta_agente_modulo SET times_fired = $times_fired, last_fired = '$ahora_mysql', internal_counter = $internal_counter WHERE id_aam = $id_aam");
my $nombre_agente = dame_nombreagente_agentemodulo ($pa_config, $id_agente_modulo, $dbh); my $nombre_agente = dame_nombreagente_agentemodulo ($pa_config, $id_agente_modulo, $dbh);
# -------------------------------------- # --------------------------------------
# Now call to execute_alert to real exec # Now call to execute_alert to real exec
execute_alert ($pa_config, $id_alerta, $campo1, $campo2, $campo3, $nombre_agente, $timestamp, $datos, $comando, $alert_name, $descripcion, $dbh); execute_alert ($pa_config, $id_alerta, $campo1, $campo2, $campo3, $nombre_agente, $timestamp, $datos, $comando, $alert_name, $descripcion, $dbh);
# -------------------------------------- # --------------------------------------
} else { # Alert is in valid timegap but has too many alerts or too many little } else {
# Alert is in valid timegap but has too many alerts
# or too many little
if ($internal_counter < $min_alerts){ if ($internal_counter < $min_alerts){
$internal_counter++; $internal_counter++;
# Now update the new value for times_fired & last_fired if we are below min limit for triggering this alert # Now update new value for times_fired & last_fired
my $query_idag = "UPDATE talerta_agente_modulo SET times_fired = $times_fired, internal_counter = $internal_counter WHERE id_aam = $id_aam "; # if we are below minlimit for triggering this alert
$dbh->do ($query_idag);
logger ($pa_config, "Alarm not fired because is below min limit",6); logger ($pa_config, "Alarm not fired because is below min limit",6);
} else { # Too many alerts fired (upper limit) } else { # Too many alerts fired (upper limit)
my $query_idag = "UPDATE talerta_agente_modulo SET times_fired = $times_fired, internal_counter = $internal_counter WHERE id_aam = $id_aam ";
$dbh->do($query_idag);
logger ($pa_config, "Alarm not fired because is above max limit",6); logger ($pa_config, "Alarm not fired because is above max limit",6);
} }
$dbh->do("UPDATE talerta_agente_modulo SET times_fired = $times_fired, internal_counter = $internal_counter WHERE id_aam = $id_aam");
} }
} # data between alert values }
else { # This block is executed because actual data is OUTSIDE limits that trigger alert (so, valid data) else { # This block is executed because actual data is OUTSIDE
# limits that trigger alert (so, it is valid data)
# Check timegap # Check timegap
my $fecha_ultima_alerta = ParseDate($last_fired); my $fecha_ultima_alerta = ParseDate($last_fired);
my $fecha_actual = ParseDate( $timestamp ); my $fecha_actual = ParseDate( $timestamp );
@ -243,45 +245,32 @@ sub pandora_calcula_alerta (%$$$$$$) {
# Check timer threshold for this alert # Check timer threshold for this alert
if ( $flag >= 0 ) { if ( $flag >= 0 ) {
# This is late, we need to reset alert NOW # This is late, we need to reset alert NOW
my $temp_aam_check = give_db_value ( "internal_counter", "talerta_agente_modulo", "id_aam", $id_aam, $dbh); # Create event for alert ceased only if has been fired.
if ($temp_aam_check > 0){ # If not, simply restore counters to 0
if ($times_fired > 0){
my $evt_descripcion = "Alert ceased - Expired ($descripcion)"; my $evt_descripcion = "Alert ceased - Expired ($descripcion)";
pandora_event ($pa_config, $evt_descripcion, $id_grupo, $id_agente, $dbh); pandora_event ($pa_config, $evt_descripcion, $id_grupo, $id_agente, $dbh);
# Out limits !, reset $times_fired, but do not write to
# database until a real alarm was fired
my $query_idag = "UPDATE talerta_agente_modulo SET times_fired = 0, internal_counter = 0 WHERE id_aam = $id_aam ";
$dbh->do($query_idag);
} }
} else { } else {
# We're running on timegap, so check if we're above limit or below # We're running on timegap, so check if we're above
my $temp_aam_check = give_db_value ( "internal_counter", "talerta_agente_modulo", "id_aam", $id_aam, $dbh); # limit or below. If we don't have any alert fired,
my $times_fired_check = give_db_value ( "times_fired", "talerta_agente_modulo", "id_aam", $id_aam, $dbh); # skip other checks
my $query_idag; if ($times_fired > 0){
# If we don't have any alert fired, skip other checks
if ($times_fired_check > 0){
$temp_aam_check--;
if ($temp_aam_check <= 0) {
my $evt_descripcion = "Alert ceased - Recovered ($descripcion)"; my $evt_descripcion = "Alert ceased - Recovered ($descripcion)";
pandora_event ($pa_config, $evt_descripcion, $id_grupo, $id_agente, $dbh); pandora_event ($pa_config, $evt_descripcion, $id_grupo, $id_agente, $dbh);
$query_idag = "UPDATE talerta_agente_modulo SET internal_counter = 0, times_fired =0 WHERE id_aam = $id_aam ";
$dbh->do($query_idag);
} else {
# Decrease counter
$query_idag = "UPDATE talerta_agente_modulo SET internal_counter = $temp_aam_check WHERE id_aam = $id_aam ";
$dbh->do($query_idag);
} }
} }
if (($times_fired > 0) || ($internal_counter > 0)){
$dbh->do("UPDATE talerta_agente_modulo SET internal_counter = 0, times_fired =0 WHERE id_aam = $id_aam");
} }
} }
} # timecheck (outside time limits for this alert) } # timecheck (outside time limits for this alert)
else { # Outside operative alert timeslot else { # Outside operative alert timeslot
my $temp_aam_check = give_db_value ( "internal_counter", "talerta_agente_modulo", "id_aam", $id_aam, $dbh); if ($times_fired > 0){
if ($temp_aam_check > 0){ my $evt_descripcion2 = "Alert ceased - Run out of valid alert timegap ($descripcion)";
my $query_idag = "UPDATE talerta_agente_modulo SET times_fired = 0, internal_counter = 0 WHERE id_aam = $id_aam "; pandora_event ($pa_config, $evt_descripcion2, $id_grupo, $id_agente, $dbh);
$dbh->do($query_idag);
my $evt_descripcion = "Alert ceased - Run out of valid alert timegap ($descripcion)";
pandora_event ($pa_config, $evt_descripcion, $id_grupo, $id_agente, $dbh);
} }
$dbh->do("UPDATE talerta_agente_modulo SET internal_counter = 0, times_fired =0 WHERE id_aam = $id_aam");
} }
} # While principal } # While principal
} # if there are valid records } # if there are valid records