Merge branch 'master' into trunk

nAnderYang · Apr 22, 2021 · 94e26ab · 94e26ab
2 parents f6f9ea6 + 401a8d2
commit 94e26ab
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 1 deletion.
diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
@@ -0,0 +1,37 @@
+<!--- Please create issues about Zabbix images only. Zabbix official bug and feature tracker is available on https://support.zabbix.com/ -->
+<!--- Verify first that your issue is not already reported on GitHub or covered in the Wiki -->
+<!--- Have you had a look in the official Zabbix Documentation? -->
+
+##### SUMMARY
+<!--- Explain the problem briefly below -->
+
+
+##### OS / ENVIRONMENT / Used docker-compose files
+<!--- Provide all relevant information below, e.g. Docker/Container versions, used OS and OS-versions, which docker-compose_* template used -->
+
+
+##### CONFIGURATION
+<!--- Consider adding information about what .env_* files you changed or add the actual docker-compose you used -->
+<!--- HINT: You can paste gist.github.com links for larger files -->
+
+##### STEPS TO REPRODUCE
+<!--- Describe exactly how to reproduce the problem, using a minimal test-case -->
+
+<!--- Paste example commands between quotes below -->
+```yaml
+
+```
+
+<!--- HINT: You can paste gist.github.com links for larger files -->
+
+##### EXPECTED RESULTS
+<!--- Describe what you expected to happen when running the steps above -->
+
+
+##### ACTUAL RESULTS
+<!--- Describe what actually happened. If possible run with extra verbosity (higher ZABBIX_LOGLEVEL) -->
+
+<!--- Paste verbatim command output between quotes -->
+```paste below
+
+```
diff --git a/README.md b/README.md
@@ -24,7 +24,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.**

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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