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"