Merge branch 'master' into trunk

This commit is contained in:
Alexey Pustovalov 2019-11-22 15:09:48 +09:00
commit b212ce5351
3 changed files with 6 additions and 0 deletions

View File

@ -137,6 +137,8 @@ Additionally the image allows to specify many other environment variables listed
ZBX_SOURCEIP=
ZBX_ENABLEREMOTECOMMANDS=0
ZBX_LOGREMOTECOMMANDS=0
ZBX_HOSTINTERFACE= # Available since 4.4.0
ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
ZBX_STARTAGENTS=3
ZBX_HOSTNAMEITEM=system.hostname
ZBX_METADATA=

View File

@ -137,6 +137,8 @@ Additionally the image allows to specify many other environment variables listed
ZBX_SOURCEIP=
ZBX_ENABLEREMOTECOMMANDS=0
ZBX_LOGREMOTECOMMANDS=0
ZBX_HOSTINTERFACE= # Available since 4.4.0
ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
ZBX_STARTAGENTS=3
ZBX_HOSTNAMEITEM=system.hostname
ZBX_METADATA=

View File

@ -137,6 +137,8 @@ Additionally the image allows to specify many other environment variables listed
ZBX_SOURCEIP=
ZBX_ENABLEREMOTECOMMANDS=0
ZBX_LOGREMOTECOMMANDS=0
ZBX_HOSTINTERFACE= # Available since 4.4.0
ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
ZBX_STARTAGENTS=3
ZBX_HOSTNAMEITEM=system.hostname
ZBX_METADATA=