Added new token examples: transfer_timeout and secondary_transfer_timeout.

pandora_agents/unix/FreeBSD/pandora_agent.conf

@@ -68,40 +68,43 @@ server_port	41121
 # Transfer mode: tentacle, ftp, ssh or local 
 transfer_mode tentacle
 
+# timeout in seconds for file transfer programs execution (30 by default)
+#transfer_timeout 30
+
 # Server password (Tentacle or FTP). Leave empty for no password (default).
-# server_pwd mypassword
+#server_pwd mypassword
 
 # Set to yes/no to enable/disable OpenSSL support for Tentacle (disabled by default).
-# server_ssl no
+#server_ssl no
 
 # Extra options for the Tentacle client (for example, server_opts "-v -r 5").
-# server_opts
+#server_opts
 
 # delayed_startup defines number of seconds before start execution
 # for first time when startup Pandora FMS Agent
-# delayed_startup 10
+#delayed_startup 10
 
 # Pandora nice defines priority of execution. Less priority means more intensive execution
 # A recommended value is 10. 0 priority means no Pandora CPU protection enabled (default)
-# pandora_nice 0
+#pandora_nice 0
 
 # Cron mode replace Pandora FMS own task schedule each XX interval seconds by the use
 # of old style cron. You should add to crontab Pandora FMS agent script to use this mode.
 # This is disabled by default, and is not recommended.  Use Pandora FMS internal scheduler
 # is much more safe.
-# cron_mode 
+#cron_mode 
 
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
-# remote_config 1
+#remote_config 1
 
 # If set to 1 start Drone Agent's Proxy Mode
-# proxy_mode 1
+#proxy_mode 1
 
 # Max number of simmultaneus connection for proxy (by default 10)
-# proxy_max_connection 10
+#proxy_max_connection 10
 
 # Proxy timeout (by default 1s)
-# proxy_timeout 1
+#proxy_timeout 1
 
 # Number of threads to execute modules in parallel
 #agent_threads 1
@@ -109,20 +112,21 @@ transfer_mode tentacle
 # User the agent will run as
 #pandora_user root
 
-# Secondary server configuration
-# ==============================
+#Secondary server configuration
+#==============================
 
 # If secondary_mode is set to on_error, data files are copied to the secondary
 # server only if the primary server fails. If set to always, data files are
 # always copied to the secondary server.
-# secondary_mode on_error
-# secondary_server_ip localhost
-# secondary_server_path /var/spool/pandora/data_in
-# secondary_server_port 41121
-# secondary_transfer_mode tentacle
-# secondary_server_pwd mypassword
-# secondary_server_ssl no
-# secondary_server_opts
+#secondary_mode on_error
+#secondary_server_ip localhost
+#secondary_server_path /var/spool/pandora/data_in
+#secondary_server_port 41121
+#secondary_transfer_mode tentacle
+#secondary_transfer_timeout 30
+#secondary_server_pwd mypassword
+#secondary_server_ssl no
+#secondary_server_opts
 
 # Module Definition
 # =================

pandora_agents/unix/Linux/pandora_agent.conf

@@ -94,6 +94,9 @@ server_port	41121
 # Transfer mode: tentacle, ftp, ssh or local 
 transfer_mode tentacle
 
+# timeout in seconds for file transfer programs execution (30 by default) 
+#transfer_timeout 30
+
 # Server password (Tentacle or FTP). Leave empty for no password (default).
 #server_pwd mypassword
 
@@ -154,6 +157,7 @@ temporal_min_size 1024
 #secondary_server_path /var/spool/pandora/data_in
 #secondary_server_port 41121
 #secondary_transfer_mode tentacle
+#secondary_transfer_timeout 30
 #secondary_server_pwd mypassword
 #secondary_server_ssl no
 #secondary_server_opts

pandora_agents/unix/NetBSD/pandora_agent.conf

@@ -64,40 +64,43 @@ server_port	41121
 # Transfer mode: tentacle, ftp, ssh or local 
 transfer_mode tentacle
 
+# timeout in seconds for file transfer programs execution (30 by default)
+#transfer_timeout 30
+
 # Server password (Tentacle or FTP). Leave empty for no password (default).
-# server_pwd mypassword
+#server_pwd mypassword
 
 # Set to yes/no to enable/disable OpenSSL support for Tentacle (disabled by default).
-# server_ssl no
+#server_ssl no
 
 # Extra options for the Tentacle client (for example, server_opts "-v -r 5").
-# server_opts
+#server_opts
 
 # delayed_startup defines number of seconds before start execution
 # for first time when startup Pandora FMS Agent
-# delayed_startup 10
+#delayed_startup 10
 
 # Pandora nice defines priority of execution. Less priority means more intensive execution
 # A recommended value is 10. 0 priority means no Pandora CPU protection enabled (default)
-# pandora_nice 0
+#pandora_nice 0
 
 # Cron mode replace Pandora FMS own task schedule each XX interval seconds by the use
 # of old style cron. You should add to crontab Pandora FMS agent script to use this mode.
 # This is disabled by default, and is not recommended.  Use Pandora FMS internal scheduler
 # is much more safe.
