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

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

* lib/PandoraFMS/Core.pm: Added dynamic macros for agent custom fields.
This commit is contained in:
Ramon Novoa 2014-09-03 16:22:15 +02:00
parent ba29c61846
commit c30d468bb9
2 changed files with 11 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 @@
2014-09-03 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added dynamic macros for agent custom fields.
2014-09-02 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added support for loading complex macros on

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

@ -834,6 +834,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
_field10_ => $field10,
_agent_ => (defined ($agent)) ? $agent->{'nombre'} : '',
_agentcustomid_ => (defined ($agent)) ? $agent->{'custom_id'} : '',
'_agentcustomfield_\d+_' => undef,
_agentdescription_ => (defined ($agent)) ? $agent->{'comentarios'} : '',
_agentgroup_ => (defined ($group)) ? $group->{'nombre'} : '',
_agentstatus_ => undef,
@ -3280,6 +3281,12 @@ sub on_demand_macro($$$$$$) {
return (defined ($module)) ? pandora_get_module_phone_tags ($pa_config, $dbh, $module->{'id_agente_modulo'}) : '';
} elsif ($macro eq '_name_tag_') {
return (defined ($module)) ? pandora_get_module_tags ($pa_config, $dbh, $module->{'id_agente_modulo'}) : '';
} elsif ($macro =~ /_agentcustomfield_(\d+)_/) {
return '' unless defined ($agent);
my $field_number = $1;
my $field_value = get_db_value($dbh, 'SELECT description FROM tagent_custom_data WHERE id_field=? AND id_agent=?', $field_number, $agent->{'id_agente'});
return (defined($field_value)) ? $field_value : '';
}
}