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

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

* lib/PandoraFMS/Core.pm: Restored the _id_alert_ macro. Thanks to
	  Koichiro.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5048 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2011-10-06 09:14:39 +00:00
parent c06b9b5e59
commit 3a2eb2ef0f
2 changed files with 6 additions and 0 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 @@
2011-10-06 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Restored the _id_alert_ macro. Thanks to
Koichiro.
2011-10-06 Koichiro KIKUCHI <koichiro@rworks.jp> 2011-10-06 Koichiro KIKUCHI <koichiro@rworks.jp>
* util/pandora_manage.pl: Added support for specifying ff_threthold * util/pandora_manage.pl: Added support for specifying ff_threthold

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

@ -731,6 +731,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
_modulegroup_ => (defined ($module)) ? (get_module_group_name ($dbh, $module->{'id_module_group'}) || '') : '', _modulegroup_ => (defined ($module)) ? (get_module_group_name ($dbh, $module->{'id_module_group'}) || '') : '',
_moduledescription_ => (defined ($module)) ? $module->{'descripcion'} : '', _moduledescription_ => (defined ($module)) ? $module->{'descripcion'} : '',
_id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', _id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '',
_id_alert_ => $alert->{'id'},
_interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '', _interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '',
_target_ip_ => (defined ($module)) ? $module->{'ip_target'} : '', _target_ip_ => (defined ($module)) ? $module->{'ip_target'} : '',
_target_port_ => (defined ($module)) ? $module->{'tcp_port'} : '', _target_port_ => (defined ($module)) ? $module->{'tcp_port'} : '',