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

2014-09-02 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Core.pm: Added the macros _agentcustomid_ and
	  _modulecustomid_.
This commit is contained in:
Ramon Novoa 2014-09-02 18:21:48 +02:00
parent 58435e6135
commit 4dff787be0
2 changed files with 7 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 @@
2014-09-02 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added the macros _agentcustomid_ and
_modulecustomid_.
2014-08-27 Hirofumi Kosaka <kosaka@rworks.jp> 2014-08-27 Hirofumi Kosaka <kosaka@rworks.jp>
* lib/PandoraFMS/PluginServer.pm: Fixed that _plugin_param2_ * lib/PandoraFMS/PluginServer.pm: Fixed that _plugin_param2_

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

@ -833,6 +833,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
_field9_ => $field9, _field9_ => $field9,
_field10_ => $field10, _field10_ => $field10,
_agent_ => (defined ($agent)) ? $agent->{'nombre'} : '', _agent_ => (defined ($agent)) ? $agent->{'nombre'} : '',
_agentcustomid_ => (defined ($agent)) ? $agent->{'custom_id'} : '',
_agentdescription_ => (defined ($agent)) ? $agent->{'comentarios'} : '', _agentdescription_ => (defined ($agent)) ? $agent->{'comentarios'} : '',
_agentgroup_ => (defined ($group)) ? $group->{'nombre'} : '', _agentgroup_ => (defined ($group)) ? $group->{'nombre'} : '',
_agentstatus_ => (defined ($agent)) ? get_agent_status ($pa_config, $dbh, $agent->{'id_agente'}) : '', _agentstatus_ => (defined ($agent)) ? get_agent_status ($pa_config, $dbh, $agent->{'id_agente'}) : '',
@ -851,6 +852,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
_groupcontact_ => (defined ($group)) ? $group->{'contact'} : '', _groupcontact_ => (defined ($group)) ? $group->{'contact'} : '',
_groupother_ => (defined ($group)) ? $group->{'other'} : '', _groupother_ => (defined ($group)) ? $group->{'other'} : '',
_module_ => (defined ($module)) ? $module->{'nombre'} : '', _module_ => (defined ($module)) ? $module->{'nombre'} : '',
_modulecustomid_ => (defined ($module)) ? $module->{'custom_id'} : '',
_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'} : '',
_modulestatus_ => (defined ($module)) ? get_agentmodule_status_str($pa_config, $dbh, $module->{'id_agente_modulo'}) : '', _modulestatus_ => (defined ($module)) ? get_agentmodule_status_str($pa_config, $dbh, $module->{'id_agente_modulo'}) : '',