Merge branch 'master' into trunk

This commit is contained in:
Alexey Pustovalov 2020-06-28 21:45:15 +03:00
commit 265bd08f0e
12 changed files with 78 additions and 42 deletions

View File

@ -14,7 +14,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- mysql-server:mysql-server - mysql-server:mysql-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -80,7 +80,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -130,7 +130,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -361,7 +361,7 @@ services:
ports: ports:
- "162:1162/udp" - "162:1162/udp"
volumes: volumes:
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - snmptraps:/var/lib/zabbix/snmptraps
deploy: deploy:
resources: resources:
limits: limits:
@ -446,6 +446,9 @@ networks:
config: config:
- subnet: 172.16.239.0/24 - subnet: 172.16.239.0/24
volumes:
snmptraps:
secrets: secrets:
MYSQL_USER: MYSQL_USER:
file: ./.MYSQL_USER file: ./.MYSQL_USER

View File

@ -18,7 +18,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- mysql-server:mysql-server - mysql-server:mysql-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -88,7 +88,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -142,7 +142,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -393,7 +393,7 @@ services:
ports: ports:
- "162:1162/udp" - "162:1162/udp"
volumes: volumes:
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - snmptraps:/var/lib/zabbix/snmptraps:rw
deploy: deploy:
resources: resources:
limits: limits:
@ -478,6 +478,9 @@ networks:
config: config:
- subnet: 172.16.239.0/24 - subnet: 172.16.239.0/24
volumes:
snmptraps:
secrets: secrets:
MYSQL_USER: MYSQL_USER:
file: ./.MYSQL_USER file: ./.MYSQL_USER

View File

@ -79,7 +79,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -129,7 +129,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -357,7 +357,7 @@ services:
ports: ports:
- "162:1162/udp" - "162:1162/udp"
volumes: volumes:
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - snmptraps:/var/lib/zabbix/snmptraps:rw
deploy: deploy:
resources: resources:
limits: limits:
@ -461,6 +461,9 @@ networks:
config: config:
- subnet: 172.16.239.0/24 - subnet: 172.16.239.0/24
volumes:
snmptraps:
secrets: secrets:
MYSQL_USER: MYSQL_USER:
file: ./.MYSQL_USER file: ./.MYSQL_USER

View File

@ -87,7 +87,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -141,7 +141,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -389,7 +389,7 @@ services:
ports: ports:
- "162:1162/udp" - "162:1162/udp"
volumes: volumes:
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - snmptraps:/var/lib/zabbix/snmptraps:rw
deploy: deploy:
resources: resources:
limits: limits:
@ -493,6 +493,9 @@ networks:
config: config:
- subnet: 172.16.239.0/24 - subnet: 172.16.239.0/24
volumes:
snmptraps:
secrets: secrets:
MYSQL_USER: MYSQL_USER:
file: ./.MYSQL_USER file: ./.MYSQL_USER

View File

@ -14,7 +14,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- mysql-server:mysql-server - mysql-server:mysql-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -80,7 +80,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -130,7 +130,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -361,7 +361,7 @@ services:
ports: ports:
- "162:1162/udp" - "162:1162/udp"
volumes: volumes:
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - snmptraps:/var/lib/zabbix/snmptraps:rw
deploy: deploy:
resources: resources:
limits: limits:
@ -446,6 +446,9 @@ networks:
config: config:
- subnet: 172.16.239.0/24 - subnet: 172.16.239.0/24
volumes:
snmptraps:
secrets: secrets:
MYSQL_USER: MYSQL_USER:
file: ./.MYSQL_USER file: ./.MYSQL_USER

View File

@ -18,7 +18,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- mysql-server:mysql-server - mysql-server:mysql-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -88,7 +88,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -142,7 +142,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -393,7 +393,7 @@ services:
ports: ports:
- "162:1162/udp" - "162:1162/udp"
volumes: volumes:
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - snmptraps:/var/lib/zabbix/snmptraps:rw
deploy: deploy:
resources: resources:
limits: limits:
@ -478,6 +478,9 @@ networks:
config: config:
- subnet: 172.16.239.0/24 - subnet: 172.16.239.0/24
volumes:
snmptraps:
secrets: secrets:
MYSQL_USER: MYSQL_USER:
file: ./.MYSQL_USER file: ./.MYSQL_USER

