Compare commits

...

42 Commits
7.4 ... 3.4.9

Author SHA1 Message Date
root
35a2970b45 Merge remote-tracking branch 'origin/master' into 3.4 2018-05-31 20:36:54 -07:00
root
b9a87e03f9 Merge remote-tracking branch 'origin/master' into 3.4 2018-05-31 20:09:40 -07:00
root
057da5977a Updated all Dockerfiles to make consistency 2018-05-31 20:08:26 -07:00
root
f7ea70014e Updated all Dockerfiles to make consistency 2018-05-31 18:53:39 -07:00
root
1aecfd4d9d Merge remote-tracking branch 'origin/master' into 3.4 2018-05-29 22:37:52 -07:00
root
cb12914302 Zabbix Appliance multistage images. Fixed missing ldap on Zabbix agent (ubuntu) image 2018-05-29 07:22:53 -07:00
root
2cbdb1008e Using multistage dockerfile for centos-based images + Zabbix agent images 2018-05-28 21:58:48 -07:00
Alexey Pustovalov
06fb4785ea
Merge pull request #311 from zabbix/master
Fixed php-fpm7 on Alpine images
2018-05-24 15:32:40 +08:00
Alexey Pustovalov
3e4cf5ca41
Merge pull request #304 from zabbix/master
Fixed php-fpm7 on Alpine images
2018-05-11 23:54:44 +03:00
Alexey Pustovalov
e9af3e574d
Merge pull request #300 from zabbix/master
Fixed php-fpm7 on Alpine images
2018-05-11 23:21:54 +03:00
root
de11320db3 Zabbix 3.4.9 2018-05-10 19:17:25 -07:00
root
06e1b1f39f Merge from master 2018-05-10 19:15:45 -07:00
Alexey Pustovalov
c6758ce2ad
Merge pull request #294 from zabbix/master
Updated README for RHEL
2018-05-09 15:59:16 +03:00
Alexey Pustovalov
317cd8c1cb
Merge pull request #290 from zabbix/master
Fixed run command example for RHEL
2018-05-09 15:48:16 +03:00
root
9dcf51ae8c Added Zabbix Appliance for RHEL 7 (3.4) 2018-05-09 00:29:33 +03:00
Alexey Pustovalov
ac13fe23ff
Merge pull request #285 from zabbix/master
Added Zabbix Appliance for RHEL 7
2018-05-09 00:26:17 +03:00
root
9ca103de4d Zabbix v3.4.8 2018-04-06 07:55:10 -07:00
Alexey Pustovalov
c10cc3dcf2
Merge pull request #271 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-31 00:09:23 +03:00
Alexey Pustovalov
e481a09b45
Merge pull request #268 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-31 00:06:08 +03:00
root
81529c3fdc Fixed small issues. Preparation for Appliance 2018-03-30 05:31:45 -07:00
root
09ca4c196f Fixed small issues. Preparation for Appliance 2018-03-30 05:30:07 -07:00
Alexey Pustovalov
2413be7987
Merge pull request #259 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-29 16:54:26 +03:00
root
9f7a808a92 Merge remote-tracking branch 'origin/master' into 3.4 2018-02-23 13:49:24 -08:00
root
ffd5209dbd Merge remote-tracking branch 'origin/master' into 3.4 2018-02-22 14:38:00 -08:00
root
0e906b0c9f Merge remote-tracking branch 'origin/master' into 3.4 2018-02-22 13:30:59 -08:00
root
1f7658150c Merge remote-tracking branch 'origin/master' into 3.4 2018-02-22 12:54:55 -08:00
root
282cbd2e6e Merge remote-tracking branch 'origin/master' into 3.4 2018-02-22 12:39:20 -08:00
root
16b123ade6 Removed supervisord from single application images 2018-02-22 12:19:46 -08:00
Alexey Pustovalov
750e4ee8ec
Merge pull request #234 from zabbix/master
Fixed issue in ubuntu image
2018-02-22 13:03:16 +02:00
Alexey Pustovalov
ac9c1aa6d6
Merge pull request #231 from zabbix/master
Fixed issue with config params undef
2018-02-21 03:02:31 +02:00
root
d5192f2583 Updated docker compose variables 2018-02-20 06:51:42 -08:00
root
607231f24d Added v3 compose files 2018-02-20 06:30:17 -08:00
Alexey Pustovalov
fc2d559200
Merge pull request #227 from zabbix/master
Added v3 compose files
2018-02-21 01:01:28 +02:00
root
ebac10ccac New config parameters for Zabbix 3.4 2018-02-18 02:07:46 -08:00
root
3bd27fb805 New config parameters for Zabbix 3.4 2018-02-18 02:06:57 -08:00
root
2e761ff1de Zabbix v3.4.7 2018-02-18 01:41:44 -08:00
root
205854c078 Updated agent alpine 2018-02-17 23:31:08 -08:00
root
96ff63f85b Fixed issue with agent image 2018-02-17 18:02:58 -08:00
Alexey Pustovalov
d4d92f5d53
Merge pull request #223 from zabbix/master
Fixed issue with web-nginx-mysql image
2018-02-19 13:07:09 +02:00
root
20485e0d03 Fixed issue with proxy-mysql image 2018-02-17 16:19:32 -08:00
Alexey Pustovalov
0be6ceb9c9
Merge pull request #217 from zabbix/master
Revert "Merge branch '3.4' into master"
2018-02-19 12:13:17 +02:00
Alexey Pustovalov
7683d7df27
Merge pull request #216 from zabbix/master
Master
2018-02-19 12:06:52 +02:00
107 changed files with 793 additions and 289 deletions

View File

@ -2,6 +2,8 @@
# ZBX_SERVER_HOST=zabbix-server
# ZBX_SERVER_PORT=10051
# ZBX_HOSTNAME=zabbix-proxy-$db_type
# ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
# ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0
# ZBX_HOSTNAMEITEM=system.hostname
# ZBX_SOURCEIP=
# ZBX_DEBUGLEVEL=3

View File

@ -1,7 +1,10 @@
# ZBX_LISTENIP=
# ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
# ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
# ZBX_DEBUGLEVEL=3
# ZBX_STARTPOLLERS=5
# ZBX_IPMIPOLLERS=0
# ZBX_STARTPREPROCESSORS=3 # Available since 3.4.0
# ZBX_STARTPOLLERSUNREACHABLE=1
# ZBX_STARTTRAPPERS=5
# ZBX_STARTPINGERS=1
@ -9,6 +12,7 @@
# ZBX_STARTHTTPPOLLERS=1
# ZBX_STARTTIMERS=1
# ZBX_STARTESCALATORS=1
# ZBX_STARTALERTERS=3 # Available since 3.4.0
ZBX_JAVAGATEWAY_ENABLE=true
# ZBX_JAVAGATEWAY=zabbix-java-gateway
# ZBX_JAVAGATEWAYPORT=10052

View File

