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

2013-06-14 Sergio Martin <sergio.martin@artica.es> 

* lib/PandoraFMS/Core.pm: Fixed comments addition in the
	events with the internal action Create Pandora FMS event



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8328 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-06-14 10:47:26 +00:00
parent f2d28ff90e
commit 5add503841
2 changed files with 14 additions and 1 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 @@
2013-06-14 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Fixed comments addition in the
events with the internal action Create Pandora FMS event
2013-06-13 SAncho Lerena <alerena@artica.es>
* pandora_server.redhat.spec: Fixed some path permissions.

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

@ -893,6 +893,14 @@ sub pandora_execute_action ($$$$$$$$$;$) {
# Field 8 (comments);
my $comment = $field8;
if($comment ne '') {
# Get datetime for the comment of the event
my $datetime = strftime( "%F, %H:%M:%S %p", localtime(time));
# This format is necessary for the ugly parser of event comments. Will be changed in the future to json
$comment = "<b>-- Added comment by an alert [" . $datetime . "] --</b><br><div>" . $comment . "</div>";
}
pandora_event ($pa_config, $event_text, (defined ($agent) ? $agent->{'id_grupo'} : 0), (defined ($fullagent) ? $fullagent->{'id_agente'} : 0), $priority, 0, 0, $event_type, 0, $dbh, $source, '', $comment, $id_extra, $tags);
# Validate event (field1: agent name; field2: module name)
} elsif ($clean_name eq "Validate Event") {
@ -3490,7 +3498,7 @@ sub pandora_process_event_replication ($) {
# Get the metaconsole DB connection
my $dbh_metaconsole = enterprise_hook('get_metaconsole_dbh', [$pa_config, $dbh]);
if($dbh_metaconsole eq '') {
logger($pa_config, "Metaconsole DB connection error. Event replication thread will be aborted.", 1);
return;