extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-16 03:27:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fping location by env variable

Browse Source
This commit is contained in:
Alexey Pustovalov
2024-12-24 13:18:02 +09:00
parent 48a2e8f559
commit 14cd25f9ed
40 changed files with 208 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfiles/server-mysql/ol/Dockerfile
View File

@ -14,7 +14,8 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm \
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
NMAP_PRIVILEGED=""
NMAP_PRIVILEGED=""\
ZBX_FPINGLOCATION="/usr/sbin/fping"
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.description="Zabbix server with MySQL database support" \

4
Dockerfiles/server-mysql/ol/docker-entrypoint.sh
View File

@ -512,8 +512,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
fi
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
update_config_var $ZBX_CONFIG "Fping6Location"
update_config_var $ZBX_CONFIG "FpingLocation" "${ZBX_FPINGLOCATION}"
update_config_var $ZBX_CONFIG "Fping6Location" '""'
update_config_var $ZBX_CONFIG "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"