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

Alerts in slots

This commit is contained in:
fbsanchez 2022-02-02 11:29:25 +01:00
parent 5060d0b8f7
commit 5804d2f404
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -550,16 +550,32 @@ sub pandora_evaluate_alert ($$$$$$$;$$$$) {
else { else {
return $status if ($alert->{$DayNames[$wday]} != 1); return $status if ($alert->{$DayNames[$wday]} != 1);
} }
# Check time slot my $schedule = PandoraFMS::Tools::p_decode_json($pa_config, $alert->{'schedule'});
return $status unless defined($schedule) && ref $schedule eq "HASH";
return $status unless defined($schedule->{$DayNames[$wday]});
return $status unless ref($schedule->{$DayNames[$wday]}) eq "ARRAY";
my $time = sprintf ("%.2d:%.2d:%.2d", $hour, $min, $sec); my $time = sprintf ("%.2d:%.2d:%.2d", $hour, $min, $sec);
if (($alert->{'time_from'} ne $alert->{'time_to'})) {
if ($alert->{'time_from'} lt $alert->{'time_to'}) { #
return $status if (($time le $alert->{'time_from'}) || ($time ge $alert->{'time_to'})); # Check time slots
} else { #
return $status if (($time le $alert->{'time_from'}) && ($time ge $alert->{'time_to'})); my $inSlot = 0;
foreach my $timeBlock (@{$schedule->{$DayNames[$wday]}}) {
if ($timeBlock->{'start'} eq $timeBlock->{'end'}) {
# All day.
$inSlot = 1;
} elsif ($timeBlock->{'start'} le $time && $timeBlock->{'end'} ge $time) {
# In range.
$inSlot = 1;
} }
} }
return $status if $inSlot eq 0;
# Check time threshold # Check time threshold
my $limit_utimestamp = $alert->{'last_reference'} + $alert->{'time_threshold'}; my $limit_utimestamp = $alert->{'last_reference'} + $alert->{'time_threshold'};