From e015b84ba143e1ba60b224bfa260bb36c4495824 Mon Sep 17 00:00:00 2001 From: jsatoh Date: Sun, 8 Jun 2014 00:55:21 +0000 Subject: [PATCH] 2014-06-08 Junichi Satoh * FreeBSD/pandora_server.conf, NetBSD/pandora_server.conf: Updated default settings as the same as Linux ones. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10140 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 7 +++- pandora_server/FreeBSD/pandora_server.conf | 46 +++++++++++----------- pandora_server/NetBSD/pandora_server.conf | 46 +++++++++++----------- 3 files changed, 52 insertions(+), 47 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index b2da11efce..9a443398d2 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,4 +1,9 @@ -2014-06-05 Sergio Martin +2014-06-08 Junichi Satoh + + * FreeBSD/pandora_server.conf, NetBSD/pandora_server.conf: Updated + default settings as the same as Linux ones. + +014-06-05 Sergio Martin * lib/PandoraFMS/PluginServer.pm lib/PandoraFMS/Core.pm: Add tags name macro to alerts and plugins. diff --git a/pandora_server/FreeBSD/pandora_server.conf b/pandora_server/FreeBSD/pandora_server.conf index eb049a2a1a..ae6c8dd292 100644 --- a/pandora_server/FreeBSD/pandora_server.conf +++ b/pandora_server/FreeBSD/pandora_server.conf @@ -1,9 +1,9 @@ ############################################################################# # Pandora FMS Server Parameters # Pandora FMS, the Flexible Monitoring System. -# Version 5.0dev +# Version 5.1BETA1 # Licensed under GPL license v2, -# (c) 2003-2013 Artica Soluciones Tecnologicas +# (c) 2003-2014 Artica Soluciones Tecnologicas # http://www.pandorafms.com # Please change it for your setup needs ############################################################################# @@ -12,7 +12,7 @@ # if not given, it takes hostname. It's preferable to setup one # because machine name could change by some reason. -#servername adama +#servername greystone # incomingdir: Defines directory where incoming data packets are stored # You could set directory relative to base path or absolute, starting with / @@ -61,14 +61,14 @@ dbpass pandora # dbhost: Database hostname or IP address -dbhost localhost +dbhost 127.0.0.1 # dbport: Database port number # Default value depends on the dbengine (mysql: 3306, postgresql: 5432, oracle: 1521) #dbport 3306 -# By default, parent agent will not update +# By default, parent agent will not be updated #update_parent 0 @@ -122,7 +122,7 @@ predictionserver 0 # wmiserver : 1 or 0. Set to 1 to activate WMI server with this setup # DISABLED BY DEFAULT -wmiserver 0 +wmiserver 1 # wmic: Needed by Pandora FMS wmi server. @@ -130,7 +130,7 @@ wmi_client /usr/local/bin/wmic # Network timeout (in seconds) for timeout in network connections for Network agents -network_timeout 5 +network_timeout 4 # Server keepalive (in seconds) @@ -142,7 +142,7 @@ server_threshold 5 # Network threads: Do not set too high (~40). Each threads make a network module check. -network_threads 3 +network_threads 4 # icmp_checks x : defines number of pings for each icmp_proc module type. at least one of # that ping should be 1 to report 1 @@ -154,14 +154,14 @@ icmp_checks 1 # tcp_timeout: specific timeout for tcp connections tcp_checks 1 -tcp_timeout 30 +tcp_timeout 10 # snmp specific options : # snmp_checks: number of snmp request retries if first attempt fails. # snmp_timeout: specific timeout for snmp request. snmp_checks 1 -snmp_timeout 5 +snmp_timeout 4 # snmp_proc_deadresponse 1 (default): Return DOWN if cannot contact # or receive NULL from a SNMP PROC module. @@ -175,11 +175,11 @@ plugin_threads 1 # plugin_timeout: Specify number of seconds calling plugin exec waiting for response # after this time, call is aborted and result is "unknown". -plugin_timeout 15 +plugin_timeout 12 # wmi_timeout : specific timeout for wmi request. -wmi_timeout 10 +wmi_timeout 7 # wmi_threads: Specify number of WMI server threads for processing WMI remote calls @@ -256,7 +256,7 @@ braa_retries 3 autocreate_group 2 # Set to 1 if want to autocreate agents with Pandora FMS Data Server, -# set to 0 to disable +# set to 0 to disable (for security purposes, for example). autocreate 1 @@ -281,8 +281,8 @@ max_queue_files 500 # Pandora FMS will restart after restart_delay seconds on critical errors. -# restart 0 -# restart_delay 60 +restart 1 +restart_delay 60 # More information about GIS Setup in /usr/share/pandora_server/util/gis.README # Flag to activate GIS (positional information for agents and maps) @@ -372,25 +372,25 @@ event_window 3600 # Enable (1) or disable (0) Pandora FMS Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY). # You need nmap 5.20 or higher in order to use this ! -icmpserver 0 +icmpserver 1 # Number of threads for the Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY). -icmp_threads 2 +icmp_threads 1 # Enable (1) or disable (0) Pandora FMS Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY). # Check braa tool is running and operative. -snmpserver 0 +snmpserver 1 # Number of threads for the Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY). -snmp_threads 2 +snmp_threads 1 # Block size for block producer/consumer servers, that is, the number of modules -# per block (15 by default) (PANDORA FMS ENTERPRISE ONLY). +# per block (20 by default) (PANDORA FMS ENTERPRISE ONLY). -block_size 15 +block_size 20 # Path to the netflow daemon nfcapd. @@ -422,10 +422,10 @@ event_auto_validation 1 # Set the maximum number of traps that will be processed from a single source in a # configured time interval. -#snmp_storm_protection 10 +snmp_storm_protection 25 # Time interval for snmp_storm protection (in seconds). -#snmp_storm_timeout 600 +snmp_storm_timeout 10 # Default texts for some events. The macros _module_ and _data_ are supported. #text_going_down_normal Module '_module_' is going to NORMAL (_data_) diff --git a/pandora_server/NetBSD/pandora_server.conf b/pandora_server/NetBSD/pandora_server.conf index cc1af55f39..f2cec9f11f 100644 --- a/pandora_server/NetBSD/pandora_server.conf +++ b/pandora_server/NetBSD/pandora_server.conf @@ -1,9 +1,9 @@ ############################################################################# # Pandora FMS Server Parameters # Pandora FMS, the Flexible Monitoring System. -# Version 5.0 +# Version 5.1BETA1 # Licensed under GPL license v2, -# (c) 2003-2013 Artica Soluciones Tecnologicas +# (c) 2003-2014 Artica Soluciones Tecnologicas # http://www.pandorafms.com # Please change it for your setup needs ############################################################################# @@ -12,7 +12,7 @@ # if not given, it takes hostname. It's preferable to setup one # because machine name could change by some reason. -#servername adama +#servername greystone # incomingdir: Defines directory where incoming data packets are stored # You could set directory relative to base path or absolute, starting with / @@ -61,14 +61,14 @@ dbpass pandora # dbhost: Database hostname or IP address -dbhost localhost +dbhost 127.0.0.1 # dbport: Database port number # Default value depends on the dbengine (mysql: 3306, postgresql: 5432, oracle: 1521) #dbport 3306 -# By default, parent agent will not update +# By default, parent agent will not be updated #update_parent 0 @@ -122,7 +122,7 @@ predictionserver 0 # wmiserver : 1 or 0. Set to 1 to activate WMI server with this setup # DISABLED BY DEFAULT -wmiserver 0 +wmiserver 1 # wmic: Needed by Pandora FMS wmi server. @@ -130,7 +130,7 @@ wmi_client /usr/local/bin/wmic # Network timeout (in seconds) for timeout in network connections for Network agents -network_timeout 5 +network_timeout 4 # Server keepalive (in seconds) @@ -142,7 +142,7 @@ server_threshold 5 # Network threads: Do not set too high (~40). Each threads make a network module check. -network_threads 3 +network_threads 4 # icmp_checks x : defines number of pings for each icmp_proc module type. at least one of # that ping should be 1 to report 1 @@ -154,14 +154,14 @@ icmp_checks 1 # tcp_timeout: specific timeout for tcp connections tcp_checks 1 -tcp_timeout 30 +tcp_timeout 10 # snmp specific options : # snmp_checks: number of snmp request retries if first attempt fails. # snmp_timeout: specific timeout for snmp request. snmp_checks 1 -snmp_timeout 5 +snmp_timeout 4 # snmp_proc_deadresponse 1 (default): Return DOWN if cannot contact # or receive NULL from a SNMP PROC module. @@ -175,11 +175,11 @@ plugin_threads 1 # plugin_timeout: Specify number of seconds calling plugin exec waiting for response # after this time, call is aborted and result is "unknown". -plugin_timeout 15 +plugin_timeout 12 # wmi_timeout : specific timeout for wmi request. -wmi_timeout 10 +wmi_timeout 7 # wmi_threads: Specify number of WMI server threads for processing WMI remote calls @@ -256,7 +256,7 @@ braa_retries 3 autocreate_group 2 # Set to 1 if want to autocreate agents with Pandora FMS Data Server, -# set to 0 to disable +# set to 0 to disable (for security purposes, for example). autocreate 1 @@ -281,8 +281,8 @@ max_queue_files 500 # Pandora FMS will restart after restart_delay seconds on critical errors. -# restart 0 -# restart_delay 60 +restart 1 +restart_delay 60 # More information about GIS Setup in /usr/share/pandora_server/util/gis.README # Flag to activate GIS (positional information for agents and maps) @@ -372,25 +372,25 @@ event_window 3600 # Enable (1) or disable (0) Pandora FMS Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY). # You need nmap 5.20 or higher in order to use this ! -icmpserver 0 +icmpserver 1 # Number of threads for the Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY). -icmp_threads 2 +icmp_threads 1 # Enable (1) or disable (0) Pandora FMS Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY). # Check braa tool is running and operative. -snmpserver 0 +snmpserver 1 # Number of threads for the Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY). -snmp_threads 2 +snmp_threads 1 # Block size for block producer/consumer servers, that is, the number of modules -# per block (15 by default) (PANDORA FMS ENTERPRISE ONLY). +# per block (20 by default) (PANDORA FMS ENTERPRISE ONLY). -block_size 15 +block_size 20 # Path to the netflow daemon nfcapd. @@ -422,10 +422,10 @@ event_auto_validation 1 # Set the maximum number of traps that will be processed from a single source in a # configured time interval. -#snmp_storm_protection 10 +snmp_storm_protection 25 # Time interval for snmp_storm protection (in seconds). -#snmp_storm_timeout 600 +snmp_storm_timeout 10 # Default texts for some events. The macros _module_ and _data_ are supported. #text_going_down_normal Module '_module_' is going to NORMAL (_data_)