From 3337cbdf9f2e9563b05f7c2319aa60ef8148c4ad Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 18 Feb 2021 13:17:06 -0500 Subject: [PATCH 1/4] Review Java Gateway startup script --- java-gateway/alpine/README.md | 2 +- java-gateway/centos/README.md | 2 +- java-gateway/ubuntu/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-gateway/alpine/README.md b/java-gateway/alpine/README.md index c4c803dde..37b25ba68 100644 --- a/java-gateway/alpine/README.md +++ b/java-gateway/alpine/README.md @@ -82,7 +82,7 @@ This variable is used to specify log level. By default, value is `info`. The var ### `ZBX_PROPERTIES_FILE` -Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones. Available since 5.2.3. +Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones. ### `ZABBIX_OPTIONS` diff --git a/java-gateway/centos/README.md b/java-gateway/centos/README.md index c4c803dde..37b25ba68 100644 --- a/java-gateway/centos/README.md +++ b/java-gateway/centos/README.md @@ -82,7 +82,7 @@ This variable is used to specify log level. By default, value is `info`. The var ### `ZBX_PROPERTIES_FILE` -Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones. Available since 5.2.3. +Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones. ### `ZABBIX_OPTIONS` diff --git a/java-gateway/ubuntu/README.md b/java-gateway/ubuntu/README.md index c4c803dde..37b25ba68 100644 --- a/java-gateway/ubuntu/README.md +++ b/java-gateway/ubuntu/README.md @@ -82,7 +82,7 @@ This variable is used to specify log level. By default, value is `info`. The var ### `ZBX_PROPERTIES_FILE` -Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones. Available since 5.2.3. +Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones. ### `ZABBIX_OPTIONS` From 8ea9e1a724bbbd3e6ba24bf55f181b6f91ab8190 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 17 Mar 2021 21:05:27 +0500 Subject: [PATCH 2/4] Update CI.yml --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5a2a101a3..acf1a750f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -74,7 +74,7 @@ jobs: - name: Prepare platform list id: platform run: | - DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" + DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le" if [ "${{ matrix.os }}" == "ubuntu" ]; then DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le" @@ -179,4 +179,4 @@ jobs: - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file + run: echo ${{ steps.docker_build.outputs.digest }} From eccdda07a988c41931c9a8d6cfdb374336ad9f06 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 29 Mar 2021 13:17:28 +0500 Subject: [PATCH 3/4] Update CI.yml --- .github/workflows/CI.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index acf1a750f..585ac1074 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -75,6 +75,10 @@ jobs: id: platform run: | DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le" + + if [ "${{ matrix.build }}" == "agent2" ]; then + DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" + fi if [ "${{ matrix.os }}" == "ubuntu" ]; then DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le" From bef77c521beed9ea94cd2db2e490a58e450e85b6 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 9 Apr 2021 10:26:17 -0400 Subject: [PATCH 4/4] Added profiles for compose files: default, full, all --- docker-compose_v3_alpine_mysql_latest.yaml | 46 ++++++++++----------- docker-compose_v3_alpine_mysql_local.yaml | 46 ++++++++++----------- docker-compose_v3_alpine_pgsql_latest.yaml | 46 ++++++++++----------- docker-compose_v3_alpine_pgsql_local.yaml | 46 ++++++++++----------- docker-compose_v3_centos_mysql_latest.yaml | 46 ++++++++++----------- docker-compose_v3_centos_mysql_local.yaml | 46 ++++++++++----------- docker-compose_v3_centos_pgsql_latest.yaml | 46 ++++++++++----------- docker-compose_v3_centos_pgsql_local.yaml | 46 ++++++++++----------- docker-compose_v3_ubuntu_mysql_latest.yaml | 48 +++++++++++----------- docker-compose_v3_ubuntu_mysql_local.yaml | 46 ++++++++++----------- docker-compose_v3_ubuntu_pgsql_latest.yaml | 46 ++++++++++----------- docker-compose_v3_ubuntu_pgsql_local.yaml | 46 ++++++++++----------- 12 files changed, 276 insertions(+), 278 deletions(-) diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index 8c6cb6043..1fde7f5f9 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -14,9 +14,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - mysql-server:mysql-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -39,8 +36,6 @@ services: - MYSQL_ROOT_PASSWORD depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -66,6 +61,8 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:alpine-latest + profiles: + - all ports: - "10061:10051" volumes: @@ -77,9 +74,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -116,6 +110,8 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:alpine-latest + profiles: + - all ports: - "10071:10051" volumes: @@ -127,9 +123,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -151,6 +144,10 @@ services: - mysql-server - zabbix-java-gateway - zabbix-snmptraps + secrets: + - MYSQL_USER + - MYSQL_PASSWORD + - MYSQL_ROOT_PASSWORD networks: zbx_net_backend: aliases: @@ -168,12 +165,11 @@ services: zabbix-web-apache-mysql: image: zabbix/zabbix-web-apache-mysql:alpine-latest + profiles: + - all ports: - - "80:8080" - - "443:8443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server + - "8081:8080" + - "8443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -222,11 +218,8 @@ services: zabbix-web-nginx-mysql: image: zabbix/zabbix-web-nginx-mysql:alpine-latest ports: - - "8081:8080" - - "8443:8443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server + - "80:8080" + - "443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -274,6 +267,9 @@ services: zabbix-agent: image: zabbix/zabbix-agent:alpine-latest + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -283,8 +279,6 @@ services: - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server deploy: resources: limits: @@ -313,6 +307,9 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:alpine-latest + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -339,6 +336,9 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:alpine-latest + profiles: + - full + - all ports: - "162:1162/udp" volumes: diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index d73eca43c..0179d2d3d 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -18,9 +18,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - mysql-server:mysql-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -43,8 +40,6 @@ services: - MYSQL_ROOT_PASSWORD depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -74,6 +69,8 @@ services: cache_from: - alpine:3.11 image: zabbix-proxy-sqlite3:alpine-local + profiles: + - all ports: - "10061:10051" volumes: @@ -85,9 +82,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -128,6 +122,8 @@ services: cache_from: - alpine:3.11 image: zabbix-proxy-mysql:alpine-local + profiles: + - all ports: - "10071:10051" volumes: @@ -139,9 +135,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -163,6 +156,10 @@ services: - mysql-server - zabbix-java-gateway - zabbix-snmptraps + secrets: + - MYSQL_USER + - MYSQL_PASSWORD + - MYSQL_ROOT_PASSWORD networks: zbx_net_backend: aliases: @@ -184,12 +181,11 @@ services: cache_from: - alpine:3.11 image: zabbix-web-apache-mysql:alpine-local + profiles: + - all ports: - - "80:8080" - - "443:8443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server + - "8081:8080" + - "8443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -242,11 +238,8 @@ services: - alpine:3.11 image: zabbix-web-nginx-mysql:alpine-local ports: - - "8081:8080" - - "8443:8443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server + - "80:8080" + - "443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -298,6 +291,9 @@ services: cache_from: - alpine:3.11 image: zabbix-agent:alpine-local + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -307,8 +303,6 @@ services: - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server deploy: resources: limits: @@ -341,6 +335,9 @@ services: cache_from: - alpine:3.11 image: zabbix-java-gateway:alpine-local + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -371,6 +368,9 @@ services: cache_from: - alpine:3.11 image: zabbix-snmptraps:alpine-local + profiles: + - full + - all ports: - "162:1162/udp" volumes: diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index a2afbfbf9..b29d11b38 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -14,9 +14,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - links: - - postgres-server:postgres-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -38,8 +35,6 @@ services: - POSTGRES_PASSWORD depends_on: - postgres-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -65,6 +60,8 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:alpine-latest + profiles: + - all ports: - "10061:10051" volumes: @@ -76,9 +73,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -115,6 +109,8 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:alpine-latest + profiles: + - all ports: - "10071:10051" volumes: @@ -126,9 +122,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -171,12 +164,11 @@ services: zabbix-web-apache-pgsql: image: zabbix/zabbix-web-apache-pgsql:alpine-latest + profiles: + - all ports: - - "80:8080" - - "443:8443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server + - "8081:8080" + - "8443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -225,11 +217,8 @@ services: zabbix-web-nginx-pgsql: image: zabbix/zabbix-web-nginx-pgsql:alpine-latest ports: - - "8081:8080" - - "8443:8443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server + - "80:8080" + - "443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -277,6 +266,9 @@ services: zabbix-agent: image: zabbix/zabbix-agent:alpine-latest + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -286,8 +278,6 @@ services: - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server deploy: resources: limits: @@ -316,6 +306,9 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:alpine-latest + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -342,6 +335,9 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:alpine-latest + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -368,6 +364,8 @@ services: mysql-server: image: mysql:5.7 + profiles: + - all command: - mysqld - --character-set-server=utf8 @@ -407,6 +405,8 @@ services: db_data_mysql: image: busybox + profiles: + - all volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 1d0c74868..a202f66d5 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -18,9 +18,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - links: - - postgres-server:postgres-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -42,8 +39,6 @@ services: - POSTGRES_PASSWORD depends_on: - postgres-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -73,6 +68,8 @@ services: cache_from: - alpine:3.11 image: zabbix-proxy-sqlite3:alpine-local + profiles: + - all ports: - "10061:10051" volumes: @@ -84,9 +81,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -127,6 +121,8 @@ services: cache_from: - alpine:3.11 image: zabbix-proxy-mysql:alpine-local + profiles: + - all ports: - "10071:10051" volumes: @@ -138,9 +134,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -188,12 +181,11 @@ services: cache_from: - alpine:3.11 image: zabbix-web-apache-pgsql:alpine-local + profiles: + - all ports: - - "80:8080" - - "443:8443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server + - "8081:8080" + - "8443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -246,11 +238,8 @@ services: - alpine:3.11 image: zabbix-web-nginx-pgsql:alpine-local ports: - - "8081:8080" - - "8443:8443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server + - "80:8080" + - "443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -302,6 +291,9 @@ services: cache_from: - alpine:3.11 image: zabbix-agent:alpine-local + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -311,8 +303,6 @@ services: - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server deploy: resources: limits: @@ -345,6 +335,9 @@ services: cache_from: - alpine:3.11 image: zabbix-java-gateway:alpine-local + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -375,6 +368,9 @@ services: cache_from: - alpine:3.11 image: zabbix-snmptraps:alpine-local + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -401,6 +397,8 @@ services: mysql-server: image: mysql:5.7 + profiles: + - all command: - mysqld - --character-set-server=utf8 @@ -440,6 +438,8 @@ services: db_data_mysql: image: busybox + profiles: + - all volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index 96823431b..994e30cce 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -14,9 +14,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - mysql-server:mysql-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -39,8 +36,6 @@ services: - MYSQL_ROOT_PASSWORD depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -66,6 +61,8 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:centos-latest + profiles: + - all ports: - "10061:10051" volumes: @@ -77,9 +74,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -116,6 +110,8 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:centos-latest + profiles: + - all ports: - "10071:10051" volumes: @@ -127,9 +123,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -151,6 +144,10 @@ services: - mysql-server - zabbix-java-gateway - zabbix-snmptraps + secrets: + - MYSQL_USER + - MYSQL_PASSWORD + - MYSQL_ROOT_PASSWORD networks: zbx_net_backend: aliases: @@ -168,12 +165,11 @@ services: zabbix-web-apache-mysql: image: zabbix/zabbix-web-apache-mysql:centos-latest + profiles: + - all ports: - - "80:8080" - - "443:8443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server + - "8081:8080" + - "8443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -222,11 +218,8 @@ services: zabbix-web-nginx-mysql: image: zabbix/zabbix-web-nginx-mysql:centos-latest ports: - - "8081:8080" - - "8443:8443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server + - "80:8080" + - "443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -274,6 +267,9 @@ services: zabbix-agent: image: zabbix/zabbix-agent:centos-latest + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -283,8 +279,6 @@ services: - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server deploy: resources: limits: @@ -313,6 +307,9 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:centos-latest + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -339,6 +336,9 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:centos-latest + profiles: + - full + - all ports: - "162:1162/udp" volumes: diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index 912265837..5eece48f8 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -18,9 +18,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - mysql-server:mysql-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -43,8 +40,6 @@ services: - MYSQL_ROOT_PASSWORD depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -74,6 +69,8 @@ services: cache_from: - centos:centos7 image: zabbix-proxy-sqlite3:centos-local + profiles: + - all ports: - "10061:10051" volumes: @@ -85,9 +82,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -128,6 +122,8 @@ services: cache_from: - centos:centos7 image: zabbix-proxy-mysql:centos-local + profiles: + - all ports: - "10071:10051" volumes: @@ -139,9 +135,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -163,6 +156,10 @@ services: - mysql-server - zabbix-java-gateway - zabbix-snmptraps + secrets: + - MYSQL_USER + - MYSQL_PASSWORD + - MYSQL_ROOT_PASSWORD networks: zbx_net_backend: aliases: @@ -184,12 +181,11 @@ services: cache_from: - centos:centos7 image: zabbix-web-apache-mysql:centos-local + profiles: + - all ports: - - "80:8080" - - "443:8443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server + - "8081:8080" + - "8443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -242,11 +238,8 @@ services: - centos:centos7 image: zabbix-web-nginx-mysql:centos-local ports: - - "8081:8080" - - "8443:8443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server + - "80:8080" + - "443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -298,6 +291,9 @@ services: cache_from: - centos:centos7 image: zabbix-agent:centos-local + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -307,8 +303,6 @@ services: - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server deploy: resources: limits: @@ -341,6 +335,9 @@ services: cache_from: - centos:centos7 image: zabbix-java-gateway:centos-local + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -371,6 +368,9 @@ services: cache_from: - centos:centos7 image: zabbix-snmptraps:centos-local + profiles: + - full + - all ports: - "162:1162/udp" volumes: diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index a98f84408..6de4b18a7 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -14,9 +14,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - links: - - postgres-server:postgres-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -38,8 +35,6 @@ services: - POSTGRES_PASSWORD depends_on: - postgres-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -65,6 +60,8 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:centos-latest + profiles: + - all ports: - "10061:10051" volumes: @@ -76,9 +73,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -115,6 +109,8 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:centos-latest + profiles: + - all ports: - "10071:10051" volumes: @@ -126,9 +122,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -171,12 +164,11 @@ services: zabbix-web-apache-pgsql: image: zabbix/zabbix-web-apache-pgsql:centos-latest + profiles: + - all ports: - - "80:8080" - - "443:8443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server + - "8081:8080" + - "8443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -225,11 +217,8 @@ services: zabbix-web-nginx-pgsql: image: zabbix/zabbix-web-nginx-pgsql:centos-latest ports: - - "8081:8080" - - "8443:8443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server + - "80:8080" + - "443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -277,6 +266,9 @@ services: zabbix-agent: image: zabbix/zabbix-agent:centos-latest + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -286,8 +278,6 @@ services: - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server deploy: resources: limits: @@ -316,6 +306,9 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:centos-latest + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -342,6 +335,9 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:centos-latest + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -368,6 +364,8 @@ services: mysql-server: image: mysql:5.7 + profiles: + - all command: - mysqld - --character-set-server=utf8 @@ -407,6 +405,8 @@ services: db_data_mysql: image: busybox + profiles: + - all volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 966cadc79..1d849ae81 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -15,9 +15,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - links: - - postgres-server:postgres-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -39,8 +36,6 @@ services: - POSTGRES_PASSWORD depends_on: - postgres-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -67,6 +62,8 @@ services: zabbix-proxy-sqlite3: build: ./proxy-sqlite3/centos image: zabbix-proxy-sqlite3:centos-local + profiles: + - all ports: - "10061:10051" volumes: @@ -78,9 +75,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -118,6 +112,8 @@ services: zabbix-proxy-mysql: build: ./proxy-mysql/centos image: zabbix-proxy-mysql:centos-local + profiles: + - all ports: - "10071:10051" volumes: @@ -129,9 +125,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -176,12 +169,11 @@ services: zabbix-web-apache-pgsql: build: ./web-apache-pgsql/centos image: zabbix-web-apache-pgsql:centos-local + profiles: + - all ports: - - "80:8080" - - "443:8443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server + - "8081:8080" + - "8443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -231,11 +223,8 @@ services: build: ./web-nginx-pgsql/centos image: zabbix-web-nginx-pgsql:centos-local ports: - - "8081:8080" - - "8443:8443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server + - "80:8080" + - "443:8443" volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -284,6 +273,9 @@ services: zabbix-agent: build: ./agent/centos image: zabbix-agent:centos-local + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -293,8 +285,6 @@ services: - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server deploy: resources: limits: @@ -324,6 +314,9 @@ services: zabbix-java-gateway: build: ./java-gateway/centos image: zabbix-java-gateway:centos-local + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -354,6 +347,9 @@ services: cache_from: - centos:centos7 image: zabbix-snmptraps:centos-local + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -380,6 +376,8 @@ services: mysql-server: image: mysql:5.7 + profiles: + - all command: - mysqld - --character-set-server=utf8 @@ -419,6 +417,8 @@ services: db_data_mysql: image: busybox + profiles: + - all volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index a288e00e5..33162b589 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -13,9 +13,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - mysql-server:mysql-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -38,8 +35,6 @@ services: - MYSQL_ROOT_PASSWORD depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -65,6 +60,8 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest + profiles: + - all ports: - "10061:10051" volumes: @@ -75,9 +72,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -114,6 +108,8 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:ubuntu-latest + profiles: + - all ports: - "10071:10051" volumes: @@ -124,9 +120,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -146,8 +139,10 @@ services: - .env_prx_mysql depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps + secrets: + - MYSQL_USER + - MYSQL_PASSWORD + - MYSQL_ROOT_PASSWORD networks: zbx_net_backend: aliases: @@ -165,12 +160,11 @@ services: zabbix-web-apache-mysql: image: zabbix/zabbix-web-apache-mysql:ubuntu-latest + profiles: + - all ports: - - "80:8080" - - "443:8443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server + - "8081:8080" + - "8443:8443" volumes: - /etc/localtime:/etc/localtime:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro @@ -218,11 +212,8 @@ services: zabbix-web-nginx-mysql: image: zabbix/zabbix-web-nginx-mysql:ubuntu-latest ports: - - "8081:8080" - - "8443:8443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server + - "80:8080" + - "443:8443" volumes: - /etc/localtime:/etc/localtime:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro @@ -269,6 +260,9 @@ services: zabbix-agent: image: zabbix/zabbix-agent:ubuntu-latest + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -277,8 +271,6 @@ services: - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server deploy: resources: limits: @@ -307,6 +299,9 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:ubuntu-latest + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -333,6 +328,9 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:ubuntu-latest + profiles: + - full + - all ports: - "162:1162/udp" volumes: diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 6c856314d..880ede37c 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -17,9 +17,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - mysql-server:mysql-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -42,8 +39,6 @@ services: - MYSQL_ROOT_PASSWORD depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -73,6 +68,8 @@ services: cache_from: - ubuntu:bionic image: zabbix-proxy-sqlite3:ubuntu-local + profiles: + - all ports: - "10061:10051" volumes: @@ -83,9 +80,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -126,6 +120,8 @@ services: cache_from: - ubuntu:bionic image: zabbix-proxy-mysql:ubuntu-local + profiles: + - all ports: - "10071:10051" volumes: @@ -136,9 +132,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -160,6 +153,10 @@ services: - mysql-server - zabbix-java-gateway - zabbix-snmptraps + secrets: + - MYSQL_USER + - MYSQL_PASSWORD + - MYSQL_ROOT_PASSWORD networks: zbx_net_backend: aliases: @@ -181,12 +178,11 @@ services: cache_from: - ubuntu:bionic image: zabbix-web-apache-mysql:ubuntu-local + profiles: + - all ports: - - "80:8080" - - "443:8443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server + - "8081:8080" + - "8443:8443" volumes: - /etc/localtime:/etc/localtime:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro @@ -238,11 +234,8 @@ services: - ubuntu:bionic image: zabbix-web-nginx-mysql:ubuntu-local ports: - - "8081:8080" - - "8443:8443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server + - "80:8080" + - "443:8443" volumes: - /etc/localtime:/etc/localtime:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro @@ -293,6 +286,9 @@ services: cache_from: - ubuntu:bionic image: zabbix-agent:ubuntu-local + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -301,8 +297,6 @@ services: - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server deploy: resources: limits: @@ -335,6 +329,9 @@ services: cache_from: - ubuntu:bionic image: zabbix-java-gateway:ubuntu-local + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -365,6 +362,9 @@ services: cache_from: - ubuntu:bionic image: zabbix-snmptraps:ubuntu-local + profiles: + - full + - all ports: - "162:1162/udp" volumes: diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index be03746d3..6ff539704 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -13,9 +13,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - links: - - postgres-server:postgres-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -37,8 +34,6 @@ services: - POSTGRES_PASSWORD depends_on: - postgres-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -64,6 +59,8 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest + profiles: + - all ports: - "10061:10051" volumes: @@ -74,9 +71,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -113,6 +107,8 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:ubuntu-latest + profiles: + - all ports: - "10071:10051" volumes: @@ -123,9 +119,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -168,12 +161,11 @@ services: zabbix-web-apache-pgsql: image: zabbix/zabbix-web-apache-pgsql:ubuntu-latest + profiles: + - all ports: - - "80:8080" - - "443:8443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server + - "8081:8080" + - "8443:8443" volumes: - /etc/localtime:/etc/localtime:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro @@ -221,11 +213,8 @@ services: zabbix-web-nginx-pgsql: image: zabbix/zabbix-web-nginx-pgsql:ubuntu-latest ports: - - "8081:8080" - - "8443:8443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server + - "80:8080" + - "443:8443" volumes: - /etc/localtime:/etc/localtime:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro @@ -272,6 +261,9 @@ services: zabbix-agent: image: zabbix/zabbix-agent:ubuntu-latest + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -280,8 +272,6 @@ services: - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server deploy: resources: limits: @@ -310,6 +300,9 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:ubuntu-latest + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -336,6 +329,9 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:ubuntu-latest + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -362,6 +358,8 @@ services: mysql-server: image: mysql:5.7 + profiles: + - all command: - mysqld - --character-set-server=utf8 @@ -401,6 +399,8 @@ services: db_data_mysql: image: busybox + profiles: + - all volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index 172083dc1..3b334b9f6 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -14,9 +14,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - links: - - postgres-server:postgres-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -38,8 +35,6 @@ services: - POSTGRES_PASSWORD depends_on: - postgres-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -66,6 +61,8 @@ services: zabbix-proxy-sqlite3: build: ./proxy-sqlite3/ubuntu image: zabbix-proxy-sqlite3:ubuntu-local + profiles: + - all ports: - "10061:10051" volumes: @@ -76,9 +73,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -116,6 +110,8 @@ services: zabbix-proxy-mysql: build: ./proxy-mysql/ubuntu image: zabbix-proxy-mysql:ubuntu-local + profiles: + - all ports: - "10071:10051" volumes: @@ -126,9 +122,6 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - snmptraps:/var/lib/zabbix/snmptraps:rw - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -173,12 +166,11 @@ services: zabbix-web-apache-pgsql: build: ./web-apache-pgsql/ubuntu image: zabbix-web-apache-pgsql:ubuntu-local + profiles: + - all ports: - - "80:8080" - - "443:8443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server + - "8081:8080" + - "8443:8443" volumes: - /etc/localtime:/etc/localtime:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro @@ -227,11 +219,8 @@ services: build: ./web-nginx-pgsql/ubuntu image: zabbix-web-nginx-pgsql:ubuntu-local ports: - - "8081:8080" - - "8443:8443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server + - "80:8080" + - "443:8443" volumes: - /etc/localtime:/etc/localtime:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro @@ -279,6 +268,9 @@ services: zabbix-agent: build: ./agent/ubuntu image: zabbix-agent:ubuntu-local + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -287,8 +279,6 @@ services: - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server deploy: resources: limits: @@ -318,6 +308,9 @@ services: zabbix-java-gateway: build: ./java-gateway/ubuntu image: zabbix-java-gateway:ubuntu-local + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -345,6 +338,9 @@ services: zabbix-snmptraps: build: ./snmptraps/ubuntu image: zabbix-snmptraps:ubuntu-local + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -371,6 +367,8 @@ services: mysql-server: image: mysql:5.7 + profiles: + - all command: - mysqld - --character-set-server=utf8 @@ -410,6 +408,8 @@ services: db_data_mysql: image: busybox + profiles: + - all volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw