From 59bc46ebdba93692ff9f63db947f0011256d4200 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 15 Apr 2022 16:51:26 +0300 Subject: [PATCH] Added StartODBCPollers parameter for proxy and server --- Dockerfiles/proxy-mysql/alpine/README.md | 1 + Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh | 1 + Dockerfiles/proxy-mysql/centos/README.md | 1 + Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh | 1 + Dockerfiles/proxy-mysql/ol/README.md | 1 + Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh | 1 + Dockerfiles/proxy-mysql/rhel/README.md | 1 + Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh | 1 + Dockerfiles/proxy-mysql/ubuntu/README.md | 1 + Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh | 1 + Dockerfiles/proxy-sqlite3/alpine/README.md | 1 + Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh | 1 + Dockerfiles/proxy-sqlite3/centos/README.md | 1 + Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh | 1 + Dockerfiles/proxy-sqlite3/ol/README.md | 1 + Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh | 1 + Dockerfiles/proxy-sqlite3/rhel/README.md | 1 + Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh | 1 + Dockerfiles/proxy-sqlite3/ubuntu/README.md | 1 + Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh | 1 + Dockerfiles/server-mysql/alpine/README.md | 1 + Dockerfiles/server-mysql/alpine/docker-entrypoint.sh | 1 + Dockerfiles/server-mysql/centos/README.md | 1 + Dockerfiles/server-mysql/centos/docker-entrypoint.sh | 1 + Dockerfiles/server-mysql/ol/README.md | 1 + Dockerfiles/server-mysql/ol/docker-entrypoint.sh | 1 + Dockerfiles/server-mysql/rhel/README.md | 1 + Dockerfiles/server-mysql/rhel/docker-entrypoint.sh | 1 + Dockerfiles/server-mysql/ubuntu/README.md | 1 + Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh | 1 + Dockerfiles/server-pgsql/alpine/README.md | 1 + Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh | 1 + Dockerfiles/server-pgsql/centos/README.md | 1 + Dockerfiles/server-pgsql/centos/docker-entrypoint.sh | 1 + Dockerfiles/server-pgsql/ol/README.md | 1 + Dockerfiles/server-pgsql/ol/docker-entrypoint.sh | 1 + Dockerfiles/server-pgsql/ubuntu/README.md | 1 + Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh | 1 + 38 files changed, 38 insertions(+) diff --git a/Dockerfiles/proxy-mysql/alpine/README.md b/Dockerfiles/proxy-mysql/alpine/README.md index dd869b291..646e3c020 100644 --- a/Dockerfiles/proxy-mysql/alpine/README.md +++ b/Dockerfiles/proxy-mysql/alpine/README.md @@ -193,6 +193,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_JAVAGATEWAY=zabbix-java-gateway ZBX_JAVAGATEWAYPORT=10052 ZBX_STARTJAVAPOLLERS=0 diff --git a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh index 3a2165ce3..a07d0b714 100755 --- a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh @@ -382,6 +382,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then diff --git a/Dockerfiles/proxy-mysql/centos/README.md b/Dockerfiles/proxy-mysql/centos/README.md index dd869b291..646e3c020 100644 --- a/Dockerfiles/proxy-mysql/centos/README.md +++ b/Dockerfiles/proxy-mysql/centos/README.md @@ -193,6 +193,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_JAVAGATEWAY=zabbix-java-gateway ZBX_JAVAGATEWAYPORT=10052 ZBX_STARTJAVAPOLLERS=0 diff --git a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh index 16b076c06..5f15ad5e3 100755 --- a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh @@ -380,6 +380,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then diff --git a/Dockerfiles/proxy-mysql/ol/README.md b/Dockerfiles/proxy-mysql/ol/README.md index dd869b291..646e3c020 100644 --- a/Dockerfiles/proxy-mysql/ol/README.md +++ b/Dockerfiles/proxy-mysql/ol/README.md @@ -193,6 +193,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_JAVAGATEWAY=zabbix-java-gateway ZBX_JAVAGATEWAYPORT=10052 ZBX_STARTJAVAPOLLERS=0 diff --git a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh index 16b076c06..5f15ad5e3 100755 --- a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh @@ -380,6 +380,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then diff --git a/Dockerfiles/proxy-mysql/rhel/README.md b/Dockerfiles/proxy-mysql/rhel/README.md index dd869b291..646e3c020 100644 --- a/Dockerfiles/proxy-mysql/rhel/README.md +++ b/Dockerfiles/proxy-mysql/rhel/README.md @@ -193,6 +193,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_JAVAGATEWAY=zabbix-java-gateway ZBX_JAVAGATEWAYPORT=10052 ZBX_STARTJAVAPOLLERS=0 diff --git a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh index a77a390b9..8e4dd3282 100755 --- a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh @@ -381,6 +381,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then diff --git a/Dockerfiles/proxy-mysql/ubuntu/README.md b/Dockerfiles/proxy-mysql/ubuntu/README.md index dd869b291..646e3c020 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/README.md +++ b/Dockerfiles/proxy-mysql/ubuntu/README.md @@ -193,6 +193,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_JAVAGATEWAY=zabbix-java-gateway ZBX_JAVAGATEWAYPORT=10052 ZBX_STARTJAVAPOLLERS=0 diff --git a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh index 5e33e7ae1..716a4909c 100755 --- a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -379,6 +379,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then diff --git a/Dockerfiles/proxy-sqlite3/alpine/README.md b/Dockerfiles/proxy-sqlite3/alpine/README.md index e76481751..9d8480ad4 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/README.md +++ b/Dockerfiles/proxy-sqlite3/alpine/README.md @@ -150,6 +150,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_JAVAGATEWAY=zabbix-java-gateway ZBX_JAVAGATEWAYPORT=10052 ZBX_STARTJAVAPOLLERS=0 diff --git a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh index 5b826be38..cea31ed26 100755 --- a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -170,6 +170,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then diff --git a/Dockerfiles/proxy-sqlite3/centos/README.md b/Dockerfiles/proxy-sqlite3/centos/README.md index e76481751..9d8480ad4 100644 --- a/Dockerfiles/proxy-sqlite3/centos/README.md +++ b/Dockerfiles/proxy-sqlite3/centos/README.md @@ -150,6 +150,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_JAVAGATEWAY=zabbix-java-gateway ZBX_JAVAGATEWAYPORT=10052 ZBX_STARTJAVAPOLLERS=0 diff --git a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh index 5b826be38..cea31ed26 100755 --- a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh @@ -170,6 +170,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then diff --git a/Dockerfiles/proxy-sqlite3/ol/README.md b/Dockerfiles/proxy-sqlite3/ol/README.md index e76481751..9d8480ad4 100644 --- a/Dockerfiles/proxy-sqlite3/ol/README.md +++ b/Dockerfiles/proxy-sqlite3/ol/README.md @@ -150,6 +150,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_JAVAGATEWAY=zabbix-java-gateway ZBX_JAVAGATEWAYPORT=10052 ZBX_STARTJAVAPOLLERS=0 diff --git a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh index 5b826be38..cea31ed26 100755 --- a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh @@ -170,6 +170,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then diff --git a/Dockerfiles/proxy-sqlite3/rhel/README.md b/Dockerfiles/proxy-sqlite3/rhel/README.md index e76481751..9d8480ad4 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/README.md +++ b/Dockerfiles/proxy-sqlite3/rhel/README.md @@ -150,6 +150,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_JAVAGATEWAY=zabbix-java-gateway ZBX_JAVAGATEWAYPORT=10052 ZBX_STARTJAVAPOLLERS=0 diff --git a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh index 5b826be38..cea31ed26 100755 --- a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh @@ -170,6 +170,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/README.md b/Dockerfiles/proxy-sqlite3/ubuntu/README.md index e76481751..9d8480ad4 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/README.md +++ b/Dockerfiles/proxy-sqlite3/ubuntu/README.md @@ -150,6 +150,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_JAVAGATEWAY=zabbix-java-gateway ZBX_JAVAGATEWAYPORT=10052 ZBX_STARTJAVAPOLLERS=0 diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh index 51164b2ba..656192853 100755 --- a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -170,6 +170,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then diff --git a/Dockerfiles/server-mysql/alpine/README.md b/Dockerfiles/server-mysql/alpine/README.md index 97b16bca6..470019161 100644 --- a/Dockerfiles/server-mysql/alpine/README.md +++ b/Dockerfiles/server-mysql/alpine/README.md @@ -162,6 +162,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 ZBX_STARTALERTERS=3 # Available since 3.4.0 diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh index 2821be025..014e0a2e1 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -364,6 +364,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}" diff --git a/Dockerfiles/server-mysql/centos/README.md b/Dockerfiles/server-mysql/centos/README.md index 97b16bca6..470019161 100644 --- a/Dockerfiles/server-mysql/centos/README.md +++ b/Dockerfiles/server-mysql/centos/README.md @@ -162,6 +162,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 ZBX_STARTALERTERS=3 # Available since 3.4.0 diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh index 189ac0619..ff69dd352 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -361,6 +361,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}" diff --git a/Dockerfiles/server-mysql/ol/README.md b/Dockerfiles/server-mysql/ol/README.md index 97b16bca6..470019161 100644 --- a/Dockerfiles/server-mysql/ol/README.md +++ b/Dockerfiles/server-mysql/ol/README.md @@ -162,6 +162,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 ZBX_STARTALERTERS=3 # Available since 3.4.0 diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh index 189ac0619..ff69dd352 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -361,6 +361,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}" diff --git a/Dockerfiles/server-mysql/rhel/README.md b/Dockerfiles/server-mysql/rhel/README.md index 97b16bca6..470019161 100644 --- a/Dockerfiles/server-mysql/rhel/README.md +++ b/Dockerfiles/server-mysql/rhel/README.md @@ -162,6 +162,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 ZBX_STARTALERTERS=3 # Available since 3.4.0 diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh index 189ac0619..ff69dd352 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -361,6 +361,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}" diff --git a/Dockerfiles/server-mysql/ubuntu/README.md b/Dockerfiles/server-mysql/ubuntu/README.md index 97b16bca6..470019161 100644 --- a/Dockerfiles/server-mysql/ubuntu/README.md +++ b/Dockerfiles/server-mysql/ubuntu/README.md @@ -162,6 +162,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 ZBX_STARTALERTERS=3 # Available since 3.4.0 diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh index 70d2e81c0..a161332ff 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -361,6 +361,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}" diff --git a/Dockerfiles/server-pgsql/alpine/README.md b/Dockerfiles/server-pgsql/alpine/README.md index 4c851640d..3ba321c0e 100644 --- a/Dockerfiles/server-pgsql/alpine/README.md +++ b/Dockerfiles/server-pgsql/alpine/README.md @@ -163,6 +163,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 ZBX_STARTALERTERS=3 # Available since 3.4.0 diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index 929558b72..c080b0ab8 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -397,6 +397,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}" diff --git a/Dockerfiles/server-pgsql/centos/README.md b/Dockerfiles/server-pgsql/centos/README.md index 4c851640d..3ba321c0e 100644 --- a/Dockerfiles/server-pgsql/centos/README.md +++ b/Dockerfiles/server-pgsql/centos/README.md @@ -163,6 +163,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 ZBX_STARTALERTERS=3 # Available since 3.4.0 diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index 929558b72..c080b0ab8 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -397,6 +397,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}" diff --git a/Dockerfiles/server-pgsql/ol/README.md b/Dockerfiles/server-pgsql/ol/README.md index 4c851640d..3ba321c0e 100644 --- a/Dockerfiles/server-pgsql/ol/README.md +++ b/Dockerfiles/server-pgsql/ol/README.md @@ -163,6 +163,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 ZBX_STARTALERTERS=3 # Available since 3.4.0 diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index 929558b72..c080b0ab8 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -397,6 +397,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}" diff --git a/Dockerfiles/server-pgsql/ubuntu/README.md b/Dockerfiles/server-pgsql/ubuntu/README.md index 4c851640d..3ba321c0e 100644 --- a/Dockerfiles/server-pgsql/ubuntu/README.md +++ b/Dockerfiles/server-pgsql/ubuntu/README.md @@ -163,6 +163,7 @@ ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 +ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 ZBX_STARTALERTERS=3 # Available since 3.4.0 diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index 341cb8e9f..d19ee3ad9 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -397,6 +397,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}" update_config_var $ZBX_CONFIG "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}" update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" + update_config_var $ZBX_CONFIG "StartODBCPollers" "${ZBX_STARTODBCPOLLERS}" update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"