extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-22 19:01:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'trunk' of https://github.com/zabbix/zabbix-docker into trunk

Browse Source
This commit is contained in:
dotneft 2021-08-25 15:13:21 +03:00
commit 5b17d2c0d3
65 changed files with 177 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env_db_pgsql
View File

@ -8,3 +8,4 @@ POSTGRES_PASSWORD_FILE=/run/secrets/POSTGRES_PASSWORD
POSTGRES_DB=zabbix POSTGRES_DB=zabbix
# DB_SERVER_SCHEMA=public # DB_SERVER_SCHEMA=public
# ENABLE_TIMESCALEDB=true # ENABLE_TIMESCALEDB=true
# POSTGRES_USE_IMPLICIT_SEARCH_PATH=false

2
.env_prx
View File

@ -42,7 +42,7 @@
# ZBX_HISTORYCACHESIZE=16M # ZBX_HISTORYCACHESIZE=16M
# ZBX_HISTORYINDEXCACHESIZE=4M # ZBX_HISTORYINDEXCACHESIZE=4M
# ZBX_TIMEOUT=4 # ZBX_TIMEOUT=4
# ZBX_TRAPPERIMEOUT=300 # ZBX_TRAPPERTIMEOUT=300
# ZBX_UNREACHABLEPERIOD=45 # ZBX_UNREACHABLEPERIOD=45
# ZBX_UNAVAILABLEDELAY=60 # ZBX_UNAVAILABLEDELAY=60
# ZBX_UNREACHABLEDELAY=15 # ZBX_UNREACHABLEDELAY=15

2
.env_srv
View File

@ -41,7 +41,7 @@ ZBX_ENABLE_SNMP_TRAPS=true
# ZBX_TRENDCACHESIZE=4M # ZBX_TRENDCACHESIZE=4M
# ZBX_VALUECACHESIZE=8M # ZBX_VALUECACHESIZE=8M
# ZBX_TIMEOUT=4 # ZBX_TIMEOUT=4
# ZBX_TRAPPERIMEOUT=300 # ZBX_TRAPPERTIMEOUT=300
# ZBX_UNREACHABLEPERIOD=45 # ZBX_UNREACHABLEPERIOD=45
# ZBX_UNAVAILABLEDELAY=60 # ZBX_UNAVAILABLEDELAY=60
# ZBX_UNREACHABLEDELAY=15 # ZBX_UNREACHABLEDELAY=15

2
.github/workflows/CI.yml vendored
View File

@ -70,7 +70,7 @@ jobs:
- name: Prepare platform list - name: Prepare platform list
id: platform id: platform
run: | run: |
DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le" DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x"
if [ "${{ matrix.build }}" == "agent2" ]; then if [ "${{ matrix.build }}" == "agent2" ]; then
DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le"

2
proxy-mysql/alpine/README.md
View File

@ -206,7 +206,7 @@ ZBX_CACHESIZE=8M
ZBX_STARTDBSYNCERS=4 ZBX_STARTDBSYNCERS=4
ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYCACHESIZE=16M
ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

2
proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -413,7 +413,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

2
proxy-mysql/centos/README.md
View File

@ -206,7 +206,7 @@ ZBX_CACHESIZE=8M
ZBX_STARTDBSYNCERS=4 ZBX_STARTDBSYNCERS=4
ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYCACHESIZE=16M
ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

2
proxy-mysql/centos/docker-entrypoint.sh
View File

@ -411,7 +411,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

2
proxy-mysql/ol/README.md
View File

@ -206,7 +206,7 @@ ZBX_CACHESIZE=8M
ZBX_STARTDBSYNCERS=4 ZBX_STARTDBSYNCERS=4
ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYCACHESIZE=16M
ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

2
proxy-mysql/ol/docker-entrypoint.sh
View File

@ -411,7 +411,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

2
proxy-mysql/rhel/README.md
View File

@ -206,7 +206,7 @@ ZBX_CACHESIZE=8M
ZBX_STARTDBSYNCERS=4 ZBX_STARTDBSYNCERS=4
ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYCACHESIZE=16M
ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

