From 9909adf5e48864209cd18b2805a532f47e6bf638 Mon Sep 17 00:00:00 2001 From: hkosaka Date: Mon, 28 Oct 2013 09:07:23 +0000 Subject: [PATCH] 2013-10-28 Hirofumi Kosaka * 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 --- pandora_server/ChangeLog | 4 ++++ pandora_server/lib/PandoraFMS/Core.pm | 1 + 2 files changed, 5 insertions(+) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index f00510b6c5..1db2bb0d14 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,7 @@ +2013-10-28 Hirofumi Kosaka + + * lib/PandoraFMS/Core.pm: Added _timezone_ alert macro. + 2013-10-22 Hirofumi Kosaka * util/pandora_migrate_plugins.pl: Added optional command-line diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 573e6d6dc3..f1cd20b65d 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -792,6 +792,7 @@ sub pandora_execute_action ($$$$$$$$$;$) { _agentstatus_ => (defined ($agent)) ? get_agent_status ($pa_config, $dbh, $agent->{'id_agente'}) : '', _address_ => (defined ($agent)) ? $agent->{'direccion'} : '', _timestamp_ => (defined($timestamp)) ? $timestamp : strftime ("%Y-%m-%d %H:%M:%S", localtime()), + _timezone_ => strftime ("%Z", localtime()), _data_ => $data, _alert_name_ => $alert->{'name'}, _alert_description_ => $alert->{'description'},