Merge branch 'master' into trunk

This commit is contained in:
Alexey Pustovalov
2021-04-23 01:23:34 +05:00
14 changed files with 52 additions and 1 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

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

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