mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-12-15 19:10:54 +01:00
Merge branch 'master' into trunk
This commit is contained in:
commit
b9b17484f8
@ -167,6 +167,7 @@ ZBX_PROXYHEARTBEATFREQUENCY=60
|
||||
ZBX_CONFIGFREQUENCY=3600
|
||||
ZBX_DATASENDERFREQUENCY=1
|
||||
ZBX_STARTPOLLERS=5
|
||||
ZBX_STARTPREPROCESSORS=3 # Available since 4.2.0
|
||||
ZBX_IPMIPOLLERS=0
|
||||
ZBX_STARTPOLLERSUNREACHABLE=1
|
||||
ZBX_STARTTRAPPERS=5
|
||||
@ -176,6 +177,7 @@ ZBX_STARTHTTPPOLLERS=1
|
||||
ZBX_JAVAGATEWAY=zabbix-java-gateway
|
||||
ZBX_JAVAGATEWAYPORT=10052
|
||||
ZBX_STARTJAVAPOLLERS=0
|
||||
ZBX_STATSALLOWEDIP= # Available since 4.0.5
|
||||
ZBX_STARTVMWARECOLLECTORS=0
|
||||
ZBX_VMWAREFREQUENCY=60
|
||||
ZBX_VMWAREPERFFREQUENCY=60
|
||||
|
@ -167,6 +167,7 @@ ZBX_PROXYHEARTBEATFREQUENCY=60
|
||||
ZBX_CONFIGFREQUENCY=3600
|
||||
ZBX_DATASENDERFREQUENCY=1
|
||||
ZBX_STARTPOLLERS=5
|
||||
ZBX_STARTPREPROCESSORS=3 # Available since 4.2.0
|
||||
ZBX_IPMIPOLLERS=0
|
||||
ZBX_STARTPOLLERSUNREACHABLE=1
|
||||
ZBX_STARTTRAPPERS=5
|
||||
@ -176,6 +177,7 @@ ZBX_STARTHTTPPOLLERS=1
|
||||
ZBX_JAVAGATEWAY=zabbix-java-gateway
|
||||
ZBX_JAVAGATEWAYPORT=10052
|
||||
ZBX_STARTJAVAPOLLERS=0
|
||||
ZBX_STATSALLOWEDIP= # Available since 4.0.5
|
||||
ZBX_STARTVMWARECOLLECTORS=0
|
||||
ZBX_VMWAREFREQUENCY=60
|
||||
ZBX_VMWAREPERFFREQUENCY=60
|
||||
|
@ -167,6 +167,7 @@ ZBX_PROXYHEARTBEATFREQUENCY=60
|
||||
ZBX_CONFIGFREQUENCY=3600
|
||||
ZBX_DATASENDERFREQUENCY=1
|
||||
ZBX_STARTPOLLERS=5
|
||||
ZBX_STARTPREPROCESSORS=3 # Available since 4.2.0
|
||||
ZBX_IPMIPOLLERS=0
|
||||
ZBX_STARTPOLLERSUNREACHABLE=1
|
||||
ZBX_STARTTRAPPERS=5
|
||||
@ -176,6 +177,7 @@ ZBX_STARTHTTPPOLLERS=1
|
||||
ZBX_JAVAGATEWAY=zabbix-java-gateway
|
||||
ZBX_JAVAGATEWAYPORT=10052
|
||||
ZBX_STARTJAVAPOLLERS=0
|
||||
ZBX_STATSALLOWEDIP= # Available since 4.0.5
|
||||
ZBX_STARTVMWARECOLLECTORS=0
|
||||
ZBX_VMWAREFREQUENCY=60
|
||||
ZBX_VMWAREPERFFREQUENCY=60
|
||||
|
@ -131,6 +131,7 @@ ZBX_PROXYHEARTBEATFREQUENCY=60
|
||||
ZBX_CONFIGFREQUENCY=3600
|
||||
ZBX_DATASENDERFREQUENCY=1
|
||||
ZBX_STARTPOLLERS=5
|
||||
ZBX_STARTPREPROCESSORS=3 # Available since 4.2.0
|
||||
ZBX_IPMIPOLLERS=0
|
||||
ZBX_STARTPOLLERSUNREACHABLE=1
|
||||
ZBX_STARTTRAPPERS=5
|
||||
@ -140,6 +141,7 @@ ZBX_STARTHTTPPOLLERS=1
|
||||
ZBX_JAVAGATEWAY=zabbix-java-gateway
|
||||
ZBX_JAVAGATEWAYPORT=10052
|
||||
ZBX_STARTJAVAPOLLERS=0
|
||||
ZBX_STATSALLOWEDIP= # Available since 4.0.5
|
||||
ZBX_STARTVMWARECOLLECTORS=0
|
||||
ZBX_VMWAREFREQUENCY=60
|
||||
ZBX_VMWAREPERFFREQUENCY=60
|
||||
|
@ -131,6 +131,7 @@ ZBX_PROXYHEARTBEATFREQUENCY=60
|
||||
ZBX_CONFIGFREQUENCY=3600
|
||||
ZBX_DATASENDERFREQUENCY=1
|
||||
ZBX_STARTPOLLERS=5
|
||||
ZBX_STARTPREPROCESSORS=3 # Available since 4.2.0
|
||||
ZBX_IPMIPOLLERS=0
|
||||
ZBX_STARTPOLLERSUNREACHABLE=1
|
||||
ZBX_STARTTRAPPERS=5
|
||||
@ -140,6 +141,7 @@ ZBX_STARTHTTPPOLLERS=1
|
||||
ZBX_JAVAGATEWAY=zabbix-java-gateway
|
||||
ZBX_JAVAGATEWAYPORT=10052
|
||||
ZBX_STARTJAVAPOLLERS=0
|
||||
ZBX_STATSALLOWEDIP= # Available since 4.0.5
|
||||
ZBX_STARTVMWARECOLLECTORS=0
|
||||
ZBX_VMWAREFREQUENCY=60
|
||||
ZBX_VMWAREPERFFREQUENCY=60
|
||||
|
@ -131,6 +131,7 @@ ZBX_PROXYHEARTBEATFREQUENCY=60
|
||||
ZBX_CONFIGFREQUENCY=3600
|
||||
ZBX_DATASENDERFREQUENCY=1
|
||||
ZBX_STARTPOLLERS=5
|
||||
ZBX_STARTPREPROCESSORS=3 # Available since 4.2.0
|
||||
ZBX_IPMIPOLLERS=0
|
||||
ZBX_STARTPOLLERSUNREACHABLE=1
|
||||
ZBX_STARTTRAPPERS=5
|
||||
@ -140,6 +141,7 @@ ZBX_STARTHTTPPOLLERS=1
|
||||
ZBX_JAVAGATEWAY=zabbix-java-gateway
|
||||
ZBX_JAVAGATEWAYPORT=10052
|
||||
ZBX_STARTJAVAPOLLERS=0
|
||||
ZBX_STATSALLOWEDIP= # Available since 4.0.5
|
||||
ZBX_STARTVMWARECOLLECTORS=0
|
||||
ZBX_VMWAREFREQUENCY=60
|
||||
ZBX_VMWAREPERFFREQUENCY=60
|
||||
|
Loading…
Reference in New Issue
Block a user