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

2014-08-06 Alejandro Gallardo <alejandro.gallardo@artica.es> 

* lib/PandoraFMS/NetworkServer.pm: Little syntax fix.

	* util/pandora_revent_create.pl: Changed the url encode
	separator of the api call from "," to "|".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10386 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
alexhigh 2014-08-06 18:01:48 +00:00
parent ded9780100
commit cc0e58b47b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_server/ChangeLog
View File

@ -1,3 +1,10 @@
2014-08-06 Alejandro Gallardo <alejandro.gallardo@artica.es>
* lib/PandoraFMS/NetworkServer.pm: Little syntax fix.
* util/pandora_revent_create.pl: Changed the url encode
separator of the api call from "," to "|".
2014-08-06 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/NetworkServer.pm: Rewrote TCP module socket code for

2
pandora_server/lib/PandoraFMS/NetworkServer.pm
View File

@ -356,7 +356,7 @@ sub pandora_query_snmp ($$$) {
return (undef, 0) unless ($snmp_oid ne '');
if ($snmp_oid =~ m/[a-zA-Z]/) {
$snmp_oid = translate_obj ($pa_config, $dbh, $snmp_oid, );
$snmp_oid = translate_obj ($pa_config, $dbh, $snmp_oid);
# Could not translate OID, disable the module
if (! defined ($snmp_oid) || $snmp_oid eq '') {

4
pandora_server/util/pandora_revent_create.pl
View File

@ -232,9 +232,9 @@ sub tool_api_main () {
$i++;
}
$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;
$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;
$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;
#DEBUG TRACE#