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

2011-09-06 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Core.pm: Fixed action search for event alerts.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4925 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2011-09-06 21:51:18 +00:00
parent a28996dd7c
commit 1ac848c483
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_server/ChangeLog
View File

@ -1,3 +1,7 @@
2011-09-06 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Fixed action search for event alerts.
2011-09-06 Ramon Novoa <rnovoa@artica.es> 2011-09-06 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/NmapParser.pm: Remove nmap warnings from output. * lib/PandoraFMS/NmapParser.pm: Remove nmap warnings from output.

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

@ -633,11 +633,10 @@ sub pandora_execute_alert ($$$$$$$$;$) {
@actions = get_db_rows ($dbh, 'SELECT * FROM tevent_alert_action, talert_actions, talert_commands @actions = get_db_rows ($dbh, 'SELECT * FROM tevent_alert_action, talert_actions, talert_commands
WHERE tevent_alert_action.id_alert_action = talert_actions.id WHERE tevent_alert_action.id_alert_action = talert_actions.id
AND talert_actions.id_alert_command = talert_commands.id AND talert_actions.id_alert_command = talert_commands.id
AND tevent_alert_action.id = ? AND tevent_alert_action.id_event_alert = ?
AND ((fires_min = 0 AND fires_max = 0) AND ((fires_min = 0 AND fires_max = 0)
OR (? >= fires_min AND ? <= fires_max))', OR (? >= fires_min AND ? <= fires_max))',
$alert->{'id'}, $alert->{'times_fired'}, $alert->{'times_fired'}); $alert->{'id'}, $alert->{'times_fired'}, $alert->{'times_fired'});
# Get default action # Get default action
if ($#actions < 0) { if ($#actions < 0) {
@actions = get_db_rows ($dbh, 'SELECT * FROM talert_actions, talert_commands @actions = get_db_rows ($dbh, 'SELECT * FROM talert_actions, talert_commands