-# cron_mode 
+#cron_mode 
 
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
-# remote_config 1
+#remote_config 1
 
 # If set to 1 start Drone Agent's Proxy Mode
-# proxy_mode 1
+#proxy_mode 1
 
 # Max number of simmultaneus connection for proxy (by default 10)
-# proxy_max_connection 10
+#proxy_max_connection 10
 
 # Proxy timeout (by default 1s)
-# proxy_timeout 1
+#proxy_timeout 1
 
 # Number of threads to execute modules in parallel
 #agent_threads 1
@@ -111,14 +114,15 @@ transfer_mode tentacle
 # If secondary_mode is set to on_error, data files are copied to the secondary
 # server only if the primary server fails. If set to always, data files are
 # always copied to the secondary server.
-# secondary_mode on_error
-# secondary_server_ip localhost
-# secondary_server_path /var/spool/pandora/data_in
-# secondary_server_port 41121
-# secondary_transfer_mode tentacle
-# secondary_server_pwd mypassword
-# secondary_server_ssl no
-# secondary_server_opts
+#secondary_mode on_error
+#secondary_server_ip localhost
+#secondary_server_path /var/spool/pandora/data_in
+#secondary_server_port 41121
+#secondary_transfer_mode tentacle
+#secondary_transfer_timeout 30
+#secondary_server_pwd mypassword
+#secondary_server_ssl no
+#secondary_server_opts
 
 # Module Definition
 # =================

pandora_agents/unix/SunOS/pandora_agent.conf

@@ -58,40 +58,43 @@ server_port	41121
 # Transfer mode: tentacle, ftp, ssh or local 
 transfer_mode tentacle
 
+# timeout in seconds for file transfer programs execution (30 by default)
+#transfer_timeout 30
+
 # Server password (Tentacle or FTP). Leave empty for no password (default).
-# server_pwd mypassword
+#server_pwd mypassword
 
 # Set to yes/no to enable/disable OpenSSL support for Tentacle (disabled by default).
-# server_ssl no
+#server_ssl no
 
 # Extra options for the Tentacle client (for example, server_opts "-v -r 5").
-# server_opts
+#server_opts
 
 # delayed_startup defines number of seconds before start execution
 # for first time when startup Pandora FMS Agent
-# delayed_startup 10
+#delayed_startup 10
 
 # Pandora nice defines priority of execution. Less priority means more intensive execution
 # A recommended value is 10. 0 priority means no Pandora CPU protection enabled (default)
-# pandora_nice 0
+#pandora_nice 0
 
 # Cron mode replace Pandora FMS own task schedule each XX interval seconds by the use
 # of old style cron. You should add to crontab Pandora FMS agent script to use this mode.
 # This is disabled by default, and is not recommended.  Use Pandora FMS internal scheduler
 # is much more safe.
-# cron_mode 
+#cron_mode 
 
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
-# remote_config 1
+#remote_config 1
 
 # If set to 1 start Drone Agent's Proxy Mode 
-# proxy_mode 1
+#proxy_mode 1
 
 # Max number of simmultaneus connection for proxy (by default 10)
-# proxy_max_connection 10
+#proxy_max_connection 10
 
 # Proxy timeout (by default 1s)
-# proxy_timeout 1
+#proxy_timeout 1
 
 # User the agent will run as
 #pandora_user root
@@ -102,14 +105,15 @@ transfer_mode tentacle
 # If secondary_mode is set to on_error, data files are copied to the secondary
 # server only if the primary server fails. If set to always, data files are
 # always copied to the secondary server.
-# secondary_mode on_error
-# secondary_server_ip localhost
-# secondary_server_path /var/spool/pandora/data_in
-# secondary_server_port 41121
-# secondary_transfer_mode tentacle
-# secondary_server_pwd mypassword
-# secondary_server_ssl no
-# secondary_server_opts
+#secondary_mode on_error
+#secondary_server_ip localhost
+#secondary_server_path /var/spool/pandora/data_in
+#secondary_server_port 41121
+#secondary_transfer_mode tentacle
+#secondary_transfer_timeout 30
+#secondary_server_pwd mypassword
+#secondary_server_ssl no
+#secondary_server_opts
 
 # Module Definition
 # =================

pandora_agents/win32/bin/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2014 Artica Soluciones Tecnologicas 
-# Version 6.0dev
+# Version 6.0dev
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
@@ -62,6 +62,9 @@ interval 300
 transfer_mode tentacle
 server_port 41121
 
+# timeout in seconds for file transfer programs execution (30 by default)
+#transfer_timeout 30
+
 # In case of using FTP or tentacle with password. User is always "pandora"
 #server_pwd pandora
 
@@ -98,6 +101,7 @@ xml_buffer 1
 #secondary_server_path /var/spool/pandora/data_in
 #secondary_server_port 41121
 #secondary_transfer_mode tentacle
+#secondary_transfer_timeout 30
 #secondary_server_pwd mypassword
 #secondary_server_ssl no
 #secondary_server_opts