Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Trunk web driver #1401

Merged
merged 2 commits into from
May 21, 2024
Merged

Trunk web driver #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ab55ff
Added support for WebDriver in compose files
dotneft May 21, 2024
2868e7c
Added support for WebDriver in compose files
dotneft May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 14 additions & 0 deletions compose_additional_components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions compose_zabbix_components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ services:
aliases:
- zabbix-server
zbx_net_frontend:
zbx_tools_frontend:
# devices:
# - "/dev/ttyUSB0:/dev/ttyUSB0"
stop_grace_period: 30s
Expand Down Expand Up @@ -128,6 +129,7 @@ services:
networks:
zbx_net_backend:
zbx_net_frontend:
zbx_tools_frontend:
stop_grace_period: 30s
# cap_add:
# - "NET_RAW"
Expand Down
13 changes: 13 additions & 0 deletions docker-compose_v3_alpine_mysql_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
13 changes: 13 additions & 0 deletions docker-compose_v3_alpine_mysql_local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
14 changes: 14 additions & 0 deletions docker-compose_v3_alpine_pgsql_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
14 changes: 14 additions & 0 deletions docker-compose_v3_alpine_pgsql_local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
13 changes: 13 additions & 0 deletions docker-compose_v3_centos_mysql_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
13 changes: 13 additions & 0 deletions docker-compose_v3_centos_mysql_local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
13 changes: 13 additions & 0 deletions docker-compose_v3_centos_pgsql_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
13 changes: 13 additions & 0 deletions docker-compose_v3_centos_pgsql_local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
13 changes: 13 additions & 0 deletions docker-compose_v3_ol_mysql_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
13 changes: 13 additions & 0 deletions docker-compose_v3_ol_mysql_local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
13 changes: 13 additions & 0 deletions docker-compose_v3_ol_pgsql_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
13 changes: 13 additions & 0 deletions docker-compose_v3_ol_pgsql_local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
Loading