Merge pull request #1401 from zabbix/trunk_web_driver

Trunk web driver
This commit is contained in:
Alexey Pustovalov 2024-05-21 22:02:40 +09:00 committed by GitHub
commit 78e808c20b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 233 additions and 1 deletions

6
.env
View File

@ -30,6 +30,9 @@ POSTGRESQL_IMAGE_TAG=16-alpine
ELASTICSEARCH_IMAGE=elasticsearch
ELASTICSEARCH_IMAGE_TAG=latest
WEBDRIVER_IMAGE=selenium/standalone-chrome
WEBDRIVER_IMAGE_TAG=latest
# Expose ports per service
ZABBIX_SERVER_PORT=10051
ZABBIX_PROXY_MYSQL_PORT=10071
@ -53,6 +56,9 @@ BACKEND_SUBNET=172.16.239.0/24
BACKEND_ENABLE_IPV6=false
DATABASE_NETWORK_ENABLE_IPV6=false
DATABASE_NETWORK_DRIVER=default
ADD_TOOLS_NETWORK_DRIVER=default
ADD_TOOLS_SUBNET=172.16.240.0/24
ADD_TOOLS_ENABLE_IPV6=false
# Locations
DATA_DIRECTORY=./zbx_env

View File

@ -0,0 +1,14 @@
version: '3.8'
services:
selenium:
image: "${WEBDRIVER_IMAGE}:${WEBDRIVER_IMAGE_TAG}"
restart: "${RESTART_POLICY}"
profiles:
- full
- all
shm_size: "2gb"
networks:
zbx_tools_frontend:
aliases:
- webdriver
- selenium

View File

@ -40,6 +40,7 @@ services:
aliases:
- zabbix-server
zbx_net_frontend:
zbx_tools_frontend:
# devices:
# - "/dev/ttyUSB0:/dev/ttyUSB0"
stop_grace_period: 30s
@ -128,6 +129,7 @@ services:
networks:
zbx_net_backend:
zbx_net_frontend:
zbx_tools_frontend:
stop_grace_period: 30s
# cap_add:
# - "NET_RAW"

View File

@ -107,6 +107,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -132,6 +137,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -204,6 +204,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -229,6 +234,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -117,6 +117,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -142,6 +147,15 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -227,6 +227,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -252,6 +257,15 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -107,6 +107,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -132,6 +137,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -205,6 +205,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -230,6 +235,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -117,6 +117,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -142,6 +147,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -227,6 +227,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -252,6 +257,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -107,6 +107,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -132,6 +137,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -205,6 +205,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -230,6 +235,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -117,6 +117,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -142,6 +147,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -227,6 +227,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -252,6 +257,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -95,6 +95,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -120,6 +125,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -193,6 +193,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -218,6 +223,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -105,6 +105,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -130,6 +135,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -215,6 +215,11 @@ services:
# file: compose_databases.yaml
# service: elasticsearch
# selenium:
# extends:
# file: compose_additional_components.yaml
# service: selenium
networks:
zbx_net_frontend:
driver: bridge
@ -240,6 +245,14 @@ networks:
internal: true
ipam:
driver: "${DATABASE_NETWORK_DRIVER}"
zbx_tools_frontend:
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
ipam:
driver: "${ADD_TOOLS_NETWORK_DRIVER}"
config:
- subnet: "${ADD_TOOLS_SUBNET}"
volumes:
snmptraps:

View File

@ -84,5 +84,5 @@ ZBX_ENABLE_SNMP_TRAPS=true
# ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report
# ZBX_SERVICEMANAGERSYNCFREQUENCY=60
# ZBX_ALLOWSOFTWAREUPDATECHECK=1 # Available since 7.0.0
# ZBX_WEBDRIVERURL= # Available since 7.0.0
# ZBX_WEBDRIVERURL=http://selenium:4444 # Available since 7.0.0
# ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0