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

2014-01-16 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Core.pm: Allow intervals to infinity when configuring
	  alert actions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9328 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2014-01-16 16:09:09 +00:00
parent 850cd7c6f4
commit 4d3adfccb1
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2014-01-16 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Allow intervals to infinity when configuring
alert actions.
2014-01-15 Ramon Novoa <rnovoa@artica.es>
* bin/pandora_server: Prevent the thread that executes periodic tasks

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

@ -616,8 +616,9 @@ sub pandora_execute_alert ($$$$$$$$;$) {
AND talert_actions.id_alert_command = talert_commands.id
AND talert_template_module_actions.id_alert_template_module = ?
AND ((fires_min = 0 AND fires_max = 0)
OR (? >= fires_min AND ? <= fires_max))',
$alert->{'id_template_module'}, $alert->{'times_fired'}, $alert->{'times_fired'});
OR (fires_min <= fires_max AND ? >= fires_min AND ? <= fires_max)
OR (fires_min > fires_max AND ? >= fires_min))',
$alert->{'id_template_module'}, $alert->{'times_fired'}, $alert->{'times_fired'}, $alert->{'times_fired'});
# Get default action
if ($#actions < 0) {
@ -634,8 +635,9 @@ sub pandora_execute_alert ($$$$$$$$;$) {
AND talert_actions.id_alert_command = talert_commands.id
AND tevent_alert_action.id_event_alert = ?
AND ((fires_min = 0 AND fires_max = 0)
OR (? >= fires_min AND ? <= fires_max))',
$alert->{'id'}, $alert->{'times_fired'}, $alert->{'times_fired'});
OR (fires_min <= fires_max AND ? >= fires_min AND ? <= fires_max)
OR (fires_min > fires_max AND ? >= fires_min))',
$alert->{'id'}, $alert->{'times_fired'}, $alert->{'times_fired'}, $alert->{'times_fired'});
# Get default action
if ($#actions < 0) {