2
proxy-mysql/rhel/docker-entrypoint.sh
View File

@ -412,7 +412,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

2
proxy-mysql/ubuntu/README.md
View File

@ -206,7 +206,7 @@ ZBX_CACHESIZE=8M
ZBX_STARTDBSYNCERS=4 ZBX_STARTDBSYNCERS=4
ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYCACHESIZE=16M
ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

2
proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@ -410,7 +410,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

1
proxy-sqlite3/alpine/Dockerfile
View File

@ -22,6 +22,7 @@ RUN set -eux && \
adduser zabbix root && \ adduser zabbix root && \
mkdir -p /etc/zabbix && \ mkdir -p /etc/zabbix && \
mkdir -p /var/lib/zabbix && \ mkdir -p /var/lib/zabbix && \
mkdir -p /var/lib/zabbix/db_data && \
mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/enc && \
mkdir -p /var/lib/zabbix/mibs && \ mkdir -p /var/lib/zabbix/mibs && \
mkdir -p /var/lib/zabbix/modules && \ mkdir -p /var/lib/zabbix/modules && \

6
proxy-sqlite3/alpine/README.md
View File

@ -164,7 +164,7 @@ ZBX_CACHESIZE=8M
ZBX_STARTDBSYNCERS=4 ZBX_STARTDBSYNCERS=4
ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYCACHESIZE=16M
ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15
@ -199,6 +199,10 @@ Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix
The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``. The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``.
### ``/var/lib/zabbix/db_data``
The volume stores SQLite3 database file and could be used for external database file storage.
### ``/var/lib/zabbix/modules`` ### ``/var/lib/zabbix/modules``
The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature. The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature.

4
proxy-sqlite3/alpine/docker-entrypoint.sh
View File

@ -139,7 +139,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "DBHost" update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db" update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/db_data/${ZBX_HOSTNAME:-"zabbix-proxy-sqlite3"}.sqlite"
update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBUser"
update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPort"
update_config_var $ZBX_CONFIG "DBPassword" update_config_var $ZBX_CONFIG "DBPassword"
@ -205,7 +205,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

1
proxy-sqlite3/centos/Dockerfile
View File

@ -32,6 +32,7 @@ RUN set -eux && \
zabbix && \ zabbix && \
mkdir -p /etc/zabbix && \ mkdir -p /etc/zabbix && \
mkdir -p /var/lib/zabbix && \ mkdir -p /var/lib/zabbix && \
mkdir -p /var/lib/zabbix/db_data && \
mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/enc && \
mkdir -p /var/lib/zabbix/mibs && \ mkdir -p /var/lib/zabbix/mibs && \
mkdir -p /var/lib/zabbix/modules && \ mkdir -p /var/lib/zabbix/modules && \

6
proxy-sqlite3/centos/README.md
View File

@ -164,7 +164,7 @@ ZBX_CACHESIZE=8M
ZBX_STARTDBSYNCERS=4 ZBX_STARTDBSYNCERS=4
ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYCACHESIZE=16M
ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15
@ -199,6 +199,10 @@ Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix
The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``. The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``.
### ``/var/lib/zabbix/db_data``
The volume stores SQLite3 database file and could be used for external database file storage.
### ``/var/lib/zabbix/modules`` ### ``/var/lib/zabbix/modules``
The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature. The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature.

4
proxy-sqlite3/centos/docker-entrypoint.sh
View File

@ -139,7 +139,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "DBHost" update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db" update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/db_data/${ZBX_HOSTNAME:-"zabbix-proxy-sqlite3"}.sqlite"
update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBUser"
update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPort"
update_config_var $ZBX_CONFIG "DBPassword" update_config_var $ZBX_CONFIG "DBPassword"
@ -205,7 +205,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

1
proxy-sqlite3/ol/Dockerfile
View File

@ -34,6 +34,7 @@ RUN set -eux && \
zabbix && \ zabbix && \
mkdir -p /etc/zabbix && \ mkdir -p /etc/zabbix && \
mkdir -p /var/lib/zabbix && \ mkdir -p /var/lib/zabbix && \
mkdir -p /var/lib/zabbix/db_data && \
mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/enc && \
mkdir -p /var/lib/zabbix/mibs && \ mkdir -p /var/lib/zabbix/mibs && \
mkdir -p /var/lib/zabbix/modules && \ mkdir -p /var/lib/zabbix/modules && \

