diff --git a/templates/config/agent2_windows/zabbix_agent2.conf b/templates/config/agent2_windows/zabbix_agent2.conf index b37d2ba6..3f6805d7 100644 --- a/templates/config/agent2_windows/zabbix_agent2.conf +++ b/templates/config/agent2_windows/zabbix_agent2.conf @@ -20,6 +20,7 @@ Include=C:\zabbix\conf\zabbix_agent2_locations.conf Include=C:\zabbix\conf\zabbix_agent2_logging.conf Include=C:\zabbix\conf\zabbix_agent2_network.conf Include=C:\zabbix\conf\zabbix_agent2_passive_checks.conf +Include=C:\zabbix\conf\zabbix_agent2_perf_counters.conf Include=C:\zabbix\conf\zabbix_agent2_timeouts.conf Include=C:\zabbix\conf\zabbix_agent2_tls.conf Include=C:\zabbix\conf\zabbix_agent2_user_parameters.conf diff --git a/templates/config/agent2_windows/zabbix_agent2_active_checks.conf b/templates/config/agent2_windows/zabbix_agent2_active_checks.conf index 13decb18..f51a3c47 100644 --- a/templates/config/agent2_windows/zabbix_agent2_active_checks.conf +++ b/templates/config/agent2_windows/zabbix_agent2_active_checks.conf @@ -3,9 +3,9 @@ ### Option: ServerActive # Zabbix server/proxy address or cluster configuration to get active checks from. # Server/proxy address is IP address or DNS name and optional port separated by colon. -# Cluster configuration is one or more server addresses separated by semicolon. +# Cluster configuration is one or more server or proxy group member addresses separated by semicolon. # Multiple Zabbix servers/clusters and Zabbix proxies can be specified, separated by comma. -# More than one Zabbix proxy should not be specified from each Zabbix server/cluster. +# Unless using proxy groups, more than one Zabbix proxy should not be specified from each Zabbix server/cluster. # If Zabbix proxy is specified then Zabbix server/cluster for that proxy should not be specified. # Multiple comma-delimited addresses can be provided to use several independent Zabbix servers in parallel. Spaces are allowed. # If port is not specified, default port is used. @@ -14,6 +14,8 @@ # If this parameter is not specified, active checks are disabled. # Example for Zabbix proxy: # ServerActive=127.0.0.1:10051 +# Example for Zabbix proxy group: +# ServerActive=proxy1.example.com;proxy2.example.com;proxy3.example.com;proxy4.example.com;proxy5.example.com # Example for multiple servers: # ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] # Example for high availability: @@ -123,6 +125,7 @@ BufferSend=${ZBX_BUFFERSEND} ### Option: BufferSize # Maximum number of values in a memory buffer. The agent will send # all collected data to Zabbix Server or Proxy if the buffer is full. +# Option is not valid if EnablePersistentBuffer=1 # # Mandatory: no # Range: 2-65535 diff --git a/templates/config/agent2_windows/zabbix_agent2_logging.conf b/templates/config/agent2_windows/zabbix_agent2_logging.conf index c6a4f4be..832adcd2 100644 --- a/templates/config/agent2_windows/zabbix_agent2_logging.conf +++ b/templates/config/agent2_windows/zabbix_agent2_logging.conf @@ -1,6 +1,5 @@ ### Option: LogType # Specifies where log messages are written to: -# system - syslog # file - file specified with LogFile parameter # console - standard output # diff --git a/templates/config/agent2_windows/zabbix_agent2_passive_checks.conf b/templates/config/agent2_windows/zabbix_agent2_passive_checks.conf index cc8b9860..cae83fc6 100644 --- a/templates/config/agent2_windows/zabbix_agent2_passive_checks.conf +++ b/templates/config/agent2_windows/zabbix_agent2_passive_checks.conf @@ -7,8 +7,9 @@ # and '::/0' will allow any IPv4 or IPv6 address. # '0.0.0.0/0' can be used to allow any IPv4 address. # Example: Server=127.0.0.1,192.168.1.0/24,::1,2001:db8::/32,zabbix.example.com +# If left empty or not set will disable passive checks, and Zabbix agent 2 will not listen on the ListenPort. # -# Mandatory: yes, if StartAgents is not explicitly set to 0 +# Mandatory: no # Default: # Server= diff --git a/templates/config/agent2_windows/zabbix_agent2_perf_counters.conf b/templates/config/agent2_windows/zabbix_agent2_perf_counters.conf new file mode 100644 index 00000000..d279f911 --- /dev/null +++ b/templates/config/agent2_windows/zabbix_agent2_perf_counters.conf @@ -0,0 +1,26 @@ +### Option: PerfCounter +# Syntax: ,"", +# Defines new parameter which is an average value for system performance counter for the specified time period (in seconds). +# For example, if you wish to receive average number of processor interrupts per second for last minute, you can define new parameter "interrupts" as following: +# PerfCounter = interrupts,"\Processor(0)\Interrupts/sec",60 +# Please note double quotes around performance counter path. +# Samples for calculating average value will be taken every second. +# You may run "typeperf -qx" to get list of all performance counters available in Windows. +# +# Mandatory: no +# Range: +# Default: + +### Option: PerfCounterEn +# Syntax: ,"", +# Defines new parameter which is an average value for system performance counter for the specified time period (in seconds). +# Unlike PerfCounter, the performance counter path must be specified in English. +# For example, if you wish to receive average number of processor interrupts per second for last minute, you can define new parameter "interrupts" as following: +# PerfCounterEn = interrupts,"\Processor(0)\Interrupts/sec",60 +# Please note double quotes around performance counter path. +# Samples for calculating average value will be taken every second. +# This parameter is supported starting from Windows Server 2008 and Windows Vista. +# +# Mandatory: no +# Range: +# Default: diff --git a/templates/config/agent_windows/zabbix_agentd_active_checks.conf b/templates/config/agent_windows/zabbix_agentd_active_checks.conf index de71dd4b..31332546 100644 --- a/templates/config/agent_windows/zabbix_agentd_active_checks.conf +++ b/templates/config/agent_windows/zabbix_agentd_active_checks.conf @@ -3,9 +3,9 @@ ### Option: ServerActive # Zabbix server/proxy address or cluster configuration to get active checks from. # Server/proxy address is IP address or DNS name and optional port separated by colon. -# Cluster configuration is one or more server addresses separated by semicolon. +# Cluster configuration is one or more server or proxy group member addresses separated by semicolon. # Multiple Zabbix servers/clusters and Zabbix proxies can be specified, separated by comma. -# More than one Zabbix proxy should not be specified from each Zabbix server/cluster. +# Unless using proxy groups, more than one Zabbix proxy should not be specified from each Zabbix server/cluster. # If Zabbix proxy is specified then Zabbix server/cluster for that proxy should not be specified. # Multiple comma-delimited addresses can be provided to use several independent Zabbix servers in parallel. Spaces are allowed. # If port is not specified, default port is used. @@ -14,6 +14,8 @@ # If this parameter is not specified, active checks are disabled. # Example for Zabbix proxy: # ServerActive=127.0.0.1:10051 +# Example for Zabbix proxy group: +# ServerActive=proxy1.example.com;proxy2.example.com;proxy3.example.com;proxy4.example.com;proxy5.example.com # Example for multiple servers: # ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] # Example for high availability: @@ -133,9 +135,9 @@ BufferSize=${ZBX_BUFFERSIZE} ### Option: MaxLinesPerSecond # Maximum number of new lines the agent will send per second to Zabbix Server -# or Proxy processing 'log' and 'logrt' active checks. +# or Proxy processing 'log', 'logrt' and 'eventlog' active checks. # The provided value will be overridden by the parameter 'maxlines', -# provided in 'log' or 'logrt' item keys. +# provided in 'log', 'logrt' or 'eventlog' item keys. # # Mandatory: no # Range: 1-1000 diff --git a/templates/config/agent_windows/zabbix_agentd_perf_counters.conf b/templates/config/agent_windows/zabbix_agentd_perf_counters.conf index d2757e3e..d279f911 100644 --- a/templates/config/agent_windows/zabbix_agentd_perf_counters.conf +++ b/templates/config/agent_windows/zabbix_agentd_perf_counters.conf @@ -10,3 +10,17 @@ # Mandatory: no # Range: # Default: + +### Option: PerfCounterEn +# Syntax: ,"", +# Defines new parameter which is an average value for system performance counter for the specified time period (in seconds). +# Unlike PerfCounter, the performance counter path must be specified in English. +# For example, if you wish to receive average number of processor interrupts per second for last minute, you can define new parameter "interrupts" as following: +# PerfCounterEn = interrupts,"\Processor(0)\Interrupts/sec",60 +# Please note double quotes around performance counter path. +# Samples for calculating average value will be taken every second. +# This parameter is supported starting from Windows Server 2008 and Windows Vista. +# +# Mandatory: no +# Range: +# Default: