From 44540aa31a00a54c1ad551f38436b8a246796a27 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 13 Apr 2021 08:32:29 -0400 Subject: [PATCH 1/6] 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 2/6] 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 f6f9ea625cd78296fba10448423748beef3d770c Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 23 Apr 2021 01:19:41 +0500 Subject: [PATCH 3/6] Added new parameter history pollers for server and proxies --- proxy-mysql/alpine/docker-entrypoint.sh | 1 + proxy-mysql/centos/docker-entrypoint.sh | 1 + proxy-mysql/ubuntu/docker-entrypoint.sh | 1 + proxy-sqlite3/alpine/docker-entrypoint.sh | 1 + proxy-sqlite3/centos/docker-entrypoint.sh | 1 + proxy-sqlite3/ubuntu/docker-entrypoint.sh | 1 + server-mysql/alpine/docker-entrypoint.sh | 1 + server-mysql/centos/docker-entrypoint.sh | 1 + server-mysql/ubuntu/docker-entrypoint.sh | 1 + server-pgsql/alpine/docker-entrypoint.sh | 1 + server-pgsql/centos/docker-entrypoint.sh | 1 + server-pgsql/ubuntu/docker-entrypoint.sh | 1 + 12 files changed, 12 insertions(+) diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh index 548b52ccb..abcdfd445 100755 --- a/proxy-mysql/alpine/docker-entrypoint.sh +++ b/proxy-mysql/alpine/docker-entrypoint.sh @@ -375,6 +375,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}" update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}" update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" + update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_HISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh index 87ae89274..f3d6557c5 100755 --- a/proxy-mysql/centos/docker-entrypoint.sh +++ b/proxy-mysql/centos/docker-entrypoint.sh @@ -373,6 +373,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}" update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}" update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" + update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_HISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh index ced972b18..c5cdcaa7f 100755 --- a/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -372,6 +372,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}" update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}" update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" + update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_HISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/proxy-sqlite3/alpine/docker-entrypoint.sh index 229d56a92..3f7008b95 100755 --- a/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -167,6 +167,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}" update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}" update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" + update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_HISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/proxy-sqlite3/centos/docker-entrypoint.sh index 229d56a92..3f7008b95 100755 --- a/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/proxy-sqlite3/centos/docker-entrypoint.sh @@ -167,6 +167,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}" update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}" update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" + update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_HISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/proxy-sqlite3/ubuntu/docker-entrypoint.sh index 5bc90dac0..48ae24346 100755 --- a/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -167,6 +167,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}" update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}" update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" + update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_HISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh index ae23bc659..d54c93a2c 100755 --- a/server-mysql/alpine/docker-entrypoint.sh +++ b/server-mysql/alpine/docker-entrypoint.sh @@ -353,6 +353,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}" update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}" update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" + update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_HISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh index 3aa594d5d..cf38019c9 100755 --- a/server-mysql/centos/docker-entrypoint.sh +++ b/server-mysql/centos/docker-entrypoint.sh @@ -350,6 +350,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}" update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}" update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" + update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_HISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh index 84a89d077..8c542490b 100755 --- a/server-mysql/ubuntu/docker-entrypoint.sh +++ b/server-mysql/ubuntu/docker-entrypoint.sh @@ -350,6 +350,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}" update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}" update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" + update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_HISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh index d0ac418ec..cdcf65b7b 100755 --- a/server-pgsql/alpine/docker-entrypoint.sh +++ b/server-pgsql/alpine/docker-entrypoint.sh @@ -386,6 +386,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}" update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}" update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" + update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_HISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh index d0ac418ec..cdcf65b7b 100755 --- a/server-pgsql/centos/docker-entrypoint.sh +++ b/server-pgsql/centos/docker-entrypoint.sh @@ -386,6 +386,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}" update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}" update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" + update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_HISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh index c250ce68b..eacec16dc 100755 --- a/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/server-pgsql/ubuntu/docker-entrypoint.sh @@ -386,6 +386,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}" update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}" update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" + update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_HISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" From 401a8d208d083d9f3c067e097862d8f845678b64 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 23 Apr 2021 01:23:22 +0500 Subject: [PATCH 4/6] 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 5/6] 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 6/6] 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