6
proxy-sqlite3/ol/README.md
View File

@ -164,7 +164,7 @@ ZBX_CACHESIZE=8M
ZBX_STARTDBSYNCERS=4 ZBX_STARTDBSYNCERS=4
ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYCACHESIZE=16M
ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15
@ -199,6 +199,10 @@ Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix
The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``. The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``.
### ``/var/lib/zabbix/db_data``
The volume stores SQLite3 database file and could be used for external database file storage.
### ``/var/lib/zabbix/modules`` ### ``/var/lib/zabbix/modules``
The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature. The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature.

4
proxy-sqlite3/ol/docker-entrypoint.sh
View File

@ -139,7 +139,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "DBHost" update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db" update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/db_data/${ZBX_HOSTNAME:-"zabbix-proxy-sqlite3"}.sqlite"
update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBUser"
update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPort"
update_config_var $ZBX_CONFIG "DBPassword" update_config_var $ZBX_CONFIG "DBPassword"
@ -205,7 +205,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

1
proxy-sqlite3/rhel/Dockerfile
View File

@ -69,6 +69,7 @@ RUN set -eux && INSTALL_PKGS="bash \
zabbix && \ zabbix && \
mkdir -p /etc/zabbix && \ mkdir -p /etc/zabbix && \
mkdir -p /var/lib/zabbix && \ mkdir -p /var/lib/zabbix && \
mkdir -p /var/lib/zabbix/db_data && \
mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/enc && \
mkdir -p /usr/lib/zabbix/externalscripts && \ mkdir -p /usr/lib/zabbix/externalscripts && \
mkdir -p /var/lib/zabbix/mibs && \ mkdir -p /var/lib/zabbix/mibs && \

8
proxy-sqlite3/rhel/README.md
View File

@ -164,7 +164,7 @@ ZBX_CACHESIZE=8M
ZBX_STARTDBSYNCERS=4 ZBX_STARTDBSYNCERS=4
ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYCACHESIZE=16M
ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15
@ -199,6 +199,10 @@ Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix
The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``. The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``.
### ``/var/lib/zabbix/db_data``
The volume stores SQLite3 database file and could be used for external database file storage.
### ``/var/lib/zabbix/modules`` ### ``/var/lib/zabbix/modules``
The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature. The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature.
@ -248,7 +252,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git
This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of.
## `zabbix-agent:ol-<version>` ## `zabbix-proxy-sqlite3:ol-<version>`
Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more.

4
proxy-sqlite3/rhel/docker-entrypoint.sh
View File

@ -139,7 +139,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "DBHost" update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db" update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/db_data/${ZBX_HOSTNAME:-"zabbix-proxy-sqlite3"}.sqlite"
update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBUser"
update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPort"
update_config_var $ZBX_CONFIG "DBPassword" update_config_var $ZBX_CONFIG "DBPassword"
@ -205,7 +205,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

1
proxy-sqlite3/ubuntu/Dockerfile
View File

@ -31,6 +31,7 @@ RUN set -eux && \
zabbix && \ zabbix && \
mkdir -p /etc/zabbix && \ mkdir -p /etc/zabbix && \
mkdir -p /var/lib/zabbix && \ mkdir -p /var/lib/zabbix && \
mkdir -p /var/lib/zabbix/db_data && \
mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/enc && \
mkdir -p /var/lib/zabbix/mibs && \ mkdir -p /var/lib/zabbix/mibs && \
mkdir -p /var/lib/zabbix/modules && \ mkdir -p /var/lib/zabbix/modules && \

6
proxy-sqlite3/ubuntu/README.md
View File

