tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '150-SNMP-alert-could-not-refer-agents' into 'develop'

Browse Source 
Bug Fix: SNMP Alert could not refer agents. #150

Closes #150

See merge request !495
This commit is contained in:
nramon 2017-06-28 08:37:53 +02:00
commit 1b5d36d89f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -976,7 +976,9 @@ sub pandora_execute_action ($$$$$$$$$;$) {
_field13_ => $field13, _field13_ => $field13,
_field14_ => $field14, _field14_ => $field14,
_field15_ => $field15, _field15_ => $field15,
_agent_ => (defined ($agent)) ? $agent->{'alias'} : '', _agentname_ => (defined ($agent)) ? $agent->{'nombre'} : '',
_agentalias_ => (defined ($agent)) ? $agent->{'alias'} : '',
_agent_ => (defined ($agent)) ? ($agent->{'alias'} ? $agent->{'alias'} : $agent->{'nombre'}) : '',
_agentcustomid_ => (defined ($agent)) ? $agent->{'custom_id'} : '', _agentcustomid_ => (defined ($agent)) ? $agent->{'custom_id'} : '',
'_agentcustomfield_\d+_' => undef, '_agentcustomfield_\d+_' => undef,
_agentdescription_ => (defined ($agent)) ? $agent->{'comentarios'} : '', _agentdescription_ => (defined ($agent)) ? $agent->{'comentarios'} : '',
@ -1216,6 +1218,9 @@ sub pandora_execute_action ($$$$$$$$$;$) {
} }
$agent_name = subst_alert_macros ($agent_name, \%macros, $pa_config, $dbh, $agent, $module); $agent_name = subst_alert_macros ($agent_name, \%macros, $pa_config, $dbh, $agent, $module);
my $fullagent = get_agent_from_name ($dbh, $agent_name); my $fullagent = get_agent_from_name ($dbh, $agent_name);
if( ! $fullagent && $macros{'_agentname_'} ) {
$fullagent = get_agent_from_name ($dbh, $macros{'_agentname_'} );
}
# Field 5 (priority) # Field 5 (priority)
my $priority = $field5; my $priority = $field5;
@ -3426,6 +3431,7 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
if (defined($this_agent)){ if (defined($this_agent)){
%agent = ( %agent = (
'nombre' => $this_agent->{'nombre'}, 'nombre' => $this_agent->{'nombre'},
'alias' => $this_agent->{'alias'},
'id_agente' => $this_agent->{'id_agente'}, 'id_agente' => $this_agent->{'id_agente'},
'direccion' => $trap_agent, 'direccion' => $trap_agent,
'id_grupo' => $this_agent->{'id_grupo'}, 'id_grupo' => $this_agent->{'id_grupo'},