diff --git a/compose_databases.yaml b/compose_databases.yaml index 50f5368dd..797b00eb7 100644 --- a/compose_databases.yaml +++ b/compose_databases.yaml @@ -1,9 +1,9 @@ -version: '3.8' services: mysql-server: image: "${MYSQL_IMAGE}:${MYSQL_IMAGE_TAG}" command: - mysqld + - --skip-mysqlx - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin # Only during upgrade from versions prior 6.4 and new installations (schema deployment) @@ -14,12 +14,15 @@ services: # - --ssl-cert=/run/secrets/server-cert.pem # - --ssl-key=/run/secrets/server-key.pem restart: "${RESTART_POLICY}" + attach: false volumes: - ${DATA_DIRECTORY}/var/lib/mysql:/var/lib/mysql:rw - ${ENV_VARS_DIRECTORY}/mysql_init/init_proxy_db.sql:/docker-entrypoint-initdb.d/mysql_init_proxy.sql:ro # - dbsocket:/var/run/mysqld/ env_file: - ${ENV_VARS_DIRECTORY}/.env_db_mysql + - path: ${ENV_VARS_DIRECTORY}/.env_db_mysql_override + required: false environment: - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/MYSQL_ROOT_PASSWORD secrets: @@ -31,7 +34,7 @@ services: # - root-ca.pem stop_grace_period: 1m networks: - zbx_net_database: + database: aliases: - mysql-server @@ -39,6 +42,7 @@ services: image: "${POSTGRESQL_IMAGE}:${POSTGRESQL_IMAGE_TAG}" # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem restart: "${RESTART_POLICY}" + attach: false volumes: - ${DATA_DIRECTORY}/var/lib/postgresql/data:/var/lib/postgresql/data:rw - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro @@ -46,12 +50,14 @@ services: - ${ENV_VARS_DIRECTORY}/.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro env_file: - ${ENV_VARS_DIRECTORY}/.env_db_pgsql + - path: ${ENV_VARS_DIRECTORY}/.env_db_pgsql_override + required: false secrets: - POSTGRES_USER - POSTGRES_PASSWORD stop_grace_period: 1m networks: - zbx_net_database: + database: aliases: - postgres-server @@ -62,12 +68,14 @@ services: db-data-pgsql: image: busybox + attach: false volumes: - ${DATA_DIRECTORY}/var/lib/postgresql/data:/var/lib/postgresql/data:rw elasticsearch: image: "${ELASTICSEARCH_IMAGE}:${ELASTICSEARCH_IMAGE_TAG}" restart: "${RESTART_POLICY}" + attach: false profiles: - full - all @@ -75,6 +83,6 @@ services: - transport.host=0.0.0.0 - discovery.zen.minimum_master_nodes=1 networks: - zbx_net_database: + database: aliases: - elasticsearch diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml index d46273eef..8675ebd65 100644 --- a/compose_zabbix_components.yaml +++ b/compose_zabbix_components.yaml @@ -1,9 +1,9 @@ -version: '3.8' services: server: ports: - "${ZABBIX_SERVER_PORT}:10051" restart: "${RESTART_POLICY}" + attach: true volumes: - /etc/localtime:/etc/localtime:ro - ${DATA_DIRECTORY}/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro @@ -31,14 +31,17 @@ services: memory: 512M env_file: - ${ENV_VARS_DIRECTORY}/.env_srv + - path: ${ENV_VARS_DIRECTORY}/.env_srv_override + required: false networks: - zbx_net_database: + database: aliases: - zabbix-server - zbx_net_backend: + backend: aliases: - zabbix-server - zbx_net_frontend: + frontend: + tools_frontend: # devices: # - "/dev/ttyUSB0:/dev/ttyUSB0" stop_grace_period: 30s @@ -68,7 +71,7 @@ services: # - client-cert.pem # - root-ca.pem networks: - zbx_net_backend: + backend: aliases: - zabbix-server-mysql labels: @@ -88,7 +91,7 @@ services: - POSTGRES_USER - POSTGRES_PASSWORD networks: - zbx_net_backend: + backend: aliases: - zabbix-server-pgsql labels: @@ -99,6 +102,7 @@ services: profiles: - all restart: "${RESTART_POLICY}" + attach: false volumes: - /etc/localtime:/etc/localtime:ro - ${DATA_DIRECTORY}/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro @@ -124,8 +128,8 @@ services: env_file: - ${ENV_VARS_DIRECTORY}/.env_prx networks: - zbx_net_backend: - zbx_net_frontend: + backend: + frontend: stop_grace_period: 30s # cap_add: # - "NET_RAW" @@ -146,8 +150,10 @@ services: - "${ZABBIX_PROXY_SQLITE3_PORT}:10051" env_file: - ${ENV_VARS_DIRECTORY}/.env_prx_sqlite3 + - path: ${ENV_VARS_DIRECTORY}/.env_prx_sqlite3_override + required: false networks: - zbx_net_backend: + backend: aliases: - zabbix-proxy-sqlite3 labels: @@ -164,6 +170,8 @@ services: env_file: - ${ENV_VARS_DIRECTORY}/.env_db_mysql_proxy - ${ENV_VARS_DIRECTORY}/.env_prx_mysql + - path: ${ENV_VARS_DIRECTORY}/.env_prx_mysql_override + required: false secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -171,10 +179,10 @@ services: # - client-cert.pem # - root-ca.pem networks: - zbx_net_database: + database: aliases: - zabbix-proxy-mysql - zbx_net_backend: + backend: aliases: - zabbix-proxy-mysql labels: @@ -188,6 +196,7 @@ services: - "${ZABBIX_WEB_APACHE_HTTP_PORT}:8080" - "${ZABBIX_WEB_APACHE_HTTPS_PORT}:8443" restart: "${RESTART_POLICY}" + attach: false volumes: - /etc/localtime:/etc/localtime:ro - ${DATA_DIRECTORY}/etc/ssl/apache2:/etc/ssl/apache2:ro @@ -203,6 +212,8 @@ services: memory: 256M env_file: - ${ENV_VARS_DIRECTORY}/.env_web + - path: ${ENV_VARS_DIRECTORY}/.env_web_override + required: false healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080/"] interval: 10s @@ -210,9 +221,9 @@ services: retries: 3 start_period: 30s networks: - zbx_net_database: - zbx_net_backend: - zbx_net_frontend: + database: + backend: + frontend: stop_grace_period: 10s sysctls: - net.core.somaxconn=65535 @@ -251,7 +262,7 @@ services: - POSTGRES_USER - POSTGRES_PASSWORD networks: - zbx_net_backend: + backend: aliases: - zabbix-web-apache-pgsql labels: @@ -263,6 +274,7 @@ services: - "${ZABBIX_WEB_NGINX_HTTP_PORT}:8080" - "${ZABBIX_WEB_NGINX_HTTPS_PORT}:8443" restart: "${RESTART_POLICY}" + attach: false volumes: - /etc/localtime:/etc/localtime:ro - ${DATA_DIRECTORY}/etc/ssl/nginx:/etc/ssl/nginx:ro @@ -278,6 +290,8 @@ services: memory: 256M env_file: - ${ENV_VARS_DIRECTORY}/.env_web + - path: ${ENV_VARS_DIRECTORY}/.env_web_override + required: false healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s @@ -285,9 +299,9 @@ services: retries: 3 start_period: 30s networks: - zbx_net_database: - zbx_net_backend: - zbx_net_frontend: + database: + backend: + frontend: stop_grace_period: 10s sysctls: - net.core.somaxconn=65535 @@ -310,7 +324,7 @@ services: # - client-cert.pem # - root-ca.pem networks: - zbx_net_backend: + backend: aliases: - zabbix-web-nginx-mysql labels: @@ -330,7 +344,7 @@ services: - POSTGRES_USER - POSTGRES_PASSWORD networks: - zbx_net_backend: + backend: aliases: - zabbix-web-nginx-pgsql labels: @@ -344,6 +358,7 @@ services: ports: - "${ZABBIX_AGENT_PORT}:10050" restart: "${RESTART_POLICY}" + attach: false volumes: - /etc/localtime:/etc/localtime:ro - ${DATA_DIRECTORY}/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro @@ -362,10 +377,12 @@ services: mode: global env_file: - ${ENV_VARS_DIRECTORY}/.env_agent + - path: ${ENV_VARS_DIRECTORY}/.env_agent_override + required: false privileged: true pid: "host" networks: - zbx_net_backend: + backend: aliases: - zabbix-agent - zabbix-agent-passive @@ -382,6 +399,7 @@ services: ports: - "${ZABBIX_AGENT2_PORT}:10050" restart: "${RESTART_POLICY}" + attach: false volumes: - /etc/localtime:/etc/localtime:ro - ${DATA_DIRECTORY}/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro @@ -400,10 +418,12 @@ services: mode: global env_file: - ${ENV_VARS_DIRECTORY}/.env_agent + - path: ${ENV_VARS_DIRECTORY}/.env_agent_override + required: false privileged: true pid: "host" networks: - zbx_net_backend: + backend: aliases: - zabbix-agent - zabbix-agent-passive @@ -420,6 +440,7 @@ services: ports: - "${ZABBIX_JAVA_GATEWAY_PORT}:10052" restart: "${RESTART_POLICY}" + attach: false deploy: resources: limits: @@ -430,10 +451,13 @@ services: memory: 256M env_file: - ${ENV_VARS_DIRECTORY}/.env_java + - path: ${ENV_VARS_DIRECTORY}/.env_java_override + required: false networks: - zbx_net_backend: + backend: aliases: - zabbix-java-gateway + frontend: stop_grace_period: 5s labels: com.zabbix.description: "Zabbix Java Gateway" @@ -450,6 +474,8 @@ services: ports: - "${ZABBIX_SNMPTRAPS_PORT}:1162/udp" restart: "${RESTART_POLICY}" + attach: false + read_only: true volumes: - snmptraps:/var/lib/zabbix/snmptraps:rw tmpfs: /tmp @@ -463,11 +489,13 @@ services: memory: 128M env_file: - ${ENV_VARS_DIRECTORY}/.env_snmptraps + - path: ${ENV_VARS_DIRECTORY}/.env_snmptraps_override + required: false networks: - zbx_net_frontend: + frontend: aliases: - zabbix-snmptraps - zbx_net_backend: + backend: stop_grace_period: 5s labels: com.zabbix.description: "Zabbix snmptraps" @@ -481,6 +509,7 @@ services: ports: - "${ZABBIX_WEB_SERVICE_PORT}:10053" restart: "${RESTART_POLICY}" + attach: false volumes: - ${DATA_DIRECTORY}/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro tmpfs: /tmp @@ -496,8 +525,10 @@ services: memory: 256M env_file: - ${ENV_VARS_DIRECTORY}/.env_web_service + - path: ${ENV_VARS_DIRECTORY}/.env_web_service_override + required: false networks: - zbx_net_backend: + backend: aliases: - zabbix-web-service stop_grace_period: 5s diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index d269ee6eb..3884bae90 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -108,7 +109,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -116,7 +117,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -125,7 +126,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 85dc45bc3..dc55b4572 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${ALPINE_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-mysql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -205,7 +209,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -213,7 +217,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -222,7 +226,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index bc4892246..e6cd9a39a 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -118,7 +119,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -126,7 +127,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -135,7 +136,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index ae96aa01a..02695c287 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${ALPINE_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-pgsql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -39,6 +43,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -228,7 +233,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -236,7 +241,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -245,7 +250,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index ff4d42540..8cbc03571 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -108,7 +109,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -116,7 +117,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -125,7 +126,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index 2540b233f..60a01516a 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${CENTOS_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-mysql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -206,7 +210,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -214,7 +218,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -223,7 +227,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index 81c0b4d80..d54adabcf 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -118,7 +119,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -126,7 +127,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -135,7 +136,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 394eca23b..2596a2dea 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${CENTOS_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-pgsql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -39,6 +43,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -228,7 +233,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -236,7 +241,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -245,7 +250,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_ol_mysql_latest.yaml b/docker-compose_v3_ol_mysql_latest.yaml index a450cd1f1..1c1582a31 100644 --- a/docker-compose_v3_ol_mysql_latest.yaml +++ b/docker-compose_v3_ol_mysql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -108,7 +109,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -116,7 +117,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -125,7 +126,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index b2a4818b3..02a154d77 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${OL_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-mysql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -206,7 +210,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -214,7 +218,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -223,7 +227,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_ol_pgsql_latest.yaml b/docker-compose_v3_ol_pgsql_latest.yaml index 938fbd49b..8bc8e9e92 100644 --- a/docker-compose_v3_ol_pgsql_latest.yaml +++ b/docker-compose_v3_ol_pgsql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -118,7 +119,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -126,7 +127,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -135,7 +136,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index d67689b0b..9db3ee145 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${OL_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-pgsql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -39,6 +43,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -228,7 +233,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -236,7 +241,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -245,7 +250,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index bd1ae5d1e..f8885b064 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -96,7 +97,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -104,7 +105,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -113,7 +114,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 522692f0e..d7c9930e1 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${UBUNTU_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-mysql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -194,7 +198,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -202,7 +206,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -211,7 +215,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index 49622ebcc..7f2685f9e 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -106,7 +107,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -114,7 +115,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -123,7 +124,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index bda62455e..9bc439b52 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${UBUNTU_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-pgsql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -39,6 +43,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -216,7 +221,7 @@ services: # service: elasticsearch networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -224,7 +229,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -233,7 +238,7 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" diff --git a/env_vars/.env_prx b/env_vars/.env_prx index 8b17c11ea..25e480bf6 100644 --- a/env_vars/.env_prx +++ b/env_vars/.env_prx @@ -7,13 +7,6 @@ # ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0 # ZBX_HOSTNAMEITEM=system.hostname # ZBX_SOURCEIP= -# ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0 -# ZBX_DBTLSCONNECT=require # Available since 5.0.0 -# ZBX_DBTLSCAFILE=/run/secrets/root-ca.pem # Available since 5.0.0 -# ZBX_DBTLSCERTFILE=/run/secrets/client-cert.pem # Available since 5.0.0 -# ZBX_DBTLSKEYFILE=/run/secrets/client-key.pem # Available since 5.0.0 -# ZBX_DBTLSCIPHER= # Available since 5.0.0 -# ZBX_DBTLSCIPHER13= # Available since 5.0.0 # ZBX_DEBUGLEVEL=3 # ZBX_PROXYLOCALBUFFER=0 # ZBX_PROXYOFFLINEBUFFER=1 diff --git a/env_vars/.env_prx_mysql b/env_vars/.env_prx_mysql index 8b351c57d..c7a9333c1 100644 --- a/env_vars/.env_prx_mysql +++ b/env_vars/.env_prx_mysql @@ -1 +1,8 @@ # ZBX_HOSTNAME=zabbix-proxy-mysql +# ZBX_DBTLSCONNECT=require # Available since 5.0.0 +# ZBX_DBTLSCAFILE=/run/secrets/root-ca.pem # Available since 5.0.0 +# ZBX_DBTLSCERTFILE=/run/secrets/client-cert.pem # Available since 5.0.0 +# ZBX_DBTLSKEYFILE=/run/secrets/client-key.pem # Available since 5.0.0 +# ZBX_DBTLSCIPHER= # Available since 5.0.0 +# ZBX_DBTLSCIPHER13= # Available since 5.0.0 +# ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0