View File

@ -79,7 +79,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -129,7 +129,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -357,7 +357,7 @@ services:
ports: ports:
- "162:1162/udp" - "162:1162/udp"
volumes: volumes:
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - snmptraps:/var/lib/zabbix/snmptraps:rw
deploy: deploy:
resources: resources:
limits: limits:
@ -461,6 +461,9 @@ networks:
config: config:
- subnet: 172.16.239.0/24 - subnet: 172.16.239.0/24
volumes:
snmptraps:
secrets: secrets:
MYSQL_USER: MYSQL_USER:
file: ./.MYSQL_USER file: ./.MYSQL_USER

View File

@ -87,7 +87,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -141,7 +141,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -389,7 +389,7 @@ services:
ports: ports:
- "162:1162/udp" - "162:1162/udp"
volumes: volumes:
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - snmptraps:/var/lib/zabbix/snmptraps:rw
deploy: deploy:
resources: resources:
limits: limits:
@ -493,6 +493,9 @@ networks:
config: config:
- subnet: 172.16.239.0/24 - subnet: 172.16.239.0/24
volumes:
snmptraps:
secrets: secrets:
MYSQL_USER: MYSQL_USER:
file: ./.MYSQL_USER file: ./.MYSQL_USER

View File

@ -14,7 +14,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- mysql-server:mysql-server - mysql-server:mysql-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -80,7 +80,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -130,7 +130,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -361,7 +361,7 @@ services:
ports: ports:
- "162:1162/udp" - "162:1162/udp"
volumes: volumes:
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - snmptraps:/var/lib/zabbix/snmptraps:rw
deploy: deploy:
resources: resources:
limits: limits:
@ -446,6 +446,9 @@ networks:
config: config:
- subnet: 172.16.239.0/24 - subnet: 172.16.239.0/24
volumes:
snmptraps:
secrets: secrets:
MYSQL_USER: MYSQL_USER:
file: ./.MYSQL_USER file: ./.MYSQL_USER

View File

@ -18,7 +18,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- mysql-server:mysql-server - mysql-server:mysql-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -88,7 +88,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -142,7 +142,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -393,7 +393,7 @@ services:
ports: ports:
- "162:1162/udp" - "162:1162/udp"
volumes: volumes:
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - snmptraps:/var/lib/zabbix/snmptraps:rw
deploy: deploy:
resources: resources:
limits: limits:
@ -478,6 +478,9 @@ networks:
config: config:
- subnet: 172.16.239.0/24 - subnet: 172.16.239.0/24
volumes:
snmptraps:
secrets: secrets:
MYSQL_USER: MYSQL_USER:
file: ./.MYSQL_USER file: ./.MYSQL_USER

View File

@ -77,7 +77,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -126,7 +126,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -351,7 +351,7 @@ services:
ports: ports:
- "162:1162/udp" - "162:1162/udp"
volumes: volumes:
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - snmptraps:/var/lib/zabbix/snmptraps:rw
deploy: deploy:
resources: resources:
limits: limits:
@ -455,6 +455,9 @@ networks:
config: config:
- subnet: 172.16.239.0/24 - subnet: 172.16.239.0/24
volumes:
snmptraps:
secrets: secrets:
MYSQL_USER: MYSQL_USER:
file: ./.MYSQL_USER file: ./.MYSQL_USER

View File

@ -85,7 +85,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -138,7 +138,7 @@ services:
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc: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 - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
- ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro - snmptraps:/var/lib/zabbix/snmptraps:rw
links: links:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
- zabbix-java-gateway:zabbix-java-gateway - zabbix-java-gateway:zabbix-java-gateway
@ -383,7 +383,7 @@ services:
ports: ports:
- "162:1162/udp" - "162:1162/udp"
volumes: volumes:
- ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - snmptraps:/var/lib/zabbix/snmptraps:rw
deploy: deploy:
resources: resources:
limits: limits:
@ -487,6 +487,9 @@ networks:
config: config:
- subnet: 172.16.239.0/24 - subnet: 172.16.239.0/24
volumes:
snmptraps:
secrets: secrets:
MYSQL_USER: MYSQL_USER:
file: ./.MYSQL_USER file: ./.MYSQL_USER