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

Merge pull request #46 from zabbix/master

Browse Source 
Accumulated merge
This commit is contained in:
Alexey Pustovalov
2016-10-24 21:13:59 +03:00
committed by GitHub
parent a97615b19c 443d43f502
commit 4a2ebd1bcc
34 changed files with 324 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
web-nginx-mysql/alpine/run_zabbix_component.sh
View File

@ -609,8 +609,22 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
update_config_var $ZBX_CONFIG "AlertScriptsPath" "/usr/lib/zabbix/alertscripts"
update_config_var $ZBX_CONFIG "ExternalScripts" "/usr/lib/zabbix/externalscripts"
# Possible few fping locations
if [ -f "/usr/bin/fping" ]; then
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
else
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
fi
if [ -f "/usr/bin/fping6" ]; then
update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
else
update_config_var $ZBX_CONFIG "Fping6Location" "/usr/sbin/fping6"
fi
update_config_var $ZBX_CONFIG "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################"
echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf
exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
#################################################

2
web-nginx-mysql/ubuntu/Dockerfile
View File

@ -39,6 +39,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
ttf-dejavu-core 1>/dev/null && \
apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \
mkdir -p /var/lib/php5 && \
chown --quiet -R www-data:www-data /var/lib/php5 && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2

2
web-nginx-mysql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini
View File

@ -5,4 +5,4 @@ upload_max_filesize=2M
max_input_time=300
always_populate_raw_post_date=-1
; date.timezone=Europe/Riga
; session.save_path=/var/lib/php5
session.save_path=/var/lib/php5

20
web-nginx-mysql/ubuntu/run_zabbix_component.sh
View File

@ -609,8 +609,22 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
update_config_var $ZBX_CONFIG "AlertScriptsPath" "/usr/lib/zabbix/alertscripts"
update_config_var $ZBX_CONFIG "ExternalScripts" "/usr/lib/zabbix/externalscripts"
# Possible few fping locations
if [ -f "/usr/bin/fping" ]; then
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
else
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
fi
if [ -f "/usr/bin/fping6" ]; then
update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
else
update_config_var $ZBX_CONFIG "Fping6Location" "/usr/sbin/fping6"
fi
update_config_var $ZBX_CONFIG "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################"
echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf
exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
#################################################