From 7be24e805185dc543fe9cbaf55a1b8c8d6ff58f6 Mon Sep 17 00:00:00 2001 From: vgilc Date: Thu, 16 Feb 2012 09:47:19 +0000 Subject: [PATCH] 2012-02-16 Vanessa Gil * util/pandora_manage.pl: Changed user comment format. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5610 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 4 ++++ pandora_server/util/pandora_manage.pl | 3 +++ 2 files changed, 7 insertions(+) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index c494571bd5..1fb056b287 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,7 @@ +2012-02-16 Vanessa Gil + + * util/pandora_manage.pl: Changed user comment format. + 2012-02-16 Hirofumi Kosaka * bin/tentacle_server: Upgraded to 0.3.0 (Merged from diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 46d6961c09..7819674e9e 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -2304,6 +2304,9 @@ sub cli_create_event() { $id_alert_agent_module = 0; } + if (defined($comment) && $comment ne '') { + $comment = '-- Added comment by '.$user_name.' -- '.$comment; + } print "[INFO] Adding event '$event' for agent '$agent_name' \n\n"; pandora_event ($conf, $event, $id_group, $id_agent, $severity,