extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-29 19:23:09 +01: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
commit 4a2ebd1bcc
34 changed files with 324 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
agent/alpine/Dockerfile
View File

@ -48,6 +48,7 @@ RUN apk update && \
--silent \ --silent \
--sysconfdir=/etc/zabbix \ --sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \ --libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-agent \ --enable-agent \
--enable-ipv6 \ --enable-ipv6 \
--with-openssl && \ --with-openssl && \

20
agent/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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

1
agent/ubuntu/Dockerfile
View File

@ -55,6 +55,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
--silent \ --silent \
--sysconfdir=/etc/zabbix \ --sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \ --libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-agent \ --enable-agent \
--enable-ipv6 \ --enable-ipv6 \
--with-openssl && \ --with-openssl && \

20
agent/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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

1
java-gateway/alpine/Dockerfile
View File

@ -46,6 +46,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
--silent \ --silent \
--sysconfdir=/etc/zabbix \ --sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \ --libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-java && \ --enable-java && \
make -j"$(nproc)" -s 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \
mkdir -p /usr/sbin/zabbix_java/ && \ mkdir -p /usr/sbin/zabbix_java/ && \

20
java-gateway/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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

1
java-gateway/ubuntu/Dockerfile
View File

@ -53,6 +53,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
--silent \ --silent \
--sysconfdir=/etc/zabbix \ --sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \ --libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-java && \ --enable-java && \
make -j"$(nproc)" -s 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \
mkdir -p /usr/sbin/zabbix_java/ && \ mkdir -p /usr/sbin/zabbix_java/ && \

20
java-gateway/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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

3
proxy-mysql/alpine/Dockerfile
View File

@ -73,6 +73,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
--silent \ --silent \
--sysconfdir=/etc/zabbix \ --sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \ --libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-proxy \ --enable-proxy \
--enable-ipv6 \ --enable-ipv6 \
# Does not support stable iksemel library # Does not support stable iksemel library
@ -90,8 +91,6 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
make -j"$(nproc)" -s 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \
cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \ cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \
cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \ cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \
sed -i -e "/^FpingLocation=/s/=.*/=\/usr\/sbin\/fping/" "/etc/zabbix/zabbix_proxy.conf" && \
sed -i -e "/^Fping6Location=/s/=.*/=\/usr\/sbin\/fping6/" "/etc/zabbix/zabbix_proxy.conf" && \
chown --quiet -R zabbix:root /etc/zabbix && \ chown --quiet -R zabbix:root /etc/zabbix && \
cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-proxy-${DB_TYPE}/ && \ cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-proxy-${DB_TYPE}/ && \
cd /tmp/ && \ cd /tmp/ && \

20
proxy-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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

1
proxy-mysql/ubuntu/Dockerfile
View File

@ -81,6 +81,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
--silent \ --silent \
--sysconfdir=/etc/zabbix \ --sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \ --libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-proxy \ --enable-proxy \
--enable-ipv6 \ --enable-ipv6 \
--with-jabber \ --with-jabber \

20
proxy-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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

3
proxy-sqlite3/alpine/Dockerfile
View File

@ -69,6 +69,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
--silent \ --silent \
--sysconfdir=/etc/zabbix \ --sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \ --libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-proxy \ --enable-proxy \
--enable-ipv6 \ --enable-ipv6 \
# Does not support stable iksemel library # Does not support stable iksemel library
@ -86,8 +87,6 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
make -j"$(nproc)" -s 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \
cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \ cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \
cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \ cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \
sed -i -e "/^FpingLocation=/s/=.*/=\/usr\/sbin\/fping/" "/etc/zabbix/zabbix_proxy.conf" && \
sed -i -e "/^Fping6Location=/s/=.*/=\/usr\/sbin\/fping6/" "/etc/zabbix/zabbix_proxy.conf" && \
chown --quiet -R zabbix:root /etc/zabbix && \ chown --quiet -R zabbix:root /etc/zabbix && \
cd /tmp/ && \ cd /tmp/ && \
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \

