diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog index 9614d198fd..868edde1d4 100644 --- a/pandora_agents/unix/ChangeLog +++ b/pandora_agents/unix/ChangeLog @@ -1,3 +1,8 @@ +2014-01-15 Sergio Martin + + * pandora_revent: Update unix agent pandora_revent script + to be compatible with api function of last version. Incident #347 + 2013-11-12 Ramon Novoa * pandora_agent: Completely integrated plug-ins with modules. diff --git a/pandora_agents/unix/pandora_revent b/pandora_agents/unix/pandora_revent index 2490e4759e..beed23a18c 100755 --- a/pandora_agents/unix/pandora_revent +++ b/pandora_agents/unix/pandora_revent @@ -41,11 +41,9 @@ Where options:\n Optional parameters: [-agent ] : Agent ID - [-agent_name ] : Set agent by name (Exact match!) [-user ] : User comment (use in combination with -comment option) [-status ] : 0 New, 1 Validated, 2 In process [-am ] : ID Agent Module linked to event - [-module_name ] : Name of the module linked to the event (You need or ) [-alert ] : ID Alert Module linked to event [-criticity ] : 0 Maintance, 1 Informative, 2 Normal, 3 Warning, 4 Crit, 5 Minor, 6 Major @@ -53,7 +51,6 @@ Optional parameters: [-comment ] : Free text for comment [-tag ] : Tag (must exist in the system to be imported) [-source ] : (By default 'Pandora') - [-extra ] [-c_instructions ] [-w_instructions ] [-u_instructions ] @@ -67,7 +64,7 @@ Optional parameters: print "\t$0 -p http://192.168.70.160/pandora_console/include/api.php -u pot12,admin,pandora \ \t-create_event -name \"Sample event executed from commandline\" -group 2 -type \"system\" -agent 2 \ \t-user \"admin\" -status 0 -am 0 -alert 9 -criticity 3 -comment \"User comments\" -tag \"tags\" \ -\t-source \"Commandline\" -extra 3 -c_instructions \"Critical instructions\" \ +\t-source \"Commandline\" -c_instructions \"Critical instructions\" \ \t-w_instructions \"Warning instructions\" -u_instructions \"Unknown instructions\" -owner \"other\" "; print "\n\nOptions to validate event: \n\n\t"; @@ -180,7 +177,6 @@ sub tool_api_main () { help_screen (); } else { $id_group = $ARGV[8]; - $data_event = $id_group; } #~ id group (required) @@ -189,9 +185,9 @@ sub tool_api_main () { help_screen (); } else { $event_type = $ARGV[10]; - $data_event .= ",".$event_type; } + # -agent_name, -module_name and -extra are not supported by api. Maybe in the future my $i = 0; foreach (@ARGV) { my $line = $_; @@ -245,8 +241,8 @@ sub tool_api_main () { } $i++; } - - $data_event .= ",".$id_agent.",".$agent_name.",".$id_user.",".$status.",".$id_agent_module.",".$module_name.",".$id_alert_am.",".$criticity.",".$user_comment.",".$tags.",".$source.",".$id_extra.",".$critical_instructions.",".$warning_instructions.",".$unknown_instructions.",".$owner_user; + + $data_event .= $event_name.",".$id_group.",".$id_agent.",".$status.",".$id_user.",".$event_type.",".$criticity.",".$id_agent_module.",".$id_alert_am.",".$critical_instructions.",".$warning_instructions.",".$unknown_instructions.",".$user_comment.",".$owner_user.",".$source.",".$tags.","; $call_api = $api_path.'?op=set&op2=create_event&id='.$event_name.'&other='.$data_event.'&other_mode=url_encode_separator_,&apipass='.$api_pass.'&user='.$db_user.'&pass='.$db_pass; } elsif ($ARGV[4] eq '-validate_event') {