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

Fixed SNMP alerts. All matched alerts with same position will be trown

This commit is contained in:
fermin831 2015-11-04 17:33:13 +01:00
parent 84c7837935
commit ae7d073da7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2933,11 +2933,18 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
# Get all SNMP alerts # Get all SNMP alerts
my @snmp_alerts = get_db_rows ($dbh, 'SELECT * FROM talert_snmp ORDER BY position ASC'); my @snmp_alerts = get_db_rows ($dbh, 'SELECT * FROM talert_snmp ORDER BY position ASC');
my $fired_position;
# Find those that apply to the given SNMP trap # Find those that apply to the given SNMP trap
foreach my $alert (@snmp_alerts) { foreach my $alert (@snmp_alerts) {
my $alert_data = ''; my $alert_data = '';
# Check if one alert has been thrown. If there is another with same position, tries to throw it.
if (defined($fired_position)) {
last if ($fired_position != $alert->{'position'});
}
my ($times_fired, $internal_counter, $alert_type) = my ($times_fired, $internal_counter, $alert_type) =
($alert->{'times_fired'}, $alert->{'internal_counter'}, $alert->{'alert_type'}); ($alert->{'times_fired'}, $alert->{'internal_counter'}, $alert->{'alert_type'});
@ -3214,8 +3221,8 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
} }
} }
# Do not execute more than one alert per trap $fired_position = $alert->{'position'};
last;
} }
} }