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

2012-02-14 Vanessa Gil <vanessa.gil@artica.es> 

* util/pandora_manage.pl: Changed 'agent_name' and 'module_name' parameters
	to create_event.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5590 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-02-14 11:58:13 +00:00
parent ff8593837b
commit f5aa7172fb
2 changed files with 17 additions and 12 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 @@
2012-02-14 Vanessa Gil <vanessa.gil@artica.es>
* util/pandora_manage.pl: Changed 'agent_name' and 'module_name' parameters
to create_event.
2012-02-14 Sancho Lerena <slerena@artica.es> 2012-02-14 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/Config.pm: Version update. * lib/PandoraFMS/Config.pm: Version update.

22
pandora_server/util/pandora_manage.pl
View File

@ -129,7 +129,7 @@ sub help_screen{
help_screen_line('--disable_eacl', '', 'Disable enterprise ACL system'); help_screen_line('--disable_eacl', '', 'Disable enterprise ACL system');
help_screen_line('--enable_eacl', '', 'Enable enterprise ACL system'); help_screen_line('--enable_eacl', '', 'Enable enterprise ACL system');
print "EVENTS:\n\n" unless $param ne ''; print "EVENTS:\n\n" unless $param ne '';
help_screen_line('--create_event', '<event> <event_type> <agent_name> <module_name> <group_name> [<event_status> <severity> <template_name> <user_name> <comment> <source> <id_extra>]', 'Add event'); help_screen_line('--create_event', '<event> <event_type> <group_name> [<agent_name> <module_name> <event_status> <severity> <template_name> <user_name> <comment> <source> <id_extra>]', 'Add event');
help_screen_line('--validate_event', '<agent_name> <module_name> <datetime_min> <datetime_max> <user_name> <criticity> <template_name>', 'Validate events'); help_screen_line('--validate_event', '<agent_name> <module_name> <datetime_min> <datetime_max> <user_name> <criticity> <template_name>', 'Validate events');
help_screen_line('--validate_event_id', '<event_id>', 'Validate event given a event id'); help_screen_line('--validate_event_id', '<event_id>', 'Validate event given a event id');
help_screen_line('--get_event_info', '<event_id>[<csv_separator>]', 'Show info about a event given a event id'); help_screen_line('--get_event_info', '<event_id>[<csv_separator>]', 'Show info about a event given a event id');
@ -2247,7 +2247,7 @@ sub cli_delete_profile() {
############################################################################## ##############################################################################
sub cli_create_event() { sub cli_create_event() {
my ($event,$event_type,$agent_name,$module_name,$group_name,$event_status,$severity,$template_name, $user_name, $comment, $source, $id_extra) = @ARGV[2..13]; my ($event,$event_type,$group_name,$agent_name,$module_name,$event_status,$severity,$template_name, $user_name, $comment, $source, $id_extra) = @ARGV[2..13];
$event_status = 0 unless defined($event_status); $event_status = 0 unless defined($event_status);
$severity = 0 unless defined($severity); $severity = 0 unless defined($severity);
@ -2264,22 +2264,22 @@ sub cli_create_event() {
my $id_agent; my $id_agent;
if (defined($agent_name) && $agent_name ne "") { if (!defined($agent_name)) {
$id_agent = 0;
}
else {
$id_agent = get_agent_id($dbh,$agent_name); $id_agent = get_agent_id($dbh,$agent_name);
exist_check($id_agent,'agent',$agent_name); exist_check($id_agent,'agent',$agent_name);
} else {
$id_agent = 0;
} }
my $id_agentmodule; my $id_agentmodule;
if (defined($module_name) && $module_name ne "") { if (!defined($module_name)) {
$id_agentmodule = 0;
}
else {
$id_agentmodule = get_agent_module_id($dbh,$module_name,$id_agent); $id_agentmodule = get_agent_module_id($dbh,$module_name,$id_agent);
exist_check($id_agentmodule,'module',$module_name); exist_check($id_agentmodule,'module',$module_name);
} else {
$id_agentmodule = 0;
} }
my $id_alert_agent_module; my $id_alert_agent_module;
@ -3245,7 +3245,7 @@ sub pandora_manage_main ($$$) {
cli_delete_profile(); cli_delete_profile();
} }
elsif ($param eq '--create_event') { elsif ($param eq '--create_event') {
param_check($ltotal, 12, 7); param_check($ltotal, 12, 9);
cli_create_event(); cli_create_event();
} }
elsif ($param eq '--validate_event') { elsif ($param eq '--validate_event') {