20
proxy-sqlite3/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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

1
proxy-sqlite3/ubuntu/Dockerfile
View File

@ -79,6 +79,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
--silent \ --silent \
--sysconfdir=/etc/zabbix \ --sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \ --libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-proxy \ --enable-proxy \
--enable-ipv6 \ --enable-ipv6 \
--with-jabber \ --with-jabber \

20
proxy-sqlite3/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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

3
server-mysql/alpine/Dockerfile
View File

@ -74,6 +74,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
--silent \ --silent \
--sysconfdir=/etc/zabbix \ --sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \ --libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-server \ --enable-server \
--enable-ipv6 \ --enable-ipv6 \
# Does not support stable iksemel library # Does not support stable iksemel library
@ -91,8 +92,6 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
make -j"$(nproc)" -s 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \
cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \ cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \
cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \ cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \
sed -i -e "/^FpingLocation=/s/=.*/=\/usr\/sbin\/fping/" "/etc/zabbix/zabbix_server.conf" && \
sed -i -e "/^Fping6Location=/s/=.*/=\/usr\/sbin\/fping6/" "/etc/zabbix/zabbix_server.conf" && \
chown --quiet -R zabbix:root /etc/zabbix && \ chown --quiet -R zabbix:root /etc/zabbix && \
cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \ cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \
cp database/${DB_TYPE}/images.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \ cp database/${DB_TYPE}/images.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \

20
server-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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

1
server-mysql/ubuntu/Dockerfile
View File

@ -82,6 +82,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
--silent \ --silent \
--sysconfdir=/etc/zabbix \ --sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \ --libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-server \ --enable-server \
--enable-ipv6 \ --enable-ipv6 \
--with-jabber \ --with-jabber \

20
server-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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

3
server-pgsql/alpine/Dockerfile
View File

@ -74,6 +74,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
--silent \ --silent \
--sysconfdir=/etc/zabbix \ --sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \ --libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-server \ --enable-server \
--enable-ipv6 \ --enable-ipv6 \
# Does not support stable iksemel library # Does not support stable iksemel library
@ -91,8 +92,6 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
make -j"$(nproc)" -s 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \
cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \ cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \
cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \ cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \
sed -i -e "/^FpingLocation=/s/=.*/=\/usr\/sbin\/fping/" "/etc/zabbix/zabbix_server.conf" && \
sed -i -e "/^Fping6Location=/s/=.*/=\/usr\/sbin\/fping6/" "/etc/zabbix/zabbix_server.conf" && \
chown --quiet -R zabbix:root /etc/zabbix && \ chown --quiet -R zabbix:root /etc/zabbix && \
cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \ cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \
cp database/${DB_TYPE}/images.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \ cp database/${DB_TYPE}/images.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \

20
server-pgsql/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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

1
server-pgsql/ubuntu/Dockerfile
View File

@ -82,6 +82,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
--silent \ --silent \
--sysconfdir=/etc/zabbix \ --sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \ --libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-server \ --enable-server \
--enable-ipv6 \ --enable-ipv6 \
--with-jabber \ --with-jabber \

20
server-pgsql/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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

20
web-apache-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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

20
web-apache-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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" 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 && \ ttf-dejavu-core 1>/dev/null && \
apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \ 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/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2 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 max_input_time=300
always_populate_raw_post_date=-1 always_populate_raw_post_date=-1
; date.timezone=Europe/Riga ; 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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

20
web-nginx-pgsql/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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################

2
web-nginx-pgsql/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 && \ ttf-dejavu-core 1>/dev/null && \
apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \ apt-get ${APT_FLAGS_COMMON} clean && \
mkdir -p /var/lib/php5 && \
chown --quite -R www-data:www-data /var/lib/php5 && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2 ARG MAJOR_VERSION=3.2

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

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

20
web-nginx-pgsql/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 "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}"
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 "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}" update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################" echo "########################################################"
echo "** Executing supervisord" echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
################################################# #################################################