From 44540aa31a00a54c1ad551f38436b8a246796a27 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 13 Apr 2021 08:32:29 -0400 Subject: [PATCH 01/10] Added note about official documentation examples --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a2d3c659..654734f39 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,9 @@ This repository contains **Dockerfile** of [Zabbix](https://zabbix.com/) for [Do ### Usage -Please follow usage instructions of each Zabbix component image: +There is some documentation and examples in the [official Zabbix Documentation](https://www.zabbix.com/documentation/current/manual/installation/containers)! + +Please also follow usage instructions of each Zabbix component image: * [zabbix-appliance](https://hub.docker.com/r/zabbix/zabbix-appliance/) - Zabbix appliance with built-in MySQL server, Zabbix server, Zabbix Java Gateway and Zabbix frontend based on Nginx web-server > **Important information: Zabbix Docker Appliance has been decommissioned (except Red Hat edition) and will not be available for 3.0.31, 4.0.19, 4.4.7, 5.0.0 and newer releases. Please use a separate Docker images for each component instead of the all-in-one solution.** From de926905d2dc2e622de667ece03b8a68277f8fe9 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 23 Apr 2021 01:04:55 +0500 Subject: [PATCH 02/10] Added Issue template --- .github/ISSUE_TEMPLATE | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE new file mode 100644 index 000000000..337bf9058 --- /dev/null +++ b/.github/ISSUE_TEMPLATE @@ -0,0 +1,37 @@ + + + + +##### SUMMARY + + + +##### OS / ENVIRONMENT / Used docker-compose files + + + +##### CONFIGURATION + + + +##### STEPS TO REPRODUCE + + + +```yaml + +``` + + + +##### EXPECTED RESULTS + + + +##### ACTUAL RESULTS + + + +```paste below + +``` \ No newline at end of file From 401a8d208d083d9f3c067e097862d8f845678b64 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 23 Apr 2021 01:23:22 +0500 Subject: [PATCH 03/10] Added new parameter history pollers for server and proxies --- proxy-mysql/alpine/README.md | 1 + proxy-mysql/centos/README.md | 1 + proxy-mysql/ubuntu/README.md | 1 + proxy-sqlite3/alpine/README.md | 1 + proxy-sqlite3/centos/README.md | 1 + proxy-sqlite3/ubuntu/README.md | 1 + server-mysql/alpine/README.md | 1 + server-mysql/centos/README.md | 1 + server-mysql/ubuntu/README.md | 1 + server-pgsql/alpine/README.md | 1 + server-pgsql/centos/README.md | 1 + server-pgsql/ubuntu/README.md | 1 + 12 files changed, 12 insertions(+) diff --git a/proxy-mysql/alpine/README.md b/proxy-mysql/alpine/README.md index 4f833d846..9172c3eab 100644 --- a/proxy-mysql/alpine/README.md +++ b/proxy-mysql/alpine/README.md @@ -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 diff --git a/proxy-mysql/centos/README.md b/proxy-mysql/centos/README.md index 4f833d846..9172c3eab 100644 --- a/proxy-mysql/centos/README.md +++ b/proxy-mysql/centos/README.md @@ -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 diff --git a/proxy-mysql/ubuntu/README.md b/proxy-mysql/ubuntu/README.md index 4f833d846..9172c3eab 100644 --- a/proxy-mysql/ubuntu/README.md +++ b/proxy-mysql/ubuntu/README.md @@ -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 diff --git a/proxy-sqlite3/alpine/README.md b/proxy-sqlite3/alpine/README.md index 887e93f10..371fbf406 100644 --- a/proxy-sqlite3/alpine/README.md +++ b/proxy-sqlite3/alpine/README.md @@ -144,6 +144,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 diff --git a/proxy-sqlite3/centos/README.md b/proxy-sqlite3/centos/README.md index 887e93f10..371fbf406 100644 --- a/proxy-sqlite3/centos/README.md +++ b/proxy-sqlite3/centos/README.md @@ -144,6 +144,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 diff --git a/proxy-sqlite3/ubuntu/README.md b/proxy-sqlite3/ubuntu/README.md index 887e93f10..371fbf406 100644 --- a/proxy-sqlite3/ubuntu/README.md +++ b/proxy-sqlite3/ubuntu/README.md @@ -144,6 +144,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 diff --git a/server-mysql/alpine/README.md b/server-mysql/alpine/README.md index f672cd64b..2f2ae2371 100644 --- a/server-mysql/alpine/README.md +++ b/server-mysql/alpine/README.md @@ -150,6 +150,7 @@ ZBX_STARTPOLLERSUNREACHABLE=1 ZBX_STARTTRAPPERS=5 ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 +ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 diff --git a/server-mysql/centos/README.md b/server-mysql/centos/README.md index f672cd64b..2f2ae2371 100644 --- a/server-mysql/centos/README.md +++ b/server-mysql/centos/README.md @@ -150,6 +150,7 @@ ZBX_STARTPOLLERSUNREACHABLE=1 ZBX_STARTTRAPPERS=5 ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 +ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 diff --git a/server-mysql/ubuntu/README.md b/server-mysql/ubuntu/README.md index f672cd64b..2f2ae2371 100644 --- a/server-mysql/ubuntu/README.md +++ b/server-mysql/ubuntu/README.md @@ -150,6 +150,7 @@ ZBX_STARTPOLLERSUNREACHABLE=1 ZBX_STARTTRAPPERS=5 ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 +ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 diff --git a/server-pgsql/alpine/README.md b/server-pgsql/alpine/README.md index 2651ce0c8..d4c101a07 100644 --- a/server-pgsql/alpine/README.md +++ b/server-pgsql/alpine/README.md @@ -147,6 +147,7 @@ ZBX_STARTPOLLERSUNREACHABLE=1 ZBX_STARTTRAPPERS=5 ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 +ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 diff --git a/server-pgsql/centos/README.md b/server-pgsql/centos/README.md index 2651ce0c8..d4c101a07 100644 --- a/server-pgsql/centos/README.md +++ b/server-pgsql/centos/README.md @@ -147,6 +147,7 @@ ZBX_STARTPOLLERSUNREACHABLE=1 ZBX_STARTTRAPPERS=5 ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 +ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 diff --git a/server-pgsql/ubuntu/README.md b/server-pgsql/ubuntu/README.md index 2651ce0c8..d4c101a07 100644 --- a/server-pgsql/ubuntu/README.md +++ b/server-pgsql/ubuntu/README.md @@ -147,6 +147,7 @@ ZBX_STARTPOLLERSUNREACHABLE=1 ZBX_STARTTRAPPERS=5 ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 +ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 From 04264fdf5b96276555276050cafdb2310bc7bbe0 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 23 Apr 2021 14:00:41 +0500 Subject: [PATCH 04/10] Added link to wiki --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 654734f39..645a1bc6a 100644 --- a/README.md +++ b/README.md @@ -45,9 +45,9 @@ Please also follow usage instructions of each Zabbix component image: * [zabbix-java-gateway](https://hub.docker.com/r/zabbix/zabbix-java-gateway/) - Zabbix Java Gateway * [zabbix-snmptraps](https://hub.docker.com/r/zabbix/zabbix-snmptraps/) - Additional container image for Zabbix server and Zabbix proxy to support SNMP traps -## Issues +## Issues and Wiki -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). +Be sure to check [the Wiki-page](https://github.com/zabbix/zabbix-docker/wiki) on common problems and questions. If you still have problems with or questions about the images, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). ## Contributing From bbf7a031370783bdacd243d54abead15d27d0eba Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 27 Apr 2021 19:24:18 +0500 Subject: [PATCH 05/10] Added actions for Zabbix web service image --- .github/workflows/CI.yml | 5 +++++ .github/workflows/dockerhub_description.yml | 17 +++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8796f8845..7fcc61361 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -43,6 +43,7 @@ jobs: - web-apache-pgsql - web-nginx-mysql - web-nginx-pgsql + - web-service os: - alpine - ubuntu @@ -50,6 +51,10 @@ jobs: exclude: - os: centos build: agent2 + - os: centos + build: web-service + - os: ubuntu + build: web-service runs-on: ubuntu-20.04 steps: diff --git a/.github/workflows/dockerhub_description.yml b/.github/workflows/dockerhub_description.yml index dff7e256c..a64eb4110 100644 --- a/.github/workflows/dockerhub_description.yml +++ b/.github/workflows/dockerhub_description.yml @@ -20,16 +20,17 @@ jobs: build: - agent - agent2 - - java-gateway - - proxy-mysql - - proxy-sqlite3 - - server-mysql - - server-pgsql - - snmptraps - - web-apache-mysql - - web-apache-pgsql + - java-gateway + - proxy-mysql + - proxy-sqlite3 + - server-mysql + - server-pgsql + - snmptraps + - web-apache-mysql + - web-apache-pgsql - web-nginx-mysql - web-nginx-pgsql + - web-service steps: - uses: actions/checkout@v2 From 7636492524c4298364235693f26762fa5faff83c Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 27 Apr 2021 20:14:53 +0500 Subject: [PATCH 06/10] Added actions for Zabbix web service image --- .github/workflows/CI.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7fcc61361..4e602d2e8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -78,11 +78,15 @@ jobs: id: platform run: | DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le" - + if [ "${{ matrix.build }}" == "agent2" ]; then DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" fi + if [ "${{ matrix.build }}" == "web-service" ]; then + DOCKER_PLATFORM="linux/amd64,linux/arm64" + fi + if [ "${{ matrix.os }}" == "ubuntu" ]; then DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le" fi From 02b57f851dcfb95373464019ef497da5cdb6ebc0 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 28 Apr 2021 01:29:45 +0500 Subject: [PATCH 07/10] Added Zabbix web service image (centos, ubuntu) --- .github/workflows/CI.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4e602d2e8..b62a669a1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,10 +51,6 @@ jobs: exclude: - os: centos build: agent2 - - os: centos - build: web-service - - os: ubuntu - build: web-service runs-on: ubuntu-20.04 steps: From 30f833b8c376a021bb18c6da19d054a73f8f6c23 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 28 Apr 2021 02:01:30 +0500 Subject: [PATCH 08/10] Added Zabbix web service image (centos, ubuntu) --- .github/workflows/CI.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b62a669a1..e09c34500 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -95,6 +95,10 @@ jobs: DOCKER_PLATFORM=${DOCKER_PLATFORM%",linux/ppc64le"} fi + if [ "${{ matrix.build }}" == "web-service" ]; then + DOCKER_PLATFORM=${DOCKER_PLATFORM%",linux/ppc64le"} + fi + echo ::set-output name=list::${DOCKER_PLATFORM} - name: Prepare environment (push) From 6c33275e8360fec5fe49ca998211ae3d128b8793 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 27 Apr 2021 17:20:38 -0400 Subject: [PATCH 09/10] Added web service parameters and exporttype parameter --- server-mysql/alpine/README.md | 3 +++ server-mysql/centos/README.md | 3 +++ server-mysql/ubuntu/README.md | 3 +++ server-pgsql/alpine/README.md | 3 +++ server-pgsql/centos/README.md | 3 +++ server-pgsql/ubuntu/README.md | 3 +++ 6 files changed, 18 insertions(+) diff --git a/server-mysql/alpine/README.md b/server-mysql/alpine/README.md index 2f2ae2371..3ef4ec041 100644 --- a/server-mysql/alpine/README.md +++ b/server-mysql/alpine/README.md @@ -141,6 +141,8 @@ ZBX_VAULTDBPATH= # 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 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_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -174,6 +176,7 @@ ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 +ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 diff --git a/server-mysql/centos/README.md b/server-mysql/centos/README.md index 2f2ae2371..3ef4ec041 100644 --- a/server-mysql/centos/README.md +++ b/server-mysql/centos/README.md @@ -141,6 +141,8 @@ ZBX_VAULTDBPATH= # 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 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_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -174,6 +176,7 @@ ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 +ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 diff --git a/server-mysql/ubuntu/README.md b/server-mysql/ubuntu/README.md index 2f2ae2371..3ef4ec041 100644 --- a/server-mysql/ubuntu/README.md +++ b/server-mysql/ubuntu/README.md @@ -141,6 +141,8 @@ ZBX_VAULTDBPATH= # 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 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_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -174,6 +176,7 @@ ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 +ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 diff --git a/server-pgsql/alpine/README.md b/server-pgsql/alpine/README.md index d4c101a07..456090b94 100644 --- a/server-pgsql/alpine/README.md +++ b/server-pgsql/alpine/README.md @@ -138,6 +138,8 @@ ZBX_VAULTDBPATH= # 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 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_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -171,6 +173,7 @@ ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 +ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 diff --git a/server-pgsql/centos/README.md b/server-pgsql/centos/README.md index d4c101a07..456090b94 100644 --- a/server-pgsql/centos/README.md +++ b/server-pgsql/centos/README.md @@ -138,6 +138,8 @@ ZBX_VAULTDBPATH= # 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 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_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -171,6 +173,7 @@ ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 +ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 diff --git a/server-pgsql/ubuntu/README.md b/server-pgsql/ubuntu/README.md index d4c101a07..456090b94 100644 --- a/server-pgsql/ubuntu/README.md +++ b/server-pgsql/ubuntu/README.md @@ -138,6 +138,8 @@ ZBX_VAULTDBPATH= # 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 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_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -171,6 +173,7 @@ ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 +ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 From 4836dd7b6fea1eb633d198b8b2d24c721009993b Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 28 Apr 2021 02:23:13 +0500 Subject: [PATCH 10/10] Using openjdk-8-jdk-headless instead of openjdk-8-jdk --- java-gateway/ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 1f32a8dea..6a40689ae 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux && \ automake \ libc6-dev \ make \ - openjdk-8-jdk \ + openjdk-8-jdk-headless \ pkg-config \ git \ gcc && \