Merge branch 'master' into 5.0

This commit is contained in:
Alexey Pustovalov
2021-04-27 17:27:44 -04:00
17 changed files with 92 additions and 13 deletions

View File

@ -186,6 +186,7 @@ ZBX_STARTPOLLERSUNREACHABLE=1
ZBX_STARTTRAPPERS=5
ZBX_STARTPINGERS=1
ZBX_STARTDISCOVERERS=1
ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0
ZBX_STARTHTTPPOLLERS=1
ZBX_JAVAGATEWAY=zabbix-java-gateway
ZBX_JAVAGATEWAYPORT=10052