2009-11-19 Sancho Lerena <slerena@artica.es>

* lib/PandoraFMS/Core.pm: Added id_alert to alert macros. Could be
        useful to pass a numeric ID to do alert correlation externally to 
        Pandora FMS.

        * util/plugin/ssh_pandoraplugin.sh: Fixed bug in user parameter 
        processing. Thanks Victoria.

        * util/plugin/udp_nmap_plugin.sh: Removed output of errors.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2117 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_server/ChangeLog

@@ -1,3 +1,14 @@
+2009-11-19  Sancho Lerena <slerena@artica.es>
+
+	* lib/PandoraFMS/Core.pm: Added id_alert to alert macros. Could be
+	useful to pass a numeric ID to do alert correlation externally to 
+	Pandora FMS.
+
+	* util/plugin/ssh_pandoraplugin.sh: Fixed bug in user parameter 
+	processing. Thanks Victoria.
+
+	* util/plugin/udp_nmap_plugin.sh: Removed output of errors.
+
 2009-11-19  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/Core.pm: Check for empty module/agent when processing

pandora_server/lib/PandoraFMS/Core.pm

@@ -462,6 +462,7 @@ sub pandora_execute_action ($$$$$$$$) {
 				  _module_ => (defined ($module)) ? $module->{'nombre'} : '',
 				  _moduledescription_ => (defined ($module)) ? $module->{'descripcion'} : '',
 				  _id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', 
+				  _id_alert_ => $alert->{'id'}   
 				 );
 
 

pandora_server/util/plugin/ssh_pandoraplugin.sh

@@ -3,7 +3,7 @@
 # (c) Sancho Lerena 2008-2009
 
 # Default values
-USER=""
+USER="root"
 HOST=""
 COMMAND=""
 PORT=22
@@ -39,7 +39,7 @@ while getopts ":hp:t:c:u:" optname
 	        help
 	;;
       "u")
-		PORT=$OPTARG
+		USER=$OPTARG
         ;;
       "t")
 		HOST=$OPTARG

pandora_server/util/plugin/udp_nmap_plugin.sh

@@ -50,5 +50,5 @@ while getopts ":hp:t:" optname
 done
 
 # execution
-nmap -T5 -p $PORT -sU $HOST | grep open | wc -l
+nmap -T5 -p $PORT -sU $HOST | grep open | wc -l 2> /dev/null