@ -164,7 +164,7 @@ ZBX_CACHESIZE=8M
ZBX_STARTDBSYNCERS=4 ZBX_STARTDBSYNCERS=4
ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYCACHESIZE=16M
ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15
@ -199,6 +199,10 @@ Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix
The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``. The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``.
### ``/var/lib/zabbix/db_data``
The volume stores SQLite3 database file and could be used for external database file storage.
### ``/var/lib/zabbix/modules`` ### ``/var/lib/zabbix/modules``
The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature. The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature.

4
proxy-sqlite3/ubuntu/docker-entrypoint.sh
View File

@ -139,7 +139,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "DBHost" update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db" update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/db_data/${ZBX_HOSTNAME:-"zabbix-proxy-sqlite3"}.sqlite"
update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBUser"
update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPort"
update_config_var $ZBX_CONFIG "DBPassword" update_config_var $ZBX_CONFIG "DBPassword"
@ -205,7 +205,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

2
server-mysql/alpine/README.md
View File

@ -184,7 +184,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
ZBX_TRENDCACHESIZE=4M ZBX_TRENDCACHESIZE=4M
ZBX_VALUECACHESIZE=8M ZBX_VALUECACHESIZE=8M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

2
server-mysql/alpine/docker-entrypoint.sh
View File

@ -411,7 +411,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

2
server-mysql/centos/README.md
View File

@ -184,7 +184,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
ZBX_TRENDCACHESIZE=4M ZBX_TRENDCACHESIZE=4M
ZBX_VALUECACHESIZE=8M ZBX_VALUECACHESIZE=8M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

2
server-mysql/centos/docker-entrypoint.sh
View File

@ -408,7 +408,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

2
server-mysql/ol/README.md
View File

@ -184,7 +184,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
ZBX_TRENDCACHESIZE=4M ZBX_TRENDCACHESIZE=4M
ZBX_VALUECACHESIZE=8M ZBX_VALUECACHESIZE=8M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

2
server-mysql/ol/docker-entrypoint.sh
View File

@ -408,7 +408,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

2
server-mysql/rhel/README.md
View File

@ -184,7 +184,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
ZBX_TRENDCACHESIZE=4M ZBX_TRENDCACHESIZE=4M
ZBX_VALUECACHESIZE=8M ZBX_VALUECACHESIZE=8M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

2
server-mysql/rhel/docker-entrypoint.sh
View File

@ -408,7 +408,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

2
server-mysql/ubuntu/README.md
View File

@ -184,7 +184,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
ZBX_TRENDCACHESIZE=4M ZBX_TRENDCACHESIZE=4M
ZBX_VALUECACHESIZE=8M ZBX_VALUECACHESIZE=8M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

2
server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -408,7 +408,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

6
server-pgsql/alpine/README.md
View File

@ -103,6 +103,10 @@ By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `za
The variable is Zabbix database name. By default, value is `zabbix`. The variable is Zabbix database name. By default, value is `zabbix`.
### `POSTGRES_USE_IMPLICIT_SEARCH_PATH`
In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database.
### `ZBX_LOADMODULE` ### `ZBX_LOADMODULE`
The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``. The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``.
@ -181,7 +185,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
ZBX_TRENDCACHESIZE=4M ZBX_TRENDCACHESIZE=4M
ZBX_VALUECACHESIZE=8M ZBX_VALUECACHESIZE=8M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

12
server-pgsql/alpine/docker-entrypoint.sh
View File

@ -154,6 +154,8 @@ check_variables_postgresql() {
: ${DB_SERVER_SCHEMA:="public"} : ${DB_SERVER_SCHEMA:="public"}
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
: ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"}
} }
check_db_connect_postgresql() { check_db_connect_postgresql() {
@ -174,7 +176,7 @@ check_db_connect_postgresql() {
WAIT_TIMEOUT=5 WAIT_TIMEOUT=5
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -213,7 +215,7 @@ psql_query() {
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -248,7 +250,7 @@ create_db_database_postgresql() {
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -296,7 +298,7 @@ create_db_schema_postgresql() {
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -446,7 +448,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

6
server-pgsql/centos/README.md
View File

@ -103,6 +103,10 @@ By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `za
The variable is Zabbix database name. By default, value is `zabbix`. The variable is Zabbix database name. By default, value is `zabbix`.
### `POSTGRES_USE_IMPLICIT_SEARCH_PATH`
In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database.
### `ZBX_LOADMODULE` ### `ZBX_LOADMODULE`
The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``. The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``.
@ -181,7 +185,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
ZBX_TRENDCACHESIZE=4M ZBX_TRENDCACHESIZE=4M
ZBX_VALUECACHESIZE=8M ZBX_VALUECACHESIZE=8M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