@ -3,8 +3,8 @@ FROM alpine:3.4 as builder
ARG APK_FLAGS_COMMON=""
ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=agent
@ -16,6 +16,7 @@ RUN apk update && \
automake \
openssl-dev \
openldap-dev \
pcre-dev \
subversion \
coreutils && \
cd /tmp/ && \
@ -47,8 +48,8 @@ ARG VCS_REF
ARG APK_FLAGS_COMMON=""
ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
@ -89,7 +90,8 @@ RUN addgroup zabbix && \
bash \
coreutils \
iputils \
libldap && \
libldap \
pcre && \
rm -rf /var/cache/apk/*
EXPOSE 10050/TCP

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -3,8 +3,8 @@ FROM centos:centos7 as builder
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=agent
@ -47,8 +47,8 @@ ARG VCS_REF
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -3,8 +3,8 @@ FROM ubuntu:trusty as builder
ARG APT_FLAGS_COMMON="-y"
ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
ZBX_TYPE=agent ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -16,6 +16,7 @@ RUN locale-gen $LC_ALL && \
automake \
libc6-dev \
libldap2-dev \
libpcre3-dev \
libssl-dev \
make \
pkg-config \
@ -49,8 +50,8 @@ ARG VCS_REF
ARG APT_FLAGS_COMMON="-y"
ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none \
@ -92,6 +93,7 @@ RUN locale-gen $LC_ALL && \
chown --quiet -R zabbix:root /var/lib/zabbix && \
apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install \
libpcre3 \
libldap-2.4 && \
apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -1,7 +1,7 @@
version: '2'
services:
zabbix-server:
image: zabbix/zabbix-server-mysql:alpine-latest
image: zabbix/zabbix-server-mysql:alpine-3.4-latest
ports:
- "10051:10051"
volumes:
@ -43,7 +43,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:alpine-latest
image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest
ports:
- "10061:10051"
volumes:
@ -83,7 +83,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:alpine-latest
image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest
ports:
- "10071:10051"
volumes:
@ -124,7 +124,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:alpine-latest
image: zabbix/zabbix-web-apache-mysql:alpine-3.4-latest
ports:
- "80:80"
- "443:443"
@ -155,7 +155,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:alpine-latest
image: zabbix/zabbix-web-nginx-mysql:alpine-3.4-latest
ports:
- "8081:80"
- "8443:443"
@ -186,7 +186,7 @@ services:
com.zabbix.os: "alpine"
zabbix-agent:
image: zabbix/zabbix-agent:alpine-latest
image: zabbix/zabbix-agent:alpine-3.4-latest
ports:
- "10050:10050"
volumes:
@ -216,7 +216,7 @@ services:
com.zabbix.os: "alpine"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:alpine-latest
image: zabbix/zabbix-java-gateway:alpine-3.4-latest
ports:
- "10052:10052"
env_file:
@ -234,7 +234,7 @@ services:
com.zabbix.os: "alpine"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:alpine-latest
image: zabbix/zabbix-snmptraps:alpine-3.4-latest
ports:
- "162:162/udp"
volumes:

View File

@ -2,7 +2,7 @@ version: '2'
services:
zabbix-server:
build: ./server-mysql/alpine
image: zabbix-server-mysql:alpine-local
image: zabbix-server-mysql:alpine-3.4-local
ports:
- "10051:10051"
volumes:
@ -45,7 +45,7 @@ services:
zabbix-proxy-sqlite3:
build: ./proxy-sqlite3/alpine
image: zabbix-proxy-sqlite3:alpine-local
image: zabbix-proxy-sqlite3:alpine-3.4-local
ports:
- "10061:10051"
volumes:
@ -86,7 +86,7 @@ services:
zabbix-proxy-mysql:
build: ./proxy-mysql/alpine
image: zabbix-proxy-mysql:alpine-local
image: zabbix-proxy-mysql:alpine-3.4-local
ports:
- "10071:10051"
volumes:
@ -128,7 +128,7 @@ services:
zabbix-web-apache-mysql:
build: ./web-apache-mysql/alpine
image: zabbix-web-apache-mysql:alpine-local
image: zabbix-web-apache-mysql:alpine-3.4-local
ports:
- "80:80"
- "443:443"
@ -160,7 +160,7 @@ services:
zabbix-web-nginx-mysql:
build: ./web-nginx-mysql/alpine
image: zabbix-web-nginx-mysql:alpine-local
image: zabbix-web-nginx-mysql:alpine-3.4-local
ports:
- "8081:80"
- "8443:443"
@ -192,7 +192,7 @@ services:
zabbix-agent:
build: ./agent/alpine
image: zabbix-agent:alpine-local
image: zabbix-agent:alpine-3.4-local
ports:
- "10050:10050"
volumes:
@ -223,7 +223,7 @@ services:
zabbix-java-gateway:
build: ./java-gateway/alpine
image: zabbix-java-gateway:alpine-local
image: zabbix-java-gateway:alpine-3.4-local
ports:
- "10052:10052"
env_file:
@ -242,7 +242,7 @@ services:
zabbix-snmptraps:
build: ./snmptraps/alpine
image: zabbix-snmptraps:alpine-local
image: zabbix-snmptraps:alpine-3.4-local
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '2'
services:
zabbix-server:
image: zabbix/zabbix-server-pgsql:alpine-latest
image: zabbix/zabbix-server-pgsql:alpine-3.4-latest
ports:
- "10051:10051"
volumes:
@ -43,7 +43,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:alpine-latest
image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest
ports:
- "10061:10051"
volumes:
@ -83,7 +83,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:alpine-latest
image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest
ports:
- "10071:10051"
volumes:
@ -155,7 +155,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:alpine-latest
image: zabbix/zabbix-web-nginx-pgsql:alpine-3.4-latest
ports:
- "8081:80"
- "8443:443"
@ -186,7 +186,7 @@ services:
com.zabbix.os: "alpine"
zabbix-agent:
image: zabbix/zabbix-agent:alpine-latest
image: zabbix/zabbix-agent:alpine-3.4-latest
ports:
- "10050:10050"
volumes:
@ -216,7 +216,7 @@ services:
com.zabbix.os: "alpine"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:alpine-latest
image: zabbix/zabbix-java-gateway:alpine-3.4-latest
ports:
- "10052:10052"
env_file:
@ -234,7 +234,7 @@ services:
com.zabbix.os: "alpine"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:alpine-latest
image: zabbix/zabbix-snmptraps:alpine-3.4-latest
ports:
- "162:162/udp"
volumes:

View File

@ -2,7 +2,7 @@ version: '2'
services:
zabbix-server:
build: ./server-pgsql/alpine
image: zabbix-server-pgsql:alpine-local
image: zabbix-server-pgsql:alpine-3.4-local
ports:
- "10051:10051"
volumes:
@ -45,7 +45,7 @@ services:
zabbix-proxy-sqlite3:
build: ./proxy-sqlite3/alpine
image: zabbix-proxy-sqlite3:alpine-local
image: zabbix-proxy-sqlite3:alpine-3.4-local
ports:
- "10061:10051"
volumes:
@ -86,7 +86,7 @@ services:
zabbix-proxy-mysql:
build: ./proxy-mysql/alpine
image: zabbix-proxy-mysql:alpine-local
image: zabbix-proxy-mysql:alpine-3.4-local
ports:
- "10071:10051"
volumes:
@ -129,7 +129,7 @@ services:
zabbix-web-apache-pgsql:
build: ./web-apache-pgsql/alpine
image: zabbix-web-apache-pgsql:alpine-local
image: zabbix-web-apache-pgsql:alpine-3.4-local
ports:
- "80:80"
- "443:443"
@ -161,7 +161,7 @@ services:
zabbix-web-nginx-pgsql:
build: ./web-nginx-pgsql/alpine
image: zabbix-web-nginx-pgsql:alpine-local
image: zabbix-web-nginx-pgsql:alpine-3.4-local
ports:
- "8081:80"
- "8443:443"
@ -193,7 +193,7 @@ services:
zabbix-agent:
build: ./agent/alpine
image: zabbix-agent:alpine-local
image: zabbix-agent:alpine-3.4-local
ports:
- "10050:10050"
volumes:
@ -224,7 +224,7 @@ services:
zabbix-java-gateway:
build: ./java-gateway/alpine
image: zabbix-java-gateway:alpine-local
image: zabbix-java-gateway:alpine-3.4-local
ports:
- "10052:10052"
env_file:
@ -243,7 +243,7 @@ services:
zabbix-snmptraps:
build: ./snmptraps/alpine
image: zabbix-snmptraps:alpine-local
image: zabbix-snmptraps:alpine-3.4-local
ports:
- "162:162/udp"
volumes:

View File

@ -2,7 +2,7 @@ version: '2'
services:
zabbix-server:
build: ./server-mysql/centos
image: zabbix-server-mysql:centos-local
image: zabbix-server-mysql:centos-3.4-local
ports:
- "10051:10051"
volumes:
@ -45,7 +45,7 @@ services:
zabbix-proxy-sqlite3:
build: ./proxy-sqlite3/centos
image: zabbix-proxy-sqlite3:centos-local
image: zabbix-proxy-sqlite3:centos-3.4-local
ports:
- "10061:10051"
volumes:
@ -86,7 +86,7 @@ services:
zabbix-proxy-mysql:
build: ./proxy-mysql/centos
image: zabbix-proxy-mysql:centos-local
image: zabbix-proxy-mysql:centos-3.4-local
ports:
- "10071:10051"
volumes:
@ -128,7 +128,7 @@ services:
zabbix-web-apache-mysql:
build: ./web-apache-mysql/centos
image: zabbix-web-apache-mysql:centos-local
image: zabbix-web-apache-mysql:centos-3.4-local
ports:
- "80:80"
- "443:443"
@ -160,7 +160,7 @@ services:
zabbix-web-nginx-mysql:
build: ./web-nginx-mysql/centos
image: zabbix-web-nginx-mysql:centos-local
image: zabbix-web-nginx-mysql:centos-3.4-local
ports:
- "8081:80"
- "8443:443"
@ -192,7 +192,7 @@ services:
zabbix-agent:
build: ./agent/centos
image: zabbix-agent:centos-local
image: zabbix-agent:centos-3.4-local
ports:
- "10050:10050"
volumes:
@ -223,7 +223,7 @@ services:
zabbix-java-gateway:
build: ./java-gateway/centos
image: zabbix-java-gateway:centos-local
image: zabbix-java-gateway:centos-3.4-local
ports:
- "10052:10052"
env_file:
@ -242,7 +242,7 @@ services:
zabbix-snmptraps:
build: ./snmptraps/centos
image: zabbix-snmptraps:centos-local
image: zabbix-snmptraps:centos-3.4-local
ports:
- "162:162/udp"
volumes:

View File

@ -2,7 +2,7 @@ version: '2'
services:
zabbix-server:
build: ./server-pgsql/centos
image: zabbix-server-pgsql:centos-local
image: zabbix-server-pgsql:centos-3.4-local
ports:
- "10051:10051"
volumes:
@ -45,7 +45,7 @@ services:
zabbix-proxy-sqlite3:
build: ./proxy-sqlite3/centos
image: zabbix-proxy-sqlite3:centos-local
image: zabbix-proxy-sqlite3:centos-3.4-local
ports:
- "10061:10051"
volumes:
@ -86,7 +86,7 @@ services:
zabbix-proxy-mysql:
build: ./proxy-mysql/centos
image: zabbix-proxy-mysql:centos-local
image: zabbix-proxy-mysql:centos-3.4-local
ports:
- "10071:10051"
volumes:
@ -129,7 +129,7 @@ services:
zabbix-web-apache-pgsql:
build: ./web-apache-pgsql/centos
image: zabbix-web-apache-pgsql:centos-local
image: zabbix-web-apache-pgsql:centos-3.4-local
ports:
- "80:80"
- "443:443"
@ -161,7 +161,7 @@ services:
zabbix-web-nginx-pgsql:
build: ./web-nginx-pgsql/centos
image: zabbix-web-nginx-pgsql:centos-local
image: zabbix-web-nginx-pgsql:centos-3.4-local
ports:
- "8081:80"
- "8443:443"
@ -193,7 +193,7 @@ services:
zabbix-agent:
build: ./agent/centos
image: zabbix-agent:centos-local
image: zabbix-agent:centos-3.4-local
ports:
- "10050:10050"
volumes:
@ -224,7 +224,7 @@ services:
zabbix-java-gateway:
build: ./java-gateway/centos
image: zabbix-java-gateway:centos-local
image: zabbix-java-gateway:centos-3.4-local
ports:
- "10052:10052"
env_file:
@ -243,7 +243,7 @@ services:
zabbix-snmptraps:
build: ./snmptraps/centos
image: zabbix-snmptraps:centos-local
image: zabbix-snmptraps:centos-3.4-local
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '2'
services:
zabbix-server:
image: zabbix/zabbix-server-mysql:ubuntu-latest
image: zabbix/zabbix-server-mysql:ubuntu-3.4-latest
ports:
- "10051:10051"
volumes:
@ -44,7 +44,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest
image: zabbix/zabbix-proxy-sqlite3:ubuntu-3.4-latest
ports:
- "10061:10051"
volumes:
@ -84,7 +84,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:ubuntu-latest
image: zabbix/zabbix-proxy-mysql:ubuntu-3.4-latest
ports:
- "10071:10051"
volumes:
@ -125,7 +125,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:ubuntu-latest
image: zabbix/zabbix-web-apache-mysql:ubuntu-3.4-latest
ports:
- "80:80"
- "443:443"
@ -156,7 +156,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:ubuntu-latest
image: zabbix/zabbix-web-nginx-mysql:ubuntu-3.4-latest
ports:
- "8081:80"
- "8443:443"
@ -187,7 +187,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-agent:
image: zabbix/zabbix-agent:ubuntu-latest
image: zabbix/zabbix-agent:ubuntu-3.4-latest
ports:
- "10050:10050"
volumes:
@ -217,7 +217,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:ubuntu-latest
image: zabbix/zabbix-java-gateway:ubuntu-3.4-latest
ports:
- "10052:10052"
env_file:
@ -235,7 +235,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-latest
image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
ports:
- "162:162/udp"
volumes:

View File

@ -2,7 +2,7 @@ version: '2'
services:
zabbix-server:
build: ./server-mysql/ubuntu
image: zabbix-server-mysql:ubuntu-local
image: zabbix-server-mysql:ubuntu-3.4-local
ports:
- "10051:10051"
volumes:
@ -46,7 +46,7 @@ services:
zabbix-proxy-sqlite3:
build: ./proxy-sqlite3/ubuntu
image: zabbix-proxy-sqlite3:ubuntu-local
image: zabbix-proxy-sqlite3:ubuntu-3.4-local
ports:
- "10061:10051"
volumes:
@ -87,7 +87,7 @@ services:
zabbix-proxy-mysql:
build: ./proxy-mysql/ubuntu
image: zabbix-proxy-mysql:ubuntu-local
image: zabbix-proxy-mysql:ubuntu-3.4-local
ports:
- "10071:10051"
volumes:
@ -129,7 +129,7 @@ services:
zabbix-web-apache-mysql:
build: ./web-apache-mysql/ubuntu
image: zabbix-web-apache-mysql:ubuntu-local
image: zabbix-web-apache-mysql:ubuntu-3.4-local
ports:
- "80:80"
- "443:443"
@ -161,7 +161,7 @@ services:
zabbix-web-nginx-mysql:
build: ./web-nginx-mysql/ubuntu
image: zabbix-web-nginx-mysql:ubuntu-local
image: zabbix-web-nginx-mysql:ubuntu-3.4-local
ports:
- "8081:80"
- "8443:443"
@ -193,7 +193,7 @@ services:
zabbix-agent:
build: ./agent/ubuntu
image: zabbix-agent:ubuntu-local
image: zabbix-agent:ubuntu-3.4-local
ports:
- "10050:10050"
volumes:
@ -224,7 +224,7 @@ services:
zabbix-java-gateway:
build: ./java-gateway/ubuntu
image: zabbix-java-gateway:ubuntu-local
image: zabbix-java-gateway:ubuntu-3.4-local
ports:
- "10052:10052"
env_file:
@ -243,7 +243,7 @@ services:
zabbix-snmptraps:
build: ./snmptraps/ubuntu
image: zabbix-snmptraps:ubuntu-local
image: zabbix-snmptraps:ubuntu-3.4-local
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '2'
services:
zabbix-server:
image: zabbix/zabbix-server-pgsql:ubuntu-latest
image: zabbix/zabbix-server-pgsql:ubuntu-3.4-latest
ports:
- "10051:10051"
volumes:
@ -43,7 +43,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest
image: zabbix/zabbix-proxy-sqlite3:ubuntu-3.4-latest
ports:
- "10061:10051"
volumes:
@ -83,7 +83,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:ubuntu-latest
image: zabbix/zabbix-proxy-mysql:ubuntu-3.4-latest
ports:
- "10071:10051"
volumes:
@ -124,7 +124,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:ubuntu-latest
image: zabbix/zabbix-web-apache-pgsql:ubuntu-3.4-latest
ports:
- "80:80"
- "443:443"
@ -155,7 +155,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:ubuntu-latest
image: zabbix/zabbix-web-nginx-pgsql:ubuntu-3.4-latest
ports:
- "8081:80"
- "8443:443"
@ -186,7 +186,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-agent:
image: zabbix/zabbix-agent:ubuntu-latest
image: zabbix/zabbix-agent:ubuntu-3.4-latest
ports:
- "10050:10050"
volumes:
@ -216,7 +216,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:ubuntu-latest
image: zabbix/zabbix-java-gateway:ubuntu-3.4-latest
ports:
- "10052:10052"
env_file:
@ -234,7 +234,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-latest
image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
ports:
- "162:162/udp"
volumes:

View File

@ -2,7 +2,7 @@ version: '2'
services:
zabbix-server:
build: ./server-pgsql/ubuntu
image: zabbix-server-pgsql:ubuntu-local
image: zabbix-server-pgsql:ubuntu-3.4-local
ports:
- "10051:10051"
volumes:
@ -45,7 +45,7 @@ services:
zabbix-proxy-sqlite3:
build: ./proxy-sqlite3/ubuntu
image: zabbix-proxy-sqlite3:ubuntu-local
image: zabbix-proxy-sqlite3:ubuntu-3.4-local
ports:
- "10061:10051"
volumes:
@ -86,7 +86,7 @@ services:
zabbix-proxy-mysql:
build: ./proxy-mysql/ubuntu
image: zabbix-proxy-mysql:ubuntu-local
image: zabbix-proxy-mysql:ubuntu-3.4-local
ports:
- "10071:10051"
volumes:
@ -128,7 +128,7 @@ services:
zabbix-web-apache-pgsql:
build: ./web-apache-pgsql/ubuntu
image: zabbix-web-apache-pgsql:ubuntu-local
image: zabbix-web-apache-pgsql:ubuntu-3.4-local
ports:
- "80:80"
- "443:443"
@ -160,7 +160,7 @@ services:
zabbix-web-nginx-pgsql:
build: ./web-nginx-pgsql/ubuntu
image: zabbix-web-nginx-pgsql:ubuntu-local
image: zabbix-web-nginx-pgsql:ubuntu-3.4-local
ports:
- "8081:80"
- "8443:443"
@ -192,7 +192,7 @@ services:
zabbix-agent:
build: ./agent/ubuntu
image: zabbix-agent:ubuntu-local
image: zabbix-agent:ubuntu-3.4-local
ports:
- "10050:10050"
volumes:
@ -223,7 +223,7 @@ services:
zabbix-java-gateway:
build: ./java-gateway/ubuntu
image: zabbix-java-gateway:ubuntu-local
image: zabbix-java-gateway:ubuntu-3.4-local
ports:
- "10052:10052"
env_file:
@ -242,7 +242,7 @@ services:
zabbix-snmptraps:
build: ./snmptraps/ubuntu
image: zabbix-snmptraps:ubuntu-local
image: zabbix-snmptraps:ubuntu-3.4-local
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-mysql:alpine-latest
image: zabbix/zabbix-server-mysql:alpine-3.4-latest
ports:
- "10051:10051"
volumes:
@ -62,7 +62,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:alpine-latest
image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest
ports:
- "10061:10051"
volumes:
@ -113,7 +113,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:alpine-latest
image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest
ports:
- "10071:10051"
volumes:
@ -166,7 +166,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:alpine-latest
image: zabbix/zabbix-web-apache-mysql:alpine-3.4-latest
ports:
- "80:80"
- "443:443"
@ -217,7 +217,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:alpine-latest
image: zabbix/zabbix-web-nginx-mysql:alpine-3.4-latest
ports:
- "8081:80"
- "8443:443"
@ -268,7 +268,7 @@ services:
com.zabbix.os: "alpine"
zabbix-agent:
image: zabbix/zabbix-agent:alpine-latest
image: zabbix/zabbix-agent:alpine-3.4-latest
ports:
- "10050:10050"
volumes:
@ -308,7 +308,7 @@ services:
com.zabbix.os: "alpine"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:alpine-latest
image: zabbix/zabbix-java-gateway:alpine-3.4-latest
ports:
- "10052:10052"
deploy:
@ -335,7 +335,7 @@ services:
com.zabbix.os: "alpine"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:alpine-latest
image: zabbix/zabbix-snmptraps:alpine-3.4-latest
ports:
- "162:162/udp"
volumes:

View File

@ -5,7 +5,7 @@ services:
context: ./server-mysql/alpine
cache_from:
- alpine:3.4
image: zabbix-server-mysql:alpine-local
image: zabbix-server-mysql:alpine-3.4-local
ports:
- "10051:10051"
volumes:
@ -70,7 +70,7 @@ services:
context: ./proxy-sqlite3/alpine
cache_from:
- alpine:3.4
image: zabbix-proxy-sqlite3:alpine-local
image: zabbix-proxy-sqlite3:alpine-3.4-local
ports:
- "10061:10051"
volumes:
@ -125,7 +125,7 @@ services:
context: ./proxy-mysql/alpine
cache_from:
- alpine:3.4
image: zabbix-proxy-mysql:alpine-local
image: zabbix-proxy-mysql:alpine-3.4-local
ports:
- "10071:10051"
volumes:
@ -182,7 +182,7 @@ services:
context: ./web-apache-mysql/alpine
cache_from:
- alpine:3.4
image: zabbix-web-apache-mysql:alpine-local
image: zabbix-web-apache-mysql:alpine-3.4-local
ports:
- "80:80"
- "443:443"
@ -237,7 +237,7 @@ services:
context: ./web-nginx-mysql/alpine
cache_from:
- alpine:3.4
image: zabbix-web-nginx-mysql:alpine-local
image: zabbix-web-nginx-mysql:alpine-3.4-local
ports:
- "8081:80"
- "8443:443"
@ -292,7 +292,7 @@ services:
context: ./agent/alpine
cache_from:
- alpine:3.4
image: zabbix-agent:alpine-local
image: zabbix-agent:alpine-3.4-local
ports:
- "10050:10050"
volumes:
@ -336,7 +336,7 @@ services:
context: ./java-gateway/alpine
cache_from:
- alpine:3.4
image: zabbix-java-gateway:alpine-local
image: zabbix-java-gateway:alpine-3.4-local
ports:
- "10052:10052"
deploy:
@ -367,7 +367,7 @@ services:
context: ./snmptraps/alpine
cache_from:
- alpine:3.7
image: zabbix-snmptraps:alpine-local
image: zabbix-snmptraps:alpine-3.4-local
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-pgsql:alpine-latest
image: zabbix/zabbix-server-pgsql:alpine-3.4-latest
ports:
- "10051:10051"
volumes:
@ -62,7 +62,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:alpine-latest
image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest
ports:
- "10061:10051"
volumes:
@ -113,7 +113,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:alpine-latest
image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest
ports:
- "10071:10051"
volumes:
@ -166,7 +166,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:alpine-latest
image: zabbix/zabbix-web-apache-pgsql:alpine-3.4-latest
ports:
- "80:80"
- "443:443"
@ -217,7 +217,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:alpine-latest
image: zabbix/zabbix-web-nginx-pgsql:alpine-3.4-latest
ports:
- "8081:80"
- "8443:443"
@ -268,7 +268,7 @@ services:
com.zabbix.os: "alpine"
zabbix-agent:
image: zabbix/zabbix-agent:alpine-latest
image: zabbix/zabbix-agent:alpine-3.4-latest
ports:
- "10050:10050"
volumes:
@ -308,7 +308,7 @@ services:
com.zabbix.os: "alpine"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:alpine-latest
image: zabbix/zabbix-java-gateway:alpine-3.4-latest
ports:
- "10052:10052"
deploy:
@ -335,7 +335,7 @@ services:
com.zabbix.os: "alpine"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:alpine-latest
image: zabbix/zabbix-snmptraps:alpine-3.4-latest
ports:
- "162:162/udp"
volumes:

View File

@ -5,7 +5,7 @@ services:
context: ./server-pgsql/alpine
cache_from:
- alpine:3.4
image: zabbix-server-pgsql:alpine-local
image: zabbix-server-pgsql:alpine-3.4-local
ports:
- "10051:10051"
volumes:
@ -70,7 +70,7 @@ services:
context: ./proxy-sqlite3/alpine
cache_from:
- alpine:3.4
image: zabbix-proxy-sqlite3:alpine-local
image: zabbix-proxy-sqlite3:alpine-3.4-local
ports:
- "10061:10051"
volumes:
@ -125,7 +125,7 @@ services:
context: ./proxy-mysql/alpine
cache_from:
- alpine:3.4
image: zabbix-proxy-mysql:alpine-local
image: zabbix-proxy-mysql:alpine-3.4-local
ports:
- "10071:10051"
volumes:
@ -183,7 +183,7 @@ services:
context: ./web-apache-pgsql/alpine
cache_from:
- alpine:3.4
image: zabbix-web-apache-pgsql:alpine-local
image: zabbix-web-apache-pgsql:alpine-3.4-local
ports:
- "80:80"
- "443:443"
@ -238,7 +238,7 @@ services:
context: ./web-nginx-pgsql/alpine
cache_from:
- alpine:3.4
image: zabbix-web-nginx-pgsql:alpine-local
image: zabbix-web-nginx-pgsql:alpine-3.4-local
ports:
- "8081:80"
- "8443:443"
@ -293,7 +293,7 @@ services:
context: ./agent/alpine
cache_from:
- alpine:3.4
image: zabbix-agent:alpine-local
image: zabbix-agent:alpine-3.4-local
ports:
- "10050:10050"
volumes:
@ -337,7 +337,7 @@ services:
context: ./java-gateway/alpine
cache_from:
- alpine:3.4
image: zabbix-java-gateway:alpine-local
image: zabbix-java-gateway:alpine-3.4-local
ports:
- "10052:10052"
deploy:
@ -368,7 +368,7 @@ services:
context: ./snmptraps/alpine
cache_from:
- alpine:3.7
image: zabbix-snmptraps:alpine-local
image: zabbix-snmptraps:alpine-3.4-local
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-mysql:centos-latest
image: zabbix/zabbix-server-mysql:centos-3.4-latest
ports:
- "10051:10051"
volumes:
@ -62,7 +62,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:centos-latest
image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest
ports:
- "10061:10051"
volumes:
@ -113,7 +113,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:centos-latest
image: zabbix/zabbix-proxy-mysql:centos-3.4-latest
ports:
- "10071:10051"
volumes:
@ -166,7 +166,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:centos-latest
image: zabbix/zabbix-web-apache-mysql:centos-3.4-latest
ports:
- "80:80"
- "443:443"
@ -217,7 +217,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:centos-latest
image: zabbix/zabbix-web-nginx-mysql:centos-3.4-latest
ports:
- "8081:80"
- "8443:443"
@ -268,7 +268,7 @@ services:
com.zabbix.os: "centos"
zabbix-agent:
image: zabbix/zabbix-agent:centos-latest
image: zabbix/zabbix-agent:centos-3.4-latest
ports:
- "10050:10050"
volumes:
@ -308,7 +308,7 @@ services:
com.zabbix.os: "centos"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:centos-latest
image: zabbix/zabbix-java-gateway:centos-3.4-latest
ports:
- "10052:10052"
deploy:
@ -335,7 +335,7 @@ services:
com.zabbix.os: "centos"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:centos-latest
image: zabbix/zabbix-snmptraps:centos-3.4-latest
ports:
- "162:162/udp"
volumes:

View File

@ -5,7 +5,7 @@ services:
context: ./server-mysql/centos
cache_from:
- centos:centos7
image: zabbix-server-mysql:centos-local
image: zabbix-server-mysql:centos-3.4-local
ports:
- "10051:10051"
volumes:
@ -70,7 +70,7 @@ services:
context: ./proxy-sqlite3/centos
cache_from:
- centos:centos7
image: zabbix-proxy-sqlite3:centos-local
image: zabbix-proxy-sqlite3:centos-3.4-local
ports:
- "10061:10051"
volumes:
@ -125,7 +125,7 @@ services:
context: ./proxy-mysql/centos
cache_from:
- centos:centos7
image: zabbix-proxy-mysql:centos-local
image: zabbix-proxy-mysql:centos-3.4-local
ports:
- "10071:10051"
volumes:
@ -182,7 +182,7 @@ services:
context: ./web-apache-mysql/centos
cache_from:
- centos:centos7
image: zabbix-web-apache-mysql:centos-local
image: zabbix-web-apache-mysql:centos-3.4-local
ports:
- "80:80"
- "443:443"
@ -237,7 +237,7 @@ services:
context: ./web-nginx-mysql/centos
cache_from:
- centos:centos7
image: zabbix-web-nginx-mysql:centos-local
image: zabbix-web-nginx-mysql:centos-3.4-local
ports:
- "8081:80"
- "8443:443"
@ -292,7 +292,7 @@ services:
context: ./agent/centos
cache_from:
- centos:centos7
image: zabbix-agent:centos-local
image: zabbix-agent:centos-3.4-local
ports:
- "10050:10050"
volumes:
@ -336,7 +336,7 @@ services:
context: ./java-gateway/centos
cache_from:
- centos:centos7
image: zabbix-java-gateway:centos-local
image: zabbix-java-gateway:centos-3.4-local
ports:
- "10052:10052"
deploy:
@ -367,7 +367,7 @@ services:
context: ./snmptraps/centos
cache_from:
- centos:centos7
image: zabbix-snmptraps:centos-local
image: zabbix-snmptraps:centos-3.4-local
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-pgsql:centos-latest
image: zabbix/zabbix-server-pgsql:centos-3.4-latest
ports:
- "10051:10051"
volumes:
@ -62,7 +62,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:centos-latest
image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest
ports:
- "10061:10051"
volumes:
@ -113,7 +113,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:centos-latest
image: zabbix/zabbix-proxy-mysql:centos-3.4-latest
ports:
- "10071:10051"
volumes:
@ -166,7 +166,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:centos-latest
image: zabbix/zabbix-web-apache-pgsql:centos-3.4-latest
ports:
- "80:80"
- "443:443"
@ -217,7 +217,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:centos-latest
image: zabbix/zabbix-web-nginx-pgsql:centos-3.4-latest
ports:
- "8081:80"
- "8443:443"
@ -268,7 +268,7 @@ services:
com.zabbix.os: "centos"
zabbix-agent:
image: zabbix/zabbix-agent:centos-latest
image: zabbix/zabbix-agent:centos-3.4-latest
ports:
- "10050:10050"
volumes:
@ -308,7 +308,7 @@ services:
com.zabbix.os: "centos"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:centos-latest
image: zabbix/zabbix-java-gateway:centos-3.4-latest
ports:
- "10052:10052"
deploy:
@ -335,7 +335,7 @@ services:
com.zabbix.os: "centos"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:centos-latest
image: zabbix/zabbix-snmptraps:centos-3.4-latest
ports:
- "162:162/udp"
volumes:

View File

@ -2,7 +2,7 @@ version: '3.5'
services:
zabbix-server:
build: ./server-pgsql/centos
image: zabbix-server-pgsql:centos-local
image: zabbix-server-pgsql:centos-3.4-local
ports:
- "10051:10051"
volumes:
@ -64,7 +64,7 @@ services:
zabbix-proxy-sqlite3:
build: ./proxy-sqlite3/centos
image: zabbix-proxy-sqlite3:centos-local
image: zabbix-proxy-sqlite3:centos-3.4-local
ports:
- "10061:10051"
volumes:
@ -116,7 +116,7 @@ services:
zabbix-proxy-mysql:
build: ./proxy-mysql/centos
image: zabbix-proxy-mysql:centos-local
image: zabbix-proxy-mysql:centos-3.4-local
ports:
- "10071:10051"
volumes:
@ -171,7 +171,7 @@ services:
zabbix-web-apache-pgsql:
build: ./web-apache-pgsql/centos
image: zabbix-web-apache-pgsql:centos-local
image: zabbix-web-apache-pgsql:centos-3.4-local
ports:
- "80:80"
- "443:443"
@ -223,7 +223,7 @@ services:
zabbix-web-nginx-pgsql:
build: ./web-nginx-pgsql/centos
image: zabbix-web-nginx-pgsql:centos-local
image: zabbix-web-nginx-pgsql:centos-3.4-local
ports:
- "8081:80"
- "8443:443"
@ -275,7 +275,7 @@ services:
zabbix-agent:
build: ./agent/centos
image: zabbix-agent:centos-local
image: zabbix-agent:centos-3.4-local
ports:
- "10050:10050"
volumes:
@ -316,7 +316,7 @@ services:
zabbix-java-gateway:
build: ./java-gateway/centos
image: zabbix-java-gateway:centos-local
image: zabbix-java-gateway:centos-3.4-local
ports:
- "10052:10052"
deploy:
@ -347,7 +347,7 @@ services:
context: ./snmptraps/centos
cache_from:
- centos:centos7
image: zabbix-snmptraps:centos-local
image: zabbix-snmptraps:centos-3.4-local
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-mysql:ubuntu-latest
image: zabbix/zabbix-server-mysql:ubuntu-3.4-latest
ports:
- "10051:10051"
volumes:
@ -62,7 +62,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest
image: zabbix/zabbix-proxy-sqlite3:ubuntu-3.4-latest
ports:
- "10061:10051"
volumes:
@ -113,7 +113,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:ubuntu-latest
image: zabbix/zabbix-proxy-mysql:ubuntu-3.4-latest
ports:
- "10071:10051"
volumes:
@ -166,7 +166,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:ubuntu-latest
image: zabbix/zabbix-web-apache-mysql:ubuntu-3.4-latest
ports:
- "80:80"
- "443:443"
@ -217,7 +217,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:ubuntu-latest
image: zabbix/zabbix-web-nginx-mysql:ubuntu-3.4-latest
ports:
- "8081:80"
- "8443:443"
@ -268,7 +268,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-agent:
image: zabbix/zabbix-agent:ubuntu-latest
image: zabbix/zabbix-agent:ubuntu-3.4-latest
ports:
- "10050:10050"
volumes:
@ -308,7 +308,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:ubuntu-latest
image: zabbix/zabbix-java-gateway:ubuntu-3.4-latest
ports:
- "10052:10052"
deploy:
@ -335,7 +335,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-latest
image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
ports:
- "162:162/udp"
volumes:

View File

@ -5,7 +5,7 @@ services:
context: ./server-mysql/ubuntu
cache_from:
- ubuntu:trusty
image: zabbix-server-mysql:ubuntu-local
image: zabbix-server-mysql:ubuntu-3.4-local
ports:
- "10051:10051"
volumes:
@ -70,7 +70,7 @@ services:
context: ./proxy-sqlite3/ubuntu
cache_from:
- ubuntu:trusty
image: zabbix-proxy-sqlite3:ubuntu-local
image: zabbix-proxy-sqlite3:ubuntu-3.4-local
ports:
- "10061:10051"
volumes:
@ -125,7 +125,7 @@ services:
context: ./proxy-mysql/ubuntu
cache_from:
- ubuntu:trusty
image: zabbix-proxy-mysql:ubuntu-local
image: zabbix-proxy-mysql:ubuntu-3.4-local
ports:
- "10071:10051"
volumes:
@ -182,7 +182,7 @@ services:
context: ./web-apache-mysql/ubuntu
cache_from:
- ubuntu:trusty
image: zabbix-web-apache-mysql:ubuntu-local
image: zabbix-web-apache-mysql:ubuntu-3.4-local
ports:
- "80:80"
- "443:443"
@ -237,7 +237,7 @@ services:
context: ./web-nginx-mysql/ubuntu
cache_from:
- ubuntu:trusty
image: zabbix-web-nginx-mysql:ubuntu-local
image: zabbix-web-nginx-mysql:ubuntu-3.4-local
ports:
- "8081:80"
- "8443:443"
@ -292,7 +292,7 @@ services:
context: ./agent/ubuntu
cache_from:
- ubuntu:trusty
image: zabbix-agent:ubuntu-local
image: zabbix-agent:ubuntu-3.4-local
ports:
- "10050:10050"
volumes:
@ -336,7 +336,7 @@ services:
context: ./java-gateway/ubuntu
cache_from:
- ubuntu:trusty
image: zabbix-java-gateway:ubuntu-local
image: zabbix-java-gateway:ubuntu-3.4-local
ports:
- "10052:10052"
deploy:
@ -367,7 +367,7 @@ services:
context: ./snmptraps/ubuntu
cache_from:
- ubuntu:trusty
image: zabbix-snmptraps:ubuntu-local
image: zabbix-snmptraps:ubuntu-3.4-local
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-pgsql:ubuntu-latest
image: zabbix/zabbix-server-pgsql:ubuntu-3.4-latest
ports:
- "10051:10051"
volumes:
@ -62,7 +62,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest
image: zabbix/zabbix-proxy-sqlite3:ubuntu-3.4-latest
ports:
- "10061:10051"
volumes:
@ -113,7 +113,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:ubuntu-latest
image: zabbix/zabbix-proxy-mysql:ubuntu-3.4-latest
ports:
- "10071:10051"
volumes:
@ -166,7 +166,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:ubuntu-latest
image: zabbix/zabbix-web-apache-pgsql:ubuntu-3.4-latest
ports:
- "80:80"
- "443:443"
@ -217,7 +217,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:ubuntu-latest
image: zabbix/zabbix-web-nginx-pgsql:ubuntu-3.4-latest
ports:
- "8081:80"
- "8443:443"
@ -268,7 +268,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-agent:
image: zabbix/zabbix-agent:ubuntu-latest
image: zabbix/zabbix-agent:ubuntu-3.4-latest
ports:
- "10050:10050"
volumes:
@ -308,7 +308,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:ubuntu-latest
image: zabbix/zabbix-java-gateway:ubuntu-3.4-latest
ports:
- "10052:10052"
deploy:
@ -335,7 +335,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-latest
image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
ports:
- "162:162/udp"
volumes:

View File

@ -2,7 +2,7 @@ version: '3.5'
services:
zabbix-server:
build: ./server-pgsql/ubuntu
image: zabbix-server-pgsql:ubuntu-local
image: zabbix-server-pgsql:ubuntu-3.4-local
ports:
- "10051:10051"
volumes:
@ -64,7 +64,7 @@ services:
zabbix-proxy-sqlite3:
build: ./proxy-sqlite3/ubuntu
image: zabbix-proxy-sqlite3:ubuntu-local
image: zabbix-proxy-sqlite3:ubuntu-3.4-local
ports:
- "10061:10051"
volumes:
@ -116,7 +116,7 @@ services:
zabbix-proxy-mysql:
build: ./proxy-mysql/ubuntu
image: zabbix-proxy-mysql:ubuntu-local
image: zabbix-proxy-mysql:ubuntu-3.4-local
ports:
- "10071:10051"
volumes:
@ -171,7 +171,7 @@ services:
zabbix-web-apache-pgsql:
build: ./web-apache-pgsql/ubuntu
image: zabbix-web-apache-pgsql:ubuntu-local
image: zabbix-web-apache-pgsql:ubuntu-3.4-local
ports:
- "80:80"
- "443:443"
@ -223,7 +223,7 @@ services:
zabbix-web-nginx-pgsql:
build: ./web-nginx-pgsql/ubuntu
image: zabbix-web-nginx-pgsql:ubuntu-local
image: zabbix-web-nginx-pgsql:ubuntu-3.4-local
ports:
- "8081:80"
- "8443:443"
@ -275,7 +275,7 @@ services:
zabbix-agent:
build: ./agent/ubuntu
image: zabbix-agent:ubuntu-local
image: zabbix-agent:ubuntu-3.4-local
ports:
- "10050:10050"
volumes:
@ -316,7 +316,7 @@ services:
zabbix-java-gateway:
build: ./java-gateway/ubuntu
image: zabbix-java-gateway:ubuntu-local
image: zabbix-java-gateway:ubuntu-3.4-local
ports:
- "10052:10052"
deploy:
@ -344,7 +344,7 @@ services:
zabbix-snmptraps:
build: ./snmptraps/ubuntu
image: zabbix-snmptraps:ubuntu-local
image: zabbix-snmptraps:ubuntu-3.4-local
ports:
- "162:162/udp"
volumes:

View File

@ -34,8 +34,8 @@ RUN addgroup zabbix && \
openjdk8-jre-base && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -3,8 +3,8 @@ FROM centos:centos7 as builder
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=java-gateway
@ -43,8 +43,8 @@ ARG VCS_REF
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -39,8 +39,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -148,7 +148,7 @@ spec:
spec:
containers:
- name: zabbix-web
image: zabbix/zabbix-web-nginx-mysql:alpine-latest
image: zabbix/zabbix-web-nginx-mysql:alpine-3.4-latest
imagePullPolicy: Always
ports:
- containerPort: 80
@ -282,7 +282,7 @@ spec:
spec:
containers:
- name: zabbix-server
image: zabbix/zabbix-server-mysql:alpine-latest
image: zabbix/zabbix-server-mysql:alpine-3.4-latest
imagePullPolicy: Always
ports:
- containerPort: 10051
@ -331,7 +331,7 @@ spec:
mountPath: /var/lib/zabbix/snmptraps/
readOnly: true
- name: zabbix-snmptraps
image: zabbix/zabbix-snmptraps:latest
image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
imagePullPolicy: Always
ports:
- containerPort: 162
@ -364,7 +364,7 @@ spec:
spec:
containers:
- name: zabbix-proxy-sqlite3
image: zabbix/zabbix-proxy-sqlite3:alpine-latest
image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest
imagePullPolicy: Always
ports:
- containerPort: 10051
@ -396,7 +396,7 @@ spec:
spec:
containers:
- name: zabbix-proxy-mysql
image: zabbix/zabbix-proxy-mysql:alpine-latest
image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest
imagePullPolicy: Always
ports:
- containerPort: 10051
@ -439,7 +439,7 @@ spec:
spec:
containers:
- name: zabbix-java-gateway
image: zabbix/zabbix-java-gateway:alpine-latest
image: zabbix/zabbix-java-gateway:alpine-3.4-latest
imagePullPolicy: Always
ports:
- containerPort: 10052
@ -470,7 +470,7 @@ spec:
spec:
containers:
- name: zabbix-agent
image: zabbix/zabbix-agent:alpine-latest
image: zabbix/zabbix-agent:alpine-3.4-latest
imagePullPolicy: Always
resources:
limits:

View File

@ -45,6 +45,7 @@ RUN addgroup zabbix && \
bash \
iputils \
libcurl \
libevent \
libldap \
libssh2 \
libxml2 \
@ -52,12 +53,13 @@ RUN addgroup zabbix && \
mariadb-client-libs \
net-snmp-agent-libs \
openipmi-libs \
pcre \
unixodbc \
fping && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -71,12 +73,14 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
automake \
coreutils \
curl-dev \
libevent-dev \
libssh2-dev \
libxml2-dev \
mysql-dev \
net-snmp-dev \
openipmi-dev \
openldap-dev \
pcre-dev \
subversion \
unixodbc-dev \
alpine-sdk && \

View File

@ -135,6 +135,8 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
Additionally the image allows to specify many other environment variables listed below:
```
ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0
ZBX_HOSTNAMEITEM=system.hostname
ZBX_SOURCEIP=
ZBX_PROXYLOCALBUFFER=0

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -3,8 +3,8 @@ FROM centos:centos7 as builder
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=proxy ZBX_DB_TYPE=mysql
@ -15,6 +15,7 @@ RUN yum --quiet makecache && \
automake \
gcc \
libcurl-devel \
libevent-devel \
libssh2-devel \
libxml2-devel \
make \
@ -63,8 +64,8 @@ ARG VCS_REF
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
@ -114,6 +115,7 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTENT} install \
fping \
libcurl \
libevent \
libxml2 \
mariadb \
net-snmp-libs \

View File

@ -135,6 +135,8 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
Additionally the image allows to specify many other environment variables listed below:
```
ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0
ZBX_HOSTNAMEITEM=system.hostname
ZBX_SOURCEIP=
ZBX_PROXYLOCALBUFFER=0

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -51,8 +51,10 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTENT} install \
fping \
libcurl3 \
libevent-2.0 \
libmysqlclient18 \
libopenipmi0 \
libpcre3 \
libsnmp30 \
libssh2-1 \
libssl1.0.0 \
@ -64,8 +66,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -81,9 +83,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libldap2-dev \
libmysqlclient-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libssh2-1-dev \
libxml2-dev \
@ -134,9 +138,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libldap2-dev \
libmysqlclient-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libssh2-1-dev \
libxml2-dev \

View File

@ -135,6 +135,8 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
Additionally the image allows to specify many other environment variables listed below:
```
ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0
ZBX_HOSTNAMEITEM=system.hostname
ZBX_SOURCEIP=
ZBX_PROXYLOCALBUFFER=0

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -45,17 +45,19 @@ RUN addgroup zabbix && \
fping \
iputils \
libcurl \
libevent \
libldap \
libssh2 \
libxml2 \
net-snmp-agent-libs \
openipmi-libs \
pcre \
sqlite-libs \
unixodbc && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -70,11 +72,13 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
automake \
coreutils \
curl-dev \
libevent-dev \
libssh2-dev \
libxml2-dev \
net-snmp-dev \
openipmi-dev \
openldap-dev \
pcre-dev \
sqlite-dev \
subversion \
unixodbc-dev && \

View File

@ -115,6 +115,8 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
Additionally the image allows to specify many other environment variables listed below:
```
ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0
ZBX_SOURCEIP=
ZBX_HOSTNAMEITEM=system.hostname
ZBX_PROXYLOCALBUFFER=0

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -3,8 +3,8 @@ FROM centos:centos7 as builder
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3
@ -15,6 +15,7 @@ RUN yum --quiet makecache && \
automake \
gcc \
libcurl-devel \
libevent-devel \
libssh2-devel \
libxml2-devel \
make \
@ -63,8 +64,8 @@ ARG VCS_REF
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
@ -114,6 +115,7 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTENT} install \
fping \
libcurl \
libevent \
libxml2 \
net-snmp-libs \
OpenIPMI-libs \

View File

@ -115,6 +115,8 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
Additionally the image allows to specify many other environment variables listed below:
```
ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0
ZBX_SOURCEIP=
ZBX_HOSTNAMEITEM=system.hostname
ZBX_PROXYLOCALBUFFER=0

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -49,7 +49,9 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTENT} install \
fping \
libcurl3 \
libevent-2.0 \
libopenipmi0 \
libpcre3 \
libsnmp30 \
libsqlite3-0 \
libssh2-1 \
@ -61,8 +63,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -78,8 +80,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libldap2-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libsqlite3-dev \
libssh2-1-dev \
@ -128,8 +132,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libldap2-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libsqlite3-dev \
libssh2-1-dev \

View File

@ -115,6 +115,8 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
Additionally the image allows to specify many other environment variables listed below:
```
ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0
ZBX_SOURCEIP=
ZBX_HOSTNAMEITEM=system.hostname
ZBX_PROXYLOCALBUFFER=0

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -48,6 +48,7 @@ RUN addgroup zabbix && \
fping \
iputils \
libcurl \
libevent \
libldap \
libssh2 \
libxml2 \
@ -55,11 +56,12 @@ RUN addgroup zabbix && \
mariadb-client-libs \
net-snmp-agent-libs \
openipmi-libs \
pcre \
unixodbc && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -74,12 +76,14 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
automake \
coreutils \
curl-dev \
libevent-dev \
libssh2-dev \
libxml2-dev \
mysql-dev \
net-snmp-dev \
openipmi-dev \
openldap-dev \
pcre-dev \
subversion \
unixodbc-dev && \
cd /tmp/ && \

View File

@ -106,8 +106,11 @@ Additionally the image allows to specify many other environment variables listed
```
ZBX_LISTENIP=
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
ZBX_STARTPOLLERS=5
ZBX_IPMIPOLLERS=0
ZBX_STARTPREPROCESSORS=3 # Available since 3.4.0
ZBX_STARTPOLLERSUNREACHABLE=1
ZBX_STARTTRAPPERS=5
ZBX_STARTPINGERS=1
@ -115,6 +118,7 @@ ZBX_STARTDISCOVERERS=1
ZBX_STARTHTTPPOLLERS=1
ZBX_STARTTIMERS=1
ZBX_STARTESCALATORS=1
ZBX_STARTALERTERS=3 # Available since 3.4.0
ZBX_JAVAGATEWAY=zabbix-java-gateway
ZBX_JAVAGATEWAYPORT=10052
ZBX_STARTJAVAPOLLERS=5

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -3,8 +3,8 @@ FROM centos:centos7 as builder
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
@ -17,6 +17,7 @@ RUN yum --quiet makecache && \
gcc \
iksemel-devel \
libcurl-devel \
libevent-devel \
libssh2-devel \
libxml2-devel \
make \
@ -68,8 +69,8 @@ ARG VCS_REF
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
@ -122,6 +123,7 @@ RUN groupadd --system zabbix && \
fping \
iksemel \
libcurl \
libevent \
libxml2 \
mariadb \
net-snmp-libs \

View File

@ -106,8 +106,11 @@ Additionally the image allows to specify many other environment variables listed
```
ZBX_LISTENIP=
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
ZBX_STARTPOLLERS=5
ZBX_IPMIPOLLERS=0
ZBX_STARTPREPROCESSORS=3 # Available since 3.4.0
ZBX_STARTPOLLERSUNREACHABLE=1
ZBX_STARTTRAPPERS=5
ZBX_STARTPINGERS=1
@ -115,6 +118,7 @@ ZBX_STARTDISCOVERERS=1
ZBX_STARTHTTPPOLLERS=1
ZBX_STARTTIMERS=1
ZBX_STARTESCALATORS=1
ZBX_STARTALERTERS=3 # Available since 3.4.0
ZBX_JAVAGATEWAY=zabbix-java-gateway
ZBX_JAVAGATEWAYPORT=10052
ZBX_STARTJAVAPOLLERS=5

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -52,9 +52,11 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTENT} install \
fping \
libcurl3 \
libevent-2.0 \
libiksemel3 \
libmysqlclient18 \
libopenipmi0 \
libpcre3 \
libsnmp30 \
libssh2-1 \
libssl1.0.0 \
@ -66,8 +68,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -83,10 +85,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libiksemel-dev \
libldap2-dev \
libmysqlclient-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libssh2-1-dev \
libxml2-dev \
@ -140,10 +144,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libiksemel-dev \
libldap2-dev \
libmysqlclient-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libssh2-1-dev \
libxml2-dev \

View File

@ -106,8 +106,11 @@ Additionally the image allows to specify many other environment variables listed
```
ZBX_LISTENIP=
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
ZBX_STARTPOLLERS=5
ZBX_IPMIPOLLERS=0
ZBX_STARTPREPROCESSORS=3 # Available since 3.4.0
ZBX_STARTPOLLERSUNREACHABLE=1
ZBX_STARTTRAPPERS=5
ZBX_STARTPINGERS=1
@ -115,6 +118,7 @@ ZBX_STARTDISCOVERERS=1
ZBX_STARTHTTPPOLLERS=1
ZBX_STARTTIMERS=1
ZBX_STARTESCALATORS=1
ZBX_STARTALERTERS=3 # Available since 3.4.0
ZBX_JAVAGATEWAY=zabbix-java-gateway
ZBX_JAVAGATEWAYPORT=10052
ZBX_STARTJAVAPOLLERS=5

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -48,18 +48,20 @@ RUN addgroup zabbix && \
fping \
iputils \
libcurl \
libevent \
libldap \
libssh2 \
libxml2 \
net-snmp-agent-libs \
openipmi-libs \
pcre \
postgresql-client \
postgresql-libs \
unixodbc && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -74,11 +76,13 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
automake \
coreutils \
curl-dev \
libevent-dev \
libssh2-dev \
libxml2-dev \
net-snmp-dev \
openipmi-dev \
openldap-dev \
pcre-dev \
postgresql-dev \
subversion \
unixodbc-dev && \

View File

@ -105,8 +105,11 @@ Additionally the image allows to specify many other environment variables listed
```
ZBX_LISTENIP=
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
ZBX_STARTPOLLERS=5
ZBX_IPMIPOLLERS=0
ZBX_STARTPREPROCESSORS=3 # Available since 3.4.0
ZBX_STARTPOLLERSUNREACHABLE=1
ZBX_STARTTRAPPERS=5
ZBX_STARTPINGERS=1
@ -114,6 +117,7 @@ ZBX_STARTDISCOVERERS=1
ZBX_STARTHTTPPOLLERS=1
ZBX_STARTTIMERS=1
ZBX_STARTESCALATORS=1
ZBX_STARTALERTERS=3 # Available since 3.4.0
ZBX_JAVAGATEWAY=zabbix-java-gateway
ZBX_JAVAGATEWAYPORT=10052
ZBX_STARTJAVAPOLLERS=5

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -3,8 +3,8 @@ FROM centos:centos7 as builder
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none
@ -17,6 +17,7 @@ RUN yum --quiet makecache && \
gcc \
iksemel-devel \
libcurl-devel \
libevent-devel \
libssh2-devel \
libxml2-devel \
make \
@ -68,8 +69,8 @@ ARG VCS_REF
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
@ -122,6 +123,7 @@ RUN groupadd --system zabbix && \
fping \
iksemel \
libcurl \
libevent \
libxml2 \
net-snmp-libs \
OpenIPMI-libs \

View File

@ -104,8 +104,12 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
Additionally the image allows to specify many other environment variables listed below:
```
ZBX_LISTENIP=
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
ZBX_STARTPOLLERS=5
ZBX_IPMIPOLLERS=0
ZBX_STARTPREPROCESSORS=3 # Available since 3.4.0
ZBX_STARTPOLLERSUNREACHABLE=1
ZBX_STARTTRAPPERS=5
ZBX_STARTPINGERS=1
@ -113,6 +117,7 @@ ZBX_STARTDISCOVERERS=1
ZBX_STARTHTTPPOLLERS=1
ZBX_STARTTIMERS=1
ZBX_STARTESCALATORS=1
ZBX_STARTALERTERS=3 # Available since 3.4.0
ZBX_JAVAGATEWAY=zabbix-java-gateway
ZBX_JAVAGATEWAYPORT=10052
ZBX_STARTJAVAPOLLERS=5
@ -122,6 +127,7 @@ ZBX_VMWAREPERFFREQUENCY=60
ZBX_VMWARECACHESIZE=8M
ZBX_VMWARETIMEOUT=10
ZBX_ENABLE_SNMP_TRAPS=false
ZBX_SOURCEIP=
ZBX_HOUSEKEEPINGFREQUENCY=1
ZBX_MAXHOUSEKEEPERDELETE=5000
ZBX_SENDERFREQUENCY=30

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -52,8 +52,10 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTENT} install \
fping \
libcurl3 \
libevent-2.0 \
libiksemel3 \
libopenipmi0 \
libpcre3 \
libpq5 \
libsnmp30 \
libssh2-1 \
@ -66,8 +68,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -83,9 +85,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libiksemel-dev \
libldap2-dev \
libopenipmi-dev \
libpcre3-dev \
libpq-dev \
libsnmp-dev \
libssh2-1-dev \
@ -140,9 +144,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libiksemel-dev \
libldap2-dev \
libopenipmi-dev \
libpcre3-dev \
libpq-dev \
libsnmp-dev \
libssh2-1-dev \

View File

@ -104,8 +104,12 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat
Additionally the image allows to specify many other environment variables listed below:
```
ZBX_LISTENIP=
ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
ZBX_STARTPOLLERS=5
ZBX_IPMIPOLLERS=0
ZBX_STARTPREPROCESSORS=3 # Available since 3.4.0
ZBX_STARTPOLLERSUNREACHABLE=1
ZBX_STARTTRAPPERS=5
ZBX_STARTPINGERS=1
@ -113,6 +117,7 @@ ZBX_STARTDISCOVERERS=1
ZBX_STARTHTTPPOLLERS=1
ZBX_STARTTIMERS=1
ZBX_STARTESCALATORS=1
ZBX_STARTALERTERS=3 # Available since 3.4.0
ZBX_JAVAGATEWAY=zabbix-java-gateway
ZBX_JAVAGATEWAYPORT=10052
ZBX_STARTJAVAPOLLERS=5
@ -122,6 +127,7 @@ ZBX_VMWAREPERFFREQUENCY=60
ZBX_VMWARECACHESIZE=8M
ZBX_VMWARETIMEOUT=10
ZBX_ENABLE_SNMP_TRAPS=false
ZBX_SOURCEIP=
ZBX_HOUSEKEEPINGFREQUENCY=1
ZBX_MAXHOUSEKEEPERDELETE=5000
ZBX_SENDERFREQUENCY=30

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -18,8 +18,8 @@ LABEL org.label-schema.name="zabbix-snmptraps-alpine" \
org.label-schema.schema-version="1.0" \
org.label-schema.license="GPL v2.0"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -3,8 +3,8 @@ FROM centos:centos7 as builder
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -34,8 +34,8 @@ ARG VCS_REF
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL

View File

@ -19,8 +19,8 @@ LABEL org.label-schema.name="zabbix-snmptraps-ubuntu" \
org.label-schema.schema-version="1.0" \
org.label-schema.license="GPL v2.0"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -54,8 +54,8 @@ RUN addgroup zabbix && \
apk add ${APK_FLAGS_PERSISTENT} --no-scripts apache2-ssl && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -3,8 +3,8 @@ FROM centos:centos7 as builder
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -34,8 +34,8 @@ ARG VCS_REF
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -47,8 +47,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -53,8 +53,8 @@ RUN addgroup zabbix && \
apk add ${APK_FLAGS_PERSISTENT} --no-scripts apache2-ssl && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -3,8 +3,8 @@ FROM centos:centos7 as builder
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -34,8 +34,8 @@ ARG VCS_REF
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -47,8 +47,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -54,8 +54,8 @@ RUN addgroup zabbix && \
ttf-dejavu && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -3,8 +3,8 @@ FROM centos:centos7 as builder
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
@ -35,8 +35,8 @@ ARG VCS_REF
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -59,8 +59,8 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/cache/nginx/* && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -53,8 +53,8 @@ RUN addgroup zabbix && \
ttf-dejavu && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -3,8 +3,8 @@ FROM centos:centos7 as builder
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
@ -35,8 +35,8 @@ ARG VCS_REF
ARG YUM_FLAGS_COMMON="-y"
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

View File

@ -59,8 +59,8 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/cache/nginx/* && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.9
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -642,6 +642,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
if [ $type == "proxy" ]; then
update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
fi
if [ "$db_type" == "sqlite3" ]; then
update_config_var $ZBX_CONFIG "DBHost"
update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
@ -656,6 +661,11 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
if [ $type == "server" ]; then
update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
@ -675,8 +685,10 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
if [ "$type" == "server" ]; then
update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
fi
ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}

Some files were not shown because too many files have changed in this diff Show More