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

2013-10-28 Hirofumi Kosaka <kosaka@rworks.jp> 

* lib/PandoraFMS/Core.pm: Added _timezone_ alert macro.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8964 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2013-10-28 09:07:23 +00:00
parent 45f9ebbb21
commit 253300aaf9
2 changed files with 5 additions and 0 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 @@
2013-10-28 Hirofumi Kosaka <kosaka@rworks.jp>
* lib/PandoraFMS/Core.pm: Added _timezone_ alert macro.
2013-10-22 Hirofumi Kosaka <kosaka@rworks.jp> 2013-10-22 Hirofumi Kosaka <kosaka@rworks.jp>
* util/pandora_migrate_plugins.pl: Added optional command-line * util/pandora_migrate_plugins.pl: Added optional command-line

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

@ -792,6 +792,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
_agentstatus_ => (defined ($agent)) ? get_agent_status ($pa_config, $dbh, $agent->{'id_agente'}) : '', _agentstatus_ => (defined ($agent)) ? get_agent_status ($pa_config, $dbh, $agent->{'id_agente'}) : '',
_address_ => (defined ($agent)) ? $agent->{'direccion'} : '', _address_ => (defined ($agent)) ? $agent->{'direccion'} : '',
_timestamp_ => (defined($timestamp)) ? $timestamp : strftime ("%Y-%m-%d %H:%M:%S", localtime()), _timestamp_ => (defined($timestamp)) ? $timestamp : strftime ("%Y-%m-%d %H:%M:%S", localtime()),
_timezone_ => strftime ("%Z", localtime()),
_data_ => $data, _data_ => $data,
_alert_name_ => $alert->{'name'}, _alert_name_ => $alert->{'name'},
_alert_description_ => $alert->{'description'}, _alert_description_ => $alert->{'description'},