12
server-pgsql/centos/docker-entrypoint.sh
View File

@ -154,6 +154,8 @@ check_variables_postgresql() {
: ${DB_SERVER_SCHEMA:="public"} : ${DB_SERVER_SCHEMA:="public"}
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
: ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"}
} }
check_db_connect_postgresql() { check_db_connect_postgresql() {
@ -174,7 +176,7 @@ check_db_connect_postgresql() {
WAIT_TIMEOUT=5 WAIT_TIMEOUT=5
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -213,7 +215,7 @@ psql_query() {
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -248,7 +250,7 @@ create_db_database_postgresql() {
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -296,7 +298,7 @@ create_db_schema_postgresql() {
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -446,7 +448,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

6
server-pgsql/ol/README.md
View File

@ -103,6 +103,10 @@ By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `za
The variable is Zabbix database name. By default, value is `zabbix`. The variable is Zabbix database name. By default, value is `zabbix`.
### `POSTGRES_USE_IMPLICIT_SEARCH_PATH`
In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database.
### `ZBX_LOADMODULE` ### `ZBX_LOADMODULE`
The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``. The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``.
@ -181,7 +185,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
ZBX_TRENDCACHESIZE=4M ZBX_TRENDCACHESIZE=4M
ZBX_VALUECACHESIZE=8M ZBX_VALUECACHESIZE=8M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

12
server-pgsql/ol/docker-entrypoint.sh
View File

@ -154,6 +154,8 @@ check_variables_postgresql() {
: ${DB_SERVER_SCHEMA:="public"} : ${DB_SERVER_SCHEMA:="public"}
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
: ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"}
} }
check_db_connect_postgresql() { check_db_connect_postgresql() {
@ -174,7 +176,7 @@ check_db_connect_postgresql() {
WAIT_TIMEOUT=5 WAIT_TIMEOUT=5
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -213,7 +215,7 @@ psql_query() {
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -248,7 +250,7 @@ create_db_database_postgresql() {
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -296,7 +298,7 @@ create_db_schema_postgresql() {
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -446,7 +448,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

6
server-pgsql/ubuntu/README.md
View File

@ -103,6 +103,10 @@ By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `za
The variable is Zabbix database name. By default, value is `zabbix`. The variable is Zabbix database name. By default, value is `zabbix`.
### `POSTGRES_USE_IMPLICIT_SEARCH_PATH`
In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database.
### `ZBX_LOADMODULE` ### `ZBX_LOADMODULE`
The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``. The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``.
@ -181,7 +185,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
ZBX_TRENDCACHESIZE=4M ZBX_TRENDCACHESIZE=4M
ZBX_VALUECACHESIZE=8M ZBX_VALUECACHESIZE=8M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

12
server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -154,6 +154,8 @@ check_variables_postgresql() {
: ${DB_SERVER_SCHEMA:="public"} : ${DB_SERVER_SCHEMA:="public"}
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
: ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"}
} }
check_db_connect_postgresql() { check_db_connect_postgresql() {
@ -174,7 +176,7 @@ check_db_connect_postgresql() {
WAIT_TIMEOUT=5 WAIT_TIMEOUT=5
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -213,7 +215,7 @@ psql_query() {
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -248,7 +250,7 @@ create_db_database_postgresql() {
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -296,7 +298,7 @@ create_db_schema_postgresql() {
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi
@ -446,7 +448,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"

4
web-apache-pgsql/alpine/README.md
View File

@ -120,6 +120,10 @@ By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `za
The variable is Zabbix database name. By default, value is `zabbix`. The variable is Zabbix database name. By default, value is `zabbix`.
### `POSTGRES_USE_IMPLICIT_SEARCH_PATH`
In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database.
### `ZBX_HISTORYSTORAGEURL` ### `ZBX_HISTORYSTORAGEURL`
History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5. History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5.

4
web-apache-pgsql/alpine/docker-entrypoint.sh
View File

@ -75,6 +75,8 @@ check_variables() {
: ${DB_SERVER_SCHEMA:="public"} : ${DB_SERVER_SCHEMA:="public"}
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
: ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"}
} }
check_db_connect() { check_db_connect() {
@ -104,7 +106,7 @@ check_db_connect() {
WAIT_TIMEOUT=5 WAIT_TIMEOUT=5
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi

4
web-apache-pgsql/centos/README.md
View File

@ -120,6 +120,10 @@ By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `za
The variable is Zabbix database name. By default, value is `zabbix`. The variable is Zabbix database name. By default, value is `zabbix`.
### `POSTGRES_USE_IMPLICIT_SEARCH_PATH`
In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database.
### `ZBX_HISTORYSTORAGEURL` ### `ZBX_HISTORYSTORAGEURL`
History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5. History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5.

4
web-apache-pgsql/centos/docker-entrypoint.sh
View File

@ -75,6 +75,8 @@ check_variables() {
: ${DB_SERVER_SCHEMA:="public"} : ${DB_SERVER_SCHEMA:="public"}
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
: ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"}
} }
check_db_connect() { check_db_connect() {
@ -104,7 +106,7 @@ check_db_connect() {
WAIT_TIMEOUT=5 WAIT_TIMEOUT=5
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi

4
web-apache-pgsql/ol/README.md
View File

@ -120,6 +120,10 @@ By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `za
The variable is Zabbix database name. By default, value is `zabbix`. The variable is Zabbix database name. By default, value is `zabbix`.
### `POSTGRES_USE_IMPLICIT_SEARCH_PATH`
In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database.
### `ZBX_HISTORYSTORAGEURL` ### `ZBX_HISTORYSTORAGEURL`
History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5. History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5.

4
web-apache-pgsql/ol/docker-entrypoint.sh
View File

@ -75,6 +75,8 @@ check_variables() {
: ${DB_SERVER_SCHEMA:="public"} : ${DB_SERVER_SCHEMA:="public"}
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
: ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"}
} }
check_db_connect() { check_db_connect() {
@ -104,7 +106,7 @@ check_db_connect() {
WAIT_TIMEOUT=5 WAIT_TIMEOUT=5
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi

4
web-apache-pgsql/ubuntu/README.md
View File

@ -120,6 +120,10 @@ By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `za
The variable is Zabbix database name. By default, value is `zabbix`. The variable is Zabbix database name. By default, value is `zabbix`.
### `POSTGRES_USE_IMPLICIT_SEARCH_PATH`
In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database.
### `ZBX_HISTORYSTORAGEURL` ### `ZBX_HISTORYSTORAGEURL`
History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5. History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5.

4
web-apache-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -75,6 +75,8 @@ check_variables() {
: ${DB_SERVER_SCHEMA:="public"} : ${DB_SERVER_SCHEMA:="public"}
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
: ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"}
} }
check_db_connect() { check_db_connect() {
@ -104,7 +106,7 @@ check_db_connect() {
WAIT_TIMEOUT=5 WAIT_TIMEOUT=5
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi

4
web-nginx-pgsql/alpine/README.md
View File

@ -120,6 +120,10 @@ By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `za
The variable is Zabbix database name. By default, value is `zabbix`. The variable is Zabbix database name. By default, value is `zabbix`.
### `POSTGRES_USE_IMPLICIT_SEARCH_PATH`
In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database.
### `ZBX_HISTORYSTORAGEURL` ### `ZBX_HISTORYSTORAGEURL`
History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5. History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5.

4
web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -75,6 +75,8 @@ check_variables() {
: ${DB_SERVER_SCHEMA:="public"} : ${DB_SERVER_SCHEMA:="public"}
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
: ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"}
} }
check_db_connect() { check_db_connect() {
@ -104,7 +106,7 @@ check_db_connect() {
WAIT_TIMEOUT=5 WAIT_TIMEOUT=5
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi

4
web-nginx-pgsql/centos/README.md
View File

@ -120,6 +120,10 @@ By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `za
The variable is Zabbix database name. By default, value is `zabbix`. The variable is Zabbix database name. By default, value is `zabbix`.
### `POSTGRES_USE_IMPLICIT_SEARCH_PATH`
In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database.
### `ZBX_HISTORYSTORAGEURL` ### `ZBX_HISTORYSTORAGEURL`
History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5. History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5.

4
web-nginx-pgsql/centos/docker-entrypoint.sh
View File

@ -75,6 +75,8 @@ check_variables() {
: ${DB_SERVER_SCHEMA:="public"} : ${DB_SERVER_SCHEMA:="public"}
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
: ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"}
} }
check_db_connect() { check_db_connect() {
@ -104,7 +106,7 @@ check_db_connect() {
WAIT_TIMEOUT=5 WAIT_TIMEOUT=5
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi

4
web-nginx-pgsql/ol/README.md
View File

@ -120,6 +120,10 @@ By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `za
The variable is Zabbix database name. By default, value is `zabbix`. The variable is Zabbix database name. By default, value is `zabbix`.
### `POSTGRES_USE_IMPLICIT_SEARCH_PATH`
In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database.
### `ZBX_HISTORYSTORAGEURL` ### `ZBX_HISTORYSTORAGEURL`
History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5. History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5.

4
web-nginx-pgsql/ol/docker-entrypoint.sh
View File

@ -75,6 +75,8 @@ check_variables() {
: ${DB_SERVER_SCHEMA:="public"} : ${DB_SERVER_SCHEMA:="public"}
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
: ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"}
} }
check_db_connect() { check_db_connect() {
@ -104,7 +106,7 @@ check_db_connect() {
WAIT_TIMEOUT=5 WAIT_TIMEOUT=5
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi

4
web-nginx-pgsql/ubuntu/README.md
View File

@ -120,6 +120,10 @@ By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `za
The variable is Zabbix database name. By default, value is `zabbix`. The variable is Zabbix database name. By default, value is `zabbix`.
### `POSTGRES_USE_IMPLICIT_SEARCH_PATH`
In some setups, for example including [PgBouncer](https://www.pgbouncer.org), setting the `search_path` via connection parameters fails. If this variable is set to `"true"`, the image skips setting the `search_path` and trusts that the `search_path` of the Zabbix user is setup correctly in PostgreSQL database.
### `ZBX_HISTORYSTORAGEURL` ### `ZBX_HISTORYSTORAGEURL`
History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5. History storage HTTP[S] URL. This parameter is used for Elasticsearch setup. Available since 3.4.5.

4
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -75,6 +75,8 @@ check_variables() {
: ${DB_SERVER_SCHEMA:="public"} : ${DB_SERVER_SCHEMA:="public"}
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
: ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"}
} }
check_db_connect() { check_db_connect() {
@ -104,7 +106,7 @@ check_db_connect() {
WAIT_TIMEOUT=5 WAIT_TIMEOUT=5
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ "${POSTGRES_USE_IMPLICIT_SEARCH_PATH,,}" == "false" ] && [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
fi fi

2
zabbix-appliance/rhel/README.md
View File

@ -133,7 +133,7 @@ ZBX_HISTORYCACHESIZE=16M
ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYINDEXCACHESIZE=4M
ZBX_TRENDCACHESIZE=4M ZBX_TRENDCACHESIZE=4M
ZBX_VALUECACHESIZE=8M ZBX_VALUECACHESIZE=8M
ZBX_TRAPPERIMEOUT=300 ZBX_TRAPPERTIMEOUT=300
ZBX_UNREACHABLEPERIOD=45 ZBX_UNREACHABLEPERIOD=45
ZBX_UNAVAILABLEDELAY=60 ZBX_UNAVAILABLEDELAY=60
ZBX_UNREACHABLEDELAY=15 ZBX_UNREACHABLEDELAY=15

2
zabbix-appliance/rhel/docker-entrypoint.sh
View File

@ -484,7 +484,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"