From dde51ffd897115f2f95f173a3fc28d76161eb111 Mon Sep 17 00:00:00 2001 From: dotneft Date: Mon, 24 Oct 2016 04:02:18 -0700 Subject: [PATCH 1/4] Fixed shutdown images --- agent/alpine/run_zabbix_component.sh | 2 +- agent/ubuntu/run_zabbix_component.sh | 2 +- java-gateway/alpine/run_zabbix_component.sh | 2 +- java-gateway/ubuntu/run_zabbix_component.sh | 2 +- proxy-mysql/alpine/run_zabbix_component.sh | 2 +- proxy-mysql/ubuntu/run_zabbix_component.sh | 2 +- proxy-sqlite3/alpine/run_zabbix_component.sh | 2 +- proxy-sqlite3/ubuntu/run_zabbix_component.sh | 2 +- server-mysql/alpine/run_zabbix_component.sh | 2 +- server-mysql/ubuntu/run_zabbix_component.sh | 2 +- server-pgsql/alpine/run_zabbix_component.sh | 2 +- server-pgsql/ubuntu/run_zabbix_component.sh | 2 +- web-apache-mysql/alpine/run_zabbix_component.sh | 2 +- web-apache-mysql/ubuntu/run_zabbix_component.sh | 2 +- web-nginx-mysql/alpine/run_zabbix_component.sh | 2 +- web-nginx-mysql/ubuntu/run_zabbix_component.sh | 2 +- web-nginx-pgsql/alpine/run_zabbix_component.sh | 2 +- web-nginx-pgsql/ubuntu/run_zabbix_component.sh | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/agent/alpine/run_zabbix_component.sh b/agent/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/agent/alpine/run_zabbix_component.sh +++ b/agent/alpine/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/agent/ubuntu/run_zabbix_component.sh b/agent/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/agent/ubuntu/run_zabbix_component.sh +++ b/agent/ubuntu/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/java-gateway/alpine/run_zabbix_component.sh b/java-gateway/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/java-gateway/alpine/run_zabbix_component.sh +++ b/java-gateway/alpine/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/java-gateway/ubuntu/run_zabbix_component.sh b/java-gateway/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/java-gateway/ubuntu/run_zabbix_component.sh +++ b/java-gateway/ubuntu/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/proxy-mysql/alpine/run_zabbix_component.sh b/proxy-mysql/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/proxy-mysql/alpine/run_zabbix_component.sh +++ b/proxy-mysql/alpine/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/proxy-mysql/ubuntu/run_zabbix_component.sh b/proxy-mysql/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/proxy-mysql/ubuntu/run_zabbix_component.sh +++ b/proxy-mysql/ubuntu/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/proxy-sqlite3/alpine/run_zabbix_component.sh b/proxy-sqlite3/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/proxy-sqlite3/alpine/run_zabbix_component.sh +++ b/proxy-sqlite3/alpine/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/proxy-sqlite3/ubuntu/run_zabbix_component.sh b/proxy-sqlite3/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/proxy-sqlite3/ubuntu/run_zabbix_component.sh +++ b/proxy-sqlite3/ubuntu/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/server-mysql/alpine/run_zabbix_component.sh b/server-mysql/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/server-mysql/alpine/run_zabbix_component.sh +++ b/server-mysql/alpine/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/server-mysql/ubuntu/run_zabbix_component.sh b/server-mysql/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/server-mysql/ubuntu/run_zabbix_component.sh +++ b/server-mysql/ubuntu/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/server-pgsql/alpine/run_zabbix_component.sh b/server-pgsql/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/server-pgsql/alpine/run_zabbix_component.sh +++ b/server-pgsql/alpine/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/server-pgsql/ubuntu/run_zabbix_component.sh b/server-pgsql/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/server-pgsql/ubuntu/run_zabbix_component.sh +++ b/server-pgsql/ubuntu/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/web-apache-mysql/alpine/run_zabbix_component.sh b/web-apache-mysql/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/web-apache-mysql/alpine/run_zabbix_component.sh +++ b/web-apache-mysql/alpine/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/web-apache-mysql/ubuntu/run_zabbix_component.sh b/web-apache-mysql/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/web-apache-mysql/ubuntu/run_zabbix_component.sh +++ b/web-apache-mysql/ubuntu/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/web-nginx-mysql/alpine/run_zabbix_component.sh b/web-nginx-mysql/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/web-nginx-mysql/alpine/run_zabbix_component.sh +++ b/web-nginx-mysql/alpine/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/web-nginx-mysql/ubuntu/run_zabbix_component.sh b/web-nginx-mysql/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/web-nginx-mysql/ubuntu/run_zabbix_component.sh +++ b/web-nginx-mysql/ubuntu/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/web-nginx-pgsql/alpine/run_zabbix_component.sh b/web-nginx-pgsql/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/web-nginx-pgsql/alpine/run_zabbix_component.sh +++ b/web-nginx-pgsql/alpine/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# diff --git a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh +++ b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh @@ -888,6 +888,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 ################################################# From 78714133bb3a01b440f02a5affadeb313fa21f30 Mon Sep 17 00:00:00 2001 From: dotneft Date: Mon, 24 Oct 2016 04:41:00 -0700 Subject: [PATCH 2/4] Fixed fping location on different images --- agent/alpine/run_zabbix_component.sh | 15 +++++++++++++-- agent/ubuntu/run_zabbix_component.sh | 15 +++++++++++++-- java-gateway/alpine/run_zabbix_component.sh | 15 +++++++++++++-- java-gateway/ubuntu/run_zabbix_component.sh | 15 +++++++++++++-- proxy-mysql/alpine/Dockerfile | 2 -- proxy-mysql/alpine/run_zabbix_component.sh | 15 +++++++++++++-- proxy-mysql/ubuntu/run_zabbix_component.sh | 15 +++++++++++++-- proxy-sqlite3/alpine/Dockerfile | 2 -- proxy-sqlite3/alpine/run_zabbix_component.sh | 15 +++++++++++++-- proxy-sqlite3/ubuntu/run_zabbix_component.sh | 15 +++++++++++++-- server-mysql/alpine/Dockerfile | 2 -- server-mysql/alpine/run_zabbix_component.sh | 15 +++++++++++++-- server-mysql/ubuntu/run_zabbix_component.sh | 15 +++++++++++++-- server-pgsql/alpine/Dockerfile | 2 -- server-pgsql/alpine/run_zabbix_component.sh | 15 +++++++++++++-- server-pgsql/ubuntu/run_zabbix_component.sh | 15 +++++++++++++-- web-apache-mysql/alpine/run_zabbix_component.sh | 15 +++++++++++++-- web-apache-mysql/ubuntu/run_zabbix_component.sh | 15 +++++++++++++-- web-nginx-mysql/alpine/run_zabbix_component.sh | 15 +++++++++++++-- web-nginx-mysql/ubuntu/run_zabbix_component.sh | 15 +++++++++++++-- web-nginx-pgsql/alpine/run_zabbix_component.sh | 15 +++++++++++++-- web-nginx-pgsql/ubuntu/run_zabbix_component.sh | 15 +++++++++++++-- 22 files changed, 234 insertions(+), 44 deletions(-) diff --git a/agent/alpine/run_zabbix_component.sh b/agent/alpine/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/agent/alpine/run_zabbix_component.sh +++ b/agent/alpine/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/agent/ubuntu/run_zabbix_component.sh b/agent/ubuntu/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/agent/ubuntu/run_zabbix_component.sh +++ b/agent/ubuntu/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/java-gateway/alpine/run_zabbix_component.sh b/java-gateway/alpine/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/java-gateway/alpine/run_zabbix_component.sh +++ b/java-gateway/alpine/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/java-gateway/ubuntu/run_zabbix_component.sh b/java-gateway/ubuntu/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/java-gateway/ubuntu/run_zabbix_component.sh +++ b/java-gateway/ubuntu/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 7a2757ddf..66b528579 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -90,8 +90,6 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \ 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 && \ cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-proxy-${DB_TYPE}/ && \ cd /tmp/ && \ diff --git a/proxy-mysql/alpine/run_zabbix_component.sh b/proxy-mysql/alpine/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/proxy-mysql/alpine/run_zabbix_component.sh +++ b/proxy-mysql/alpine/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/proxy-mysql/ubuntu/run_zabbix_component.sh b/proxy-mysql/ubuntu/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/proxy-mysql/ubuntu/run_zabbix_component.sh +++ b/proxy-mysql/ubuntu/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 9e4736fd3..c0b5a1987 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -86,8 +86,6 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \ 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 && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ diff --git a/proxy-sqlite3/alpine/run_zabbix_component.sh b/proxy-sqlite3/alpine/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/proxy-sqlite3/alpine/run_zabbix_component.sh +++ b/proxy-sqlite3/alpine/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/proxy-sqlite3/ubuntu/run_zabbix_component.sh b/proxy-sqlite3/ubuntu/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/proxy-sqlite3/ubuntu/run_zabbix_component.sh +++ b/proxy-sqlite3/ubuntu/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 5a3288d44..2c2b966d9 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -91,8 +91,6 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \ 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 && \ 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}/ && \ diff --git a/server-mysql/alpine/run_zabbix_component.sh b/server-mysql/alpine/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/server-mysql/alpine/run_zabbix_component.sh +++ b/server-mysql/alpine/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/server-mysql/ubuntu/run_zabbix_component.sh b/server-mysql/ubuntu/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/server-mysql/ubuntu/run_zabbix_component.sh +++ b/server-mysql/ubuntu/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 5b3b674f2..e37df5440 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -91,8 +91,6 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \ 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 && \ 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}/ && \ diff --git a/server-pgsql/alpine/run_zabbix_component.sh b/server-pgsql/alpine/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/server-pgsql/alpine/run_zabbix_component.sh +++ b/server-pgsql/alpine/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/server-pgsql/ubuntu/run_zabbix_component.sh b/server-pgsql/ubuntu/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/server-pgsql/ubuntu/run_zabbix_component.sh +++ b/server-pgsql/ubuntu/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/web-apache-mysql/alpine/run_zabbix_component.sh b/web-apache-mysql/alpine/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/web-apache-mysql/alpine/run_zabbix_component.sh +++ b/web-apache-mysql/alpine/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/web-apache-mysql/ubuntu/run_zabbix_component.sh b/web-apache-mysql/ubuntu/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/web-apache-mysql/ubuntu/run_zabbix_component.sh +++ b/web-apache-mysql/ubuntu/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/web-nginx-mysql/alpine/run_zabbix_component.sh b/web-nginx-mysql/alpine/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/web-nginx-mysql/alpine/run_zabbix_component.sh +++ b/web-nginx-mysql/alpine/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/web-nginx-mysql/ubuntu/run_zabbix_component.sh b/web-nginx-mysql/ubuntu/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/web-nginx-mysql/ubuntu/run_zabbix_component.sh +++ b/web-nginx-mysql/ubuntu/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/web-nginx-pgsql/alpine/run_zabbix_component.sh b/web-nginx-pgsql/alpine/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/web-nginx-pgsql/alpine/run_zabbix_component.sh +++ b/web-nginx-pgsql/alpine/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" diff --git a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh index 9f855f685..1960ced30 100755 --- a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh +++ b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh @@ -609,8 +609,19 @@ 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" + + # 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}" From 5b282a9939dc765b43a541f0a31bd4df673c6c09 Mon Sep 17 00:00:00 2001 From: dotneft Date: Mon, 24 Oct 2016 06:11:42 -0700 Subject: [PATCH 3/4] Fix path to External scripts and Alert scripts --- agent/alpine/Dockerfile | 1 + agent/alpine/run_zabbix_component.sh | 3 +++ agent/ubuntu/Dockerfile | 1 + agent/ubuntu/run_zabbix_component.sh | 3 +++ java-gateway/alpine/Dockerfile | 1 + java-gateway/alpine/run_zabbix_component.sh | 3 +++ java-gateway/ubuntu/Dockerfile | 1 + java-gateway/ubuntu/run_zabbix_component.sh | 3 +++ proxy-mysql/alpine/Dockerfile | 1 + proxy-mysql/alpine/run_zabbix_component.sh | 3 +++ proxy-mysql/ubuntu/Dockerfile | 1 + proxy-mysql/ubuntu/run_zabbix_component.sh | 3 +++ proxy-sqlite3/alpine/Dockerfile | 1 + proxy-sqlite3/alpine/run_zabbix_component.sh | 3 +++ proxy-sqlite3/ubuntu/Dockerfile | 1 + proxy-sqlite3/ubuntu/run_zabbix_component.sh | 3 +++ server-mysql/alpine/Dockerfile | 1 + server-mysql/alpine/run_zabbix_component.sh | 3 +++ server-mysql/ubuntu/Dockerfile | 1 + server-mysql/ubuntu/run_zabbix_component.sh | 3 +++ server-pgsql/alpine/Dockerfile | 1 + server-pgsql/alpine/run_zabbix_component.sh | 3 +++ server-pgsql/ubuntu/Dockerfile | 1 + server-pgsql/ubuntu/run_zabbix_component.sh | 3 +++ web-apache-mysql/alpine/run_zabbix_component.sh | 3 +++ web-apache-mysql/ubuntu/run_zabbix_component.sh | 3 +++ web-nginx-mysql/alpine/run_zabbix_component.sh | 3 +++ web-nginx-mysql/ubuntu/run_zabbix_component.sh | 3 +++ web-nginx-pgsql/alpine/run_zabbix_component.sh | 3 +++ web-nginx-pgsql/ubuntu/run_zabbix_component.sh | 3 +++ 30 files changed, 66 insertions(+) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 2bea447ee..65a31968c 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -48,6 +48,7 @@ RUN apk update && \ --silent \ --sysconfdir=/etc/zabbix \ --libdir=/usr/lib/zabbix \ + --datadir=/usr/lib \ --enable-agent \ --enable-ipv6 \ --with-openssl && \ diff --git a/agent/alpine/run_zabbix_component.sh b/agent/alpine/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/agent/alpine/run_zabbix_component.sh +++ b/agent/alpine/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 78c37d388..c14098a8f 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -55,6 +55,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ --silent \ --sysconfdir=/etc/zabbix \ --libdir=/usr/lib/zabbix \ + --datadir=/usr/lib \ --enable-agent \ --enable-ipv6 \ --with-openssl && \ diff --git a/agent/ubuntu/run_zabbix_component.sh b/agent/ubuntu/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/agent/ubuntu/run_zabbix_component.sh +++ b/agent/ubuntu/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index e9845c793..0dfec7fab 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -46,6 +46,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ --silent \ --sysconfdir=/etc/zabbix \ --libdir=/usr/lib/zabbix \ + --datadir=/usr/lib \ --enable-java && \ make -j"$(nproc)" -s 1>/dev/null && \ mkdir -p /usr/sbin/zabbix_java/ && \ diff --git a/java-gateway/alpine/run_zabbix_component.sh b/java-gateway/alpine/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/java-gateway/alpine/run_zabbix_component.sh +++ b/java-gateway/alpine/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 338cdb4c3..18aa99033 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -53,6 +53,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ --silent \ --sysconfdir=/etc/zabbix \ --libdir=/usr/lib/zabbix \ + --datadir=/usr/lib \ --enable-java && \ make -j"$(nproc)" -s 1>/dev/null && \ mkdir -p /usr/sbin/zabbix_java/ && \ diff --git a/java-gateway/ubuntu/run_zabbix_component.sh b/java-gateway/ubuntu/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/java-gateway/ubuntu/run_zabbix_component.sh +++ b/java-gateway/ubuntu/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 66b528579..35455d3df 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -73,6 +73,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ --silent \ --sysconfdir=/etc/zabbix \ --libdir=/usr/lib/zabbix \ + --datadir=/usr/lib \ --enable-proxy \ --enable-ipv6 \ # Does not support stable iksemel library diff --git a/proxy-mysql/alpine/run_zabbix_component.sh b/proxy-mysql/alpine/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/proxy-mysql/alpine/run_zabbix_component.sh +++ b/proxy-mysql/alpine/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index b4e269a35..9aac7771b 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -81,6 +81,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ --silent \ --sysconfdir=/etc/zabbix \ --libdir=/usr/lib/zabbix \ + --datadir=/usr/lib \ --enable-proxy \ --enable-ipv6 \ --with-jabber \ diff --git a/proxy-mysql/ubuntu/run_zabbix_component.sh b/proxy-mysql/ubuntu/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/proxy-mysql/ubuntu/run_zabbix_component.sh +++ b/proxy-mysql/ubuntu/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index c0b5a1987..51159812c 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -69,6 +69,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ --silent \ --sysconfdir=/etc/zabbix \ --libdir=/usr/lib/zabbix \ + --datadir=/usr/lib \ --enable-proxy \ --enable-ipv6 \ # Does not support stable iksemel library diff --git a/proxy-sqlite3/alpine/run_zabbix_component.sh b/proxy-sqlite3/alpine/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/proxy-sqlite3/alpine/run_zabbix_component.sh +++ b/proxy-sqlite3/alpine/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 7674fd1e9..bce30687b 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -79,6 +79,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ --silent \ --sysconfdir=/etc/zabbix \ --libdir=/usr/lib/zabbix \ + --datadir=/usr/lib \ --enable-proxy \ --enable-ipv6 \ --with-jabber \ diff --git a/proxy-sqlite3/ubuntu/run_zabbix_component.sh b/proxy-sqlite3/ubuntu/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/proxy-sqlite3/ubuntu/run_zabbix_component.sh +++ b/proxy-sqlite3/ubuntu/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 2c2b966d9..3f6341abb 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -74,6 +74,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ --silent \ --sysconfdir=/etc/zabbix \ --libdir=/usr/lib/zabbix \ + --datadir=/usr/lib \ --enable-server \ --enable-ipv6 \ # Does not support stable iksemel library diff --git a/server-mysql/alpine/run_zabbix_component.sh b/server-mysql/alpine/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/server-mysql/alpine/run_zabbix_component.sh +++ b/server-mysql/alpine/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index bd8ffd0a0..ef2eeb9bd 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -82,6 +82,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ --silent \ --sysconfdir=/etc/zabbix \ --libdir=/usr/lib/zabbix \ + --datadir=/usr/lib \ --enable-server \ --enable-ipv6 \ --with-jabber \ diff --git a/server-mysql/ubuntu/run_zabbix_component.sh b/server-mysql/ubuntu/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/server-mysql/ubuntu/run_zabbix_component.sh +++ b/server-mysql/ubuntu/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index e37df5440..d4b04a74a 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -74,6 +74,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ --silent \ --sysconfdir=/etc/zabbix \ --libdir=/usr/lib/zabbix \ + --datadir=/usr/lib \ --enable-server \ --enable-ipv6 \ # Does not support stable iksemel library diff --git a/server-pgsql/alpine/run_zabbix_component.sh b/server-pgsql/alpine/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/server-pgsql/alpine/run_zabbix_component.sh +++ b/server-pgsql/alpine/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 61160aef1..a7a5b63fa 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -82,6 +82,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ --silent \ --sysconfdir=/etc/zabbix \ --libdir=/usr/lib/zabbix \ + --datadir=/usr/lib \ --enable-server \ --enable-ipv6 \ --with-jabber \ diff --git a/server-pgsql/ubuntu/run_zabbix_component.sh b/server-pgsql/ubuntu/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/server-pgsql/ubuntu/run_zabbix_component.sh +++ b/server-pgsql/ubuntu/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/web-apache-mysql/alpine/run_zabbix_component.sh b/web-apache-mysql/alpine/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/web-apache-mysql/alpine/run_zabbix_component.sh +++ b/web-apache-mysql/alpine/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/web-apache-mysql/ubuntu/run_zabbix_component.sh b/web-apache-mysql/ubuntu/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/web-apache-mysql/ubuntu/run_zabbix_component.sh +++ b/web-apache-mysql/ubuntu/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/web-nginx-mysql/alpine/run_zabbix_component.sh b/web-nginx-mysql/alpine/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/web-nginx-mysql/alpine/run_zabbix_component.sh +++ b/web-nginx-mysql/alpine/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/web-nginx-mysql/ubuntu/run_zabbix_component.sh b/web-nginx-mysql/ubuntu/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/web-nginx-mysql/ubuntu/run_zabbix_component.sh +++ b/web-nginx-mysql/ubuntu/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/web-nginx-pgsql/alpine/run_zabbix_component.sh b/web-nginx-pgsql/alpine/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/web-nginx-pgsql/alpine/run_zabbix_component.sh +++ b/web-nginx-pgsql/alpine/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" diff --git a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh index 1960ced30..fa26fa515 100755 --- a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh +++ b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh @@ -610,6 +610,9 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" + 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" From 443d43f5023aad07890b55dbbcae6d30c9a086e6 Mon Sep 17 00:00:00 2001 From: dotneft Date: Mon, 24 Oct 2016 09:07:07 -0700 Subject: [PATCH 4/4] Fix for session path on Nginx + Ubuntu --- web-nginx-mysql/ubuntu/Dockerfile | 2 ++ web-nginx-mysql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini | 2 +- web-nginx-pgsql/ubuntu/Dockerfile | 2 ++ web-nginx-pgsql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 3119ab181..f9ceb4ea3 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -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=master diff --git a/web-nginx-mysql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini b/web-nginx-mysql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini index 88543ad2b..2ceb8be41 100644 --- a/web-nginx-mysql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini +++ b/web-nginx-mysql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini @@ -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 diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 42850d545..0055d6c5e 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -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 --quite -R www-data:www-data /var/lib/php5 && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=master diff --git a/web-nginx-pgsql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini b/web-nginx-pgsql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini index 88543ad2b..2ceb8be41 100644 --- a/web-nginx-pgsql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini +++ b/web-nginx-pgsql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini @@ -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