diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5a2a101a3..585ac1074 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -74,7 +74,11 @@ 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.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" @@ -179,4 +183,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 }} diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index c4a933ba3..bd6eb8c15 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.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 - 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: # - root-ca.pem depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -70,6 +65,8 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:alpine-trunk + profiles: + - all ports: - "10061:10051" volumes: @@ -81,9 +78,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: @@ -120,6 +114,8 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:alpine-trunk + profiles: + - all ports: - "10071:10051" volumes: @@ -131,9 +127,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: @@ -179,12 +172,11 @@ services: zabbix-web-apache-mysql: image: zabbix/zabbix-web-apache-mysql:alpine-trunk + 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 @@ -237,11 +229,8 @@ services: zabbix-web-nginx-mysql: image: zabbix/zabbix-web-nginx-mysql:alpine-trunk 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 @@ -293,6 +282,9 @@ services: zabbix-agent: image: zabbix/zabbix-agent:alpine-trunk + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -302,8 +294,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: @@ -332,6 +322,9 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:alpine-trunk + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -358,6 +351,9 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:alpine-trunk + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -419,6 +415,9 @@ services: # elasticsearch: # image: elasticsearch +# profiles: +# - full +# - all # environment: # - transport.host=0.0.0.0 # - discovery.zen.minimum_master_nodes=1 diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index c0d8352d0..214b2f232 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -4,7 +4,7 @@ services: build: context: ./server-mysql/alpine cache_from: - - alpine:3.12 + - alpine:3.13 image: zabbix-server-mysql:alpine-local ports: - "10051:10051" @@ -19,9 +19,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: @@ -47,8 +44,6 @@ services: # - root-ca.pem depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -76,8 +71,10 @@ services: build: context: ./proxy-sqlite3/alpine cache_from: - - alpine:3.12 + - alpine:3.13 image: zabbix-proxy-sqlite3:alpine-local + profiles: + - all ports: - "10061:10051" volumes: @@ -89,9 +86,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: @@ -130,8 +124,10 @@ services: build: context: ./proxy-mysql/alpine cache_from: - - alpine:3.12 + - alpine:3.13 image: zabbix-proxy-mysql:alpine-local + profiles: + - all ports: - "10071:10051" volumes: @@ -143,9 +139,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: @@ -193,14 +186,13 @@ services: build: context: ./web-apache-mysql/alpine cache_from: - - alpine:3.12 + - alpine:3.13 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 @@ -254,14 +246,11 @@ services: build: context: ./web-nginx-mysql/alpine cache_from: - - alpine:3.12 + - alpine:3.13 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 @@ -315,8 +304,11 @@ services: build: context: ./agent/alpine cache_from: - - alpine:3.12 + - alpine:3.13 image: zabbix-agent:alpine-local + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -326,8 +318,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: @@ -358,8 +348,11 @@ services: build: context: ./java-gateway/alpine cache_from: - - alpine:3.12 + - alpine:3.13 image: zabbix-java-gateway:alpine-local + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -388,8 +381,11 @@ services: build: context: ./snmptraps/alpine cache_from: - - alpine:3.12 + - alpine:3.13 image: zabbix-snmptraps:alpine-local + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -451,6 +447,9 @@ services: # elasticsearch: # image: elasticsearch +# profiles: +# - full +# - all # environment: # - transport.host=0.0.0.0 # - discovery.zen.minimum_master_nodes=1 diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index 6b12b8a90..31f520fb0 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -18,9 +18,6 @@ services: # - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro # - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro # - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem: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: @@ -69,6 +64,8 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:alpine-trunk + profiles: + - all ports: - "10061:10051" volumes: @@ -80,9 +77,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: @@ -119,6 +113,8 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:alpine-trunk + profiles: + - all ports: - "10071:10051" volumes: @@ -130,9 +126,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: @@ -175,12 +168,11 @@ services: zabbix-web-apache-pgsql: image: zabbix/zabbix-web-apache-pgsql:alpine-trunk + 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 @@ -233,11 +225,8 @@ services: zabbix-web-nginx-pgsql: image: zabbix/zabbix-web-nginx-pgsql:alpine-trunk 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 @@ -289,6 +278,9 @@ services: zabbix-agent: image: zabbix/zabbix-agent:alpine-trunk + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -298,8 +290,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: @@ -328,6 +318,9 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:alpine-trunk + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -354,6 +347,9 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:alpine-trunk + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -380,6 +376,8 @@ services: mysql-server: image: mysql:8.0 + profiles: + - all command: - mysqld - --character-set-server=utf8 @@ -424,6 +422,8 @@ services: db_data_mysql: image: busybox + profiles: + - all volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw @@ -434,6 +434,9 @@ services: # elasticsearch: # image: elasticsearch +# profiles: +# - full +# - all # environment: # - transport.host=0.0.0.0 # - discovery.zen.minimum_master_nodes=1 diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 1ddec7694..b9bdf31d2 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -4,7 +4,7 @@ services: build: context: ./server-pgsql/alpine cache_from: - - alpine:3.12 + - alpine:3.13 image: zabbix-server-pgsql:alpine-local ports: - "10051:10051" @@ -22,9 +22,6 @@ services: # - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro # - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro # - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro - links: - - postgres-server:postgres-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -46,8 +43,6 @@ services: - POSTGRES_PASSWORD depends_on: - postgres-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -75,8 +70,10 @@ services: build: context: ./proxy-sqlite3/alpine cache_from: - - alpine:3.12 + - alpine:3.13 image: zabbix-proxy-sqlite3:alpine-local + profiles: + - all ports: - "10061:10051" volumes: @@ -88,9 +85,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: @@ -129,8 +123,10 @@ services: build: context: ./proxy-mysql/alpine cache_from: - - alpine:3.12 + - alpine:3.13 image: zabbix-proxy-mysql:alpine-local + profiles: + - all ports: - "10071:10051" volumes: @@ -142,9 +138,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: @@ -189,14 +182,13 @@ services: build: context: ./web-apache-pgsql/alpine cache_from: - - alpine:3.12 + - alpine:3.13 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 @@ -250,14 +242,11 @@ services: build: context: ./web-nginx-pgsql/alpine cache_from: - - alpine:3.12 + - alpine:3.13 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 @@ -311,8 +300,11 @@ services: build: context: ./agent/alpine cache_from: - - alpine:3.12 + - alpine:3.13 image: zabbix-agent:alpine-local + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -322,8 +314,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: @@ -354,8 +344,11 @@ services: build: context: ./java-gateway/alpine cache_from: - - alpine:3.12 + - alpine:3.13 image: zabbix-java-gateway:alpine-local + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -384,8 +377,11 @@ services: build: context: ./snmptraps/alpine cache_from: - - alpine:3.12 + - alpine:3.13 image: zabbix-snmptraps:alpine-local + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -412,6 +408,8 @@ services: mysql-server: image: mysql:8.0 + profiles: + - all command: - mysqld - --character-set-server=utf8 @@ -456,6 +454,8 @@ services: db_data_mysql: image: busybox + profiles: + - all volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw @@ -466,6 +466,9 @@ services: # elasticsearch: # image: elasticsearch +# profiles: +# - full +# - all # environment: # - transport.host=0.0.0.0 # - discovery.zen.minimum_master_nodes=1 diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index 7315523ef..2243f58b3 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.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 - 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: # - root-ca.pem depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -70,6 +65,8 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:centos-trunk + profiles: + - all ports: - "10061:10051" volumes: @@ -81,9 +78,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: @@ -120,6 +114,8 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:centos-trunk + profiles: + - all ports: - "10071:10051" volumes: @@ -131,9 +127,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: @@ -179,12 +172,11 @@ services: zabbix-web-apache-mysql: image: zabbix/zabbix-web-apache-mysql:centos-trunk + 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 @@ -237,11 +229,8 @@ services: zabbix-web-nginx-mysql: image: zabbix/zabbix-web-nginx-mysql:centos-trunk 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 @@ -293,6 +282,9 @@ services: zabbix-agent: image: zabbix/zabbix-agent:centos-trunk + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -302,8 +294,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: @@ -332,6 +322,9 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:centos-trunk + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -358,6 +351,9 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:centos-trunk + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -419,6 +415,9 @@ services: # elasticsearch: # image: elasticsearch +# profiles: +# - full +# - all # environment: # - transport.host=0.0.0.0 # - discovery.zen.minimum_master_nodes=1 diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index b163251cd..d4a44cb7b 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -19,9 +19,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: @@ -47,8 +44,6 @@ services: # - root-ca.pem depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -78,6 +73,8 @@ services: cache_from: - centos:centos8 image: zabbix-proxy-sqlite3:centos-local + profiles: + - all ports: - "10061:10051" volumes: @@ -89,9 +86,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: @@ -132,6 +126,8 @@ services: cache_from: - centos:centos8 image: zabbix-proxy-mysql:centos-local + profiles: + - all ports: - "10071:10051" volumes: @@ -143,9 +139,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: @@ -195,12 +188,11 @@ services: cache_from: - centos:centos8 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 @@ -257,11 +249,8 @@ services: - centos:centos8 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 @@ -317,6 +306,9 @@ services: cache_from: - centos:centos8 image: zabbix-agent:centos-local + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -326,8 +318,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: @@ -360,6 +350,9 @@ services: cache_from: - centos:centos8 image: zabbix-java-gateway:centos-local + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -390,6 +383,9 @@ services: cache_from: - centos:centos8 image: zabbix-snmptraps:centos-local + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -451,6 +447,9 @@ services: # elasticsearch: # image: elasticsearch +# profiles: +# - full +# - all # environment: # - transport.host=0.0.0.0 # - discovery.zen.minimum_master_nodes=1 diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index 6d5d7c9a3..036fee95d 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -18,9 +18,6 @@ services: # - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro # - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro # - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem: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: @@ -69,6 +64,8 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:centos-trunk + profiles: + - all ports: - "10061:10051" volumes: @@ -80,9 +77,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: @@ -119,6 +113,8 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:centos-trunk + profiles: + - all ports: - "10071:10051" volumes: @@ -130,9 +126,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: @@ -175,12 +168,11 @@ services: zabbix-web-apache-pgsql: image: zabbix/zabbix-web-apache-pgsql:centos-trunk + 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 @@ -233,11 +225,8 @@ services: zabbix-web-nginx-pgsql: image: zabbix/zabbix-web-nginx-pgsql:centos-trunk 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 @@ -289,6 +278,9 @@ services: zabbix-agent: image: zabbix/zabbix-agent:centos-trunk + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -298,8 +290,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: @@ -328,6 +318,9 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:centos-trunk + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -354,6 +347,9 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:centos-trunk + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -380,6 +376,8 @@ services: mysql-server: image: mysql:8.0 + profiles: + - all command: - mysqld - --character-set-server=utf8 @@ -424,6 +422,8 @@ services: db_data_mysql: image: busybox + profiles: + - all volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw @@ -434,6 +434,9 @@ services: # elasticsearch: # image: elasticsearch +# profiles: +# - full +# - all # environment: # - transport.host=0.0.0.0 # - discovery.zen.minimum_master_nodes=1 diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index efe84738d..3016f9228 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -22,9 +22,6 @@ services: # - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro # - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro # - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro - links: - - postgres-server:postgres-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -46,8 +43,6 @@ services: - POSTGRES_PASSWORD depends_on: - postgres-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -77,6 +72,8 @@ services: cache_from: - centos:centos8 image: zabbix-proxy-sqlite3:centos-local + profiles: + - all ports: - "10061:10051" volumes: @@ -88,9 +85,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: @@ -131,6 +125,8 @@ services: cache_from: - centos:centos8 image: zabbix-proxy-mysql:centos-local + profiles: + - all ports: - "10071:10051" volumes: @@ -142,9 +138,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: @@ -191,12 +184,11 @@ services: cache_from: - centos:centos8 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 @@ -253,11 +245,8 @@ services: - centos:centos8 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 @@ -313,6 +302,9 @@ services: cache_from: - centos:centos8 image: zabbix-agent:centos-local + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -322,8 +314,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: @@ -356,6 +346,9 @@ services: cache_from: - centos:centos8 image: zabbix-java-gateway:centos-local + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -386,6 +379,9 @@ services: cache_from: - centos:centos8 image: zabbix-snmptraps:centos-local + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -412,6 +408,8 @@ services: mysql-server: image: mysql:8.0 + profiles: + - all command: - mysqld - --character-set-server=utf8 @@ -456,6 +454,8 @@ services: db_data_mysql: image: busybox + profiles: + - all volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw @@ -466,6 +466,9 @@ services: # elasticsearch: # image: elasticsearch +# profiles: +# - full +# - all # environment: # - transport.host=0.0.0.0 # - discovery.zen.minimum_master_nodes=1 diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index b3cb31a0a..b5eb27776 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_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: @@ -42,8 +39,6 @@ services: # - root-ca.pem depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -68,7 +63,9 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk + image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest + profiles: + - all ports: - "10061:10051" volumes: @@ -79,9 +76,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: image: zabbix/zabbix-proxy-mysql:ubuntu-trunk + profiles: + - all ports: - "10071:10051" volumes: @@ -128,9 +124,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: @@ -150,8 +143,6 @@ services: - .env_prx_mysql depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -176,12 +167,11 @@ services: zabbix-web-apache-mysql: image: zabbix/zabbix-web-apache-mysql:ubuntu-trunk + 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 @@ -233,11 +223,8 @@ services: zabbix-web-nginx-mysql: image: zabbix/zabbix-web-nginx-mysql:ubuntu-trunk 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 @@ -288,6 +275,9 @@ services: zabbix-agent: image: zabbix/zabbix-agent:ubuntu-trunk + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -296,8 +286,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: @@ -326,6 +314,9 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:ubuntu-trunk + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -352,6 +343,9 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:ubuntu-trunk + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -413,6 +407,9 @@ services: # elasticsearch: # image: elasticsearch +# profiles: +# - full +# - all # environment: # - transport.host=0.0.0.0 # - discovery.zen.minimum_master_nodes=1 diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index ada688b20..103da7a0a 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_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: @@ -46,8 +43,6 @@ services: # - root-ca.pem depends_on: - mysql-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -77,6 +72,8 @@ services: cache_from: - ubuntu:focal image: zabbix-proxy-sqlite3:ubuntu-local + profiles: + - all ports: - "10061:10051" volumes: @@ -87,9 +84,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: @@ -130,6 +124,8 @@ services: cache_from: - ubuntu:focal image: zabbix-proxy-mysql:ubuntu-local + profiles: + - all ports: - "10071:10051" volumes: @@ -140,9 +136,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: @@ -192,12 +185,11 @@ services: cache_from: - ubuntu:focal 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 @@ -253,11 +245,8 @@ services: - ubuntu:focal 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 @@ -312,6 +301,9 @@ services: cache_from: - ubuntu:focal image: zabbix-agent:ubuntu-local + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -320,8 +312,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: @@ -354,6 +344,9 @@ services: cache_from: - ubuntu:focal image: zabbix-java-gateway:ubuntu-local + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -384,6 +377,9 @@ services: cache_from: - ubuntu:focal image: zabbix-snmptraps:ubuntu-local + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -445,6 +441,9 @@ services: # elasticsearch: # image: elasticsearch +# profiles: +# - full +# - all # environment: # - transport.host=0.0.0.0 # - discovery.zen.minimum_master_nodes=1 diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index af50694c5..c3922a3fc 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -17,9 +17,6 @@ services: # - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro # - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro # - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro - links: - - postgres-server:postgres-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -41,8 +38,6 @@ services: - POSTGRES_PASSWORD depends_on: - postgres-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -68,6 +63,8 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk + 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: @@ -117,6 +111,8 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:ubuntu-trunk + 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: @@ -172,12 +165,11 @@ services: zabbix-web-apache-pgsql: image: zabbix/zabbix-web-apache-pgsql:ubuntu-trunk + 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 @@ -229,11 +221,8 @@ services: zabbix-web-nginx-pgsql: image: zabbix/zabbix-web-nginx-pgsql:ubuntu-trunk 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 @@ -284,6 +273,9 @@ services: zabbix-agent: image: zabbix/zabbix-agent:ubuntu-trunk + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -292,8 +284,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: @@ -322,6 +312,9 @@ services: zabbix-java-gateway: image: zabbix/zabbix-java-gateway:ubuntu-trunk + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -348,6 +341,9 @@ services: zabbix-snmptraps: image: zabbix/zabbix-snmptraps:ubuntu-trunk + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -374,6 +370,8 @@ services: mysql-server: image: mysql:8.0 + profiles: + - all command: - mysqld - --character-set-server=utf8 @@ -418,6 +416,8 @@ services: db_data_mysql: image: busybox + profiles: + - all volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw @@ -428,6 +428,9 @@ services: # elasticsearch: # image: elasticsearch +# profiles: +# - full +# - all # environment: # - transport.host=0.0.0.0 # - discovery.zen.minimum_master_nodes=1 diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index a6d754044..d8b3708d8 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -21,9 +21,6 @@ services: # - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro # - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro # - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro - links: - - postgres-server:postgres-server - - zabbix-java-gateway:zabbix-java-gateway ulimits: nproc: 65535 nofile: @@ -45,8 +42,6 @@ services: - POSTGRES_PASSWORD depends_on: - postgres-server - - zabbix-java-gateway - - zabbix-snmptraps networks: zbx_net_backend: aliases: @@ -76,6 +71,8 @@ services: cache_from: - ubuntu:focal image: zabbix-proxy-sqlite3:ubuntu-local + profiles: + - all ports: - "10061:10051" volumes: @@ -86,9 +83,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: @@ -129,6 +123,8 @@ services: cache_from: - ubuntu:focal image: zabbix-proxy-mysql:ubuntu-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: @@ -188,12 +181,11 @@ services: cache_from: - ubuntu:focal 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 @@ -249,11 +241,8 @@ services: - ubuntu:focal 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 @@ -308,6 +297,9 @@ services: cache_from: - ubuntu:focal image: zabbix-agent:ubuntu-local + profiles: + - full + - all ports: - "10050:10050" volumes: @@ -316,8 +308,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: @@ -350,6 +340,9 @@ services: cache_from: - ubuntu:focal image: zabbix-java-gateway:ubuntu-local + profiles: + - full + - all ports: - "10052:10052" deploy: @@ -380,6 +373,9 @@ services: cache_from: - ubuntu:focal image: zabbix-snmptraps:ubuntu-local + profiles: + - full + - all ports: - "162:1162/udp" volumes: @@ -406,6 +402,8 @@ services: mysql-server: image: mysql:8.0 + profiles: + - all command: - mysqld - --character-set-server=utf8 @@ -450,6 +448,8 @@ services: db_data_mysql: image: busybox + profiles: + - all volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw @@ -460,6 +460,9 @@ services: # elasticsearch: # image: elasticsearch +# profiles: +# - full +# - all # environment: # - transport.host=0.0.0.0 # - discovery.zen.minimum_master_nodes=1 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`