mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-06-20 09:57:43 +02:00
Merge branch 'master' into trunk
This commit is contained in:
commit
2aa8589ea4
@ -48,7 +48,7 @@ RUN set -eux && \
|
|||||||
automake \
|
automake \
|
||||||
libc6-dev \
|
libc6-dev \
|
||||||
make \
|
make \
|
||||||
openjdk-8-jdk \
|
openjdk-8-jdk-headless \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
git \
|
git \
|
||||||
gcc && \
|
gcc && \
|
||||||
|
@ -141,6 +141,8 @@ ZBX_VAULTDBPATH= # Available since 5.2.0
|
|||||||
ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
|
ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
|
||||||
VAULT_TOKEN= # Available since 5.2.0
|
VAULT_TOKEN= # Available since 5.2.0
|
||||||
ZBX_LISTENIP=
|
ZBX_LISTENIP=
|
||||||
|
ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0
|
||||||
|
ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0
|
||||||
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
|
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
|
||||||
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
|
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
|
||||||
ZBX_STARTPOLLERS=5
|
ZBX_STARTPOLLERS=5
|
||||||
@ -174,6 +176,7 @@ ZBX_CACHESIZE=8M
|
|||||||
ZBX_CACHEUPDATEFREQUENCY=60
|
ZBX_CACHEUPDATEFREQUENCY=60
|
||||||
ZBX_STARTDBSYNCERS=4
|
ZBX_STARTDBSYNCERS=4
|
||||||
ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
|
ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
|
||||||
|
ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6
|
||||||
ZBX_HISTORYCACHESIZE=16M
|
ZBX_HISTORYCACHESIZE=16M
|
||||||
ZBX_HISTORYINDEXCACHESIZE=4M
|
ZBX_HISTORYINDEXCACHESIZE=4M
|
||||||
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
|
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
|
||||||
|
@ -141,6 +141,8 @@ ZBX_VAULTDBPATH= # Available since 5.2.0
|
|||||||
ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
|
ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
|
||||||
VAULT_TOKEN= # Available since 5.2.0
|
VAULT_TOKEN= # Available since 5.2.0
|
||||||
ZBX_LISTENIP=
|
ZBX_LISTENIP=
|
||||||
|
ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0
|
||||||
|
ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0
|
||||||
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
|
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
|
||||||
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
|
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
|
||||||
ZBX_STARTPOLLERS=5
|
ZBX_STARTPOLLERS=5
|
||||||
@ -174,6 +176,7 @@ ZBX_CACHESIZE=8M
|
|||||||
ZBX_CACHEUPDATEFREQUENCY=60
|
ZBX_CACHEUPDATEFREQUENCY=60
|
||||||
ZBX_STARTDBSYNCERS=4
|
ZBX_STARTDBSYNCERS=4
|
||||||
ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
|
ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
|
||||||
|
ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6
|
||||||
ZBX_HISTORYCACHESIZE=16M
|
ZBX_HISTORYCACHESIZE=16M
|
||||||
ZBX_HISTORYINDEXCACHESIZE=4M
|
ZBX_HISTORYINDEXCACHESIZE=4M
|
||||||
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
|
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
|
||||||
|
@ -141,6 +141,8 @@ ZBX_VAULTDBPATH= # Available since 5.2.0
|
|||||||
ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
|
ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
|
||||||
VAULT_TOKEN= # Available since 5.2.0
|
VAULT_TOKEN= # Available since 5.2.0
|
||||||
ZBX_LISTENIP=
|
ZBX_LISTENIP=
|
||||||
|
ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0
|
||||||
|
ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0
|
||||||
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
|
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
|
||||||
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
|
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
|
||||||
ZBX_STARTPOLLERS=5
|
ZBX_STARTPOLLERS=5
|
||||||
@ -174,6 +176,7 @@ ZBX_CACHESIZE=8M
|
|||||||
ZBX_CACHEUPDATEFREQUENCY=60
|
ZBX_CACHEUPDATEFREQUENCY=60
|
||||||
ZBX_STARTDBSYNCERS=4
|
ZBX_STARTDBSYNCERS=4
|
||||||
ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
|
ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
|
||||||
|
ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6
|
||||||
ZBX_HISTORYCACHESIZE=16M
|
ZBX_HISTORYCACHESIZE=16M
|
||||||
ZBX_HISTORYINDEXCACHESIZE=4M
|
ZBX_HISTORYINDEXCACHESIZE=4M
|
||||||
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
|
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
|
||||||
|
@ -138,6 +138,8 @@ ZBX_VAULTDBPATH= # Available since 5.2.0
|
|||||||
ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
|
ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
|
||||||
VAULT_TOKEN= # Available since 5.2.0
|
VAULT_TOKEN= # Available since 5.2.0
|
||||||
ZBX_LISTENIP=
|
ZBX_LISTENIP=
|
||||||
|
ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0
|
||||||
|
ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0
|
||||||
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
|
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
|
||||||
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
|
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
|
||||||
ZBX_STARTPOLLERS=5
|
ZBX_STARTPOLLERS=5
|
||||||
@ -171,6 +173,7 @@ ZBX_CACHESIZE=8M
|
|||||||
ZBX_CACHEUPDATEFREQUENCY=60
|
ZBX_CACHEUPDATEFREQUENCY=60
|
||||||
ZBX_STARTDBSYNCERS=4
|
ZBX_STARTDBSYNCERS=4
|
||||||
ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
|
ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
|
||||||
|
ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6
|
||||||
ZBX_HISTORYCACHESIZE=16M
|
ZBX_HISTORYCACHESIZE=16M
|
||||||
ZBX_HISTORYINDEXCACHESIZE=4M
|
ZBX_HISTORYINDEXCACHESIZE=4M
|
||||||
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
|
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
|
||||||
|
@ -138,6 +138,8 @@ ZBX_VAULTDBPATH= # Available since 5.2.0
|
|||||||
ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
|
ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
|
||||||
VAULT_TOKEN= # Available since 5.2.0
|
VAULT_TOKEN= # Available since 5.2.0
|
||||||
ZBX_LISTENIP=
|
ZBX_LISTENIP=
|
||||||
|
ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0
|
||||||
|
ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0
|
||||||
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
|
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
|
||||||
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
|
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
|
||||||
ZBX_STARTPOLLERS=5
|
ZBX_STARTPOLLERS=5
|
||||||
@ -171,6 +173,7 @@ ZBX_CACHESIZE=8M
|
|||||||
ZBX_CACHEUPDATEFREQUENCY=60
|
ZBX_CACHEUPDATEFREQUENCY=60
|
||||||
ZBX_STARTDBSYNCERS=4
|
ZBX_STARTDBSYNCERS=4
|
||||||
ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
|
ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
|
||||||
|
ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6
|
||||||
ZBX_HISTORYCACHESIZE=16M
|
ZBX_HISTORYCACHESIZE=16M
|
||||||
ZBX_HISTORYINDEXCACHESIZE=4M
|
ZBX_HISTORYINDEXCACHESIZE=4M
|
||||||
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
|
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
|
||||||
|
@ -138,6 +138,8 @@ ZBX_VAULTDBPATH= # Available since 5.2.0
|
|||||||
ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
|
ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
|
||||||
VAULT_TOKEN= # Available since 5.2.0
|
VAULT_TOKEN= # Available since 5.2.0
|
||||||
ZBX_LISTENIP=
|
ZBX_LISTENIP=
|
||||||
|
ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0
|
||||||
|
ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0
|
||||||
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
|
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
|
||||||
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
|
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
|
||||||
ZBX_STARTPOLLERS=5
|
ZBX_STARTPOLLERS=5
|
||||||
@ -171,6 +173,7 @@ ZBX_CACHESIZE=8M
|
|||||||
ZBX_CACHEUPDATEFREQUENCY=60
|
ZBX_CACHEUPDATEFREQUENCY=60
|
||||||
ZBX_STARTDBSYNCERS=4
|
ZBX_STARTDBSYNCERS=4
|
||||||
ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
|
ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
|
||||||
|
ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6
|
||||||
ZBX_HISTORYCACHESIZE=16M
|
ZBX_HISTORYCACHESIZE=16M
|
||||||
ZBX_HISTORYINDEXCACHESIZE=4M
|
ZBX_HISTORYINDEXCACHESIZE=4M
|
||||||
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
|
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user