running

2021-10-20 19:55:01 +02:00 · 2021-10-20 19:55:01 +02:00 · 53ca00403d
commit 53ca00403d
parent 7adf09ac15
1 changed files with 112 additions and 108 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -19,7 +19,7 @@ services:
   - mysql-server:mysql-server
   - zabbix-java-gateway:zabbix-java-gateway
  ulimits:
-   nproc: 65535
+   nproc: 31495
   nofile:
    soft: 20000
    hard: 40000
@ -68,76 +68,80 @@ services:
   com.zabbix.dbtype: "mysql"
   com.zabbix.os: "alpine"
   
- zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:alpine-5.0-latest
-  ports:
-   - "10071:10051"
-  volumes:
-   - /etc/localtime:/etc/localtime:ro
-   - /etc/timezone:/etc/timezone:ro
-   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
-   - ./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
-   - ./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:
-    soft: 20000
-    hard: 40000
-  deploy:
-   resources:
-    limits:
-      cpus: '0.70'
-      memory: 512M
-    reservations:
-      cpus: '0.3'
-      memory: 256M
-  env_file:
-   - .env_db_mysql_proxy
-   - .env_prx
-   - .env_prx_mysql
-  depends_on:
-   - mysql-server
-   - zabbix-java-gateway
-   - zabbix-snmptraps
-  secrets:
-   - MYSQL_USER
-   - MYSQL_PASSWORD
-   - MYSQL_ROOT_PASSWORD
-#   - client-key.pem
-#   - client-cert.pem
-#   - root-ca.pem
-  networks:
-   zbx_net_backend:
-    aliases:
-     - zabbix-proxy-mysql
-     - zabbix-proxy-alpine-mysql
-     - zabbix-proxy-mysql-alpine
-   zbx_net_frontend:
-  stop_grace_period: 30s
-  labels:
-   com.zabbix.description: "Zabbix proxy with MySQL database support"
-   com.zabbix.company: "Zabbix LLC"
-   com.zabbix.component: "zabbix-proxy"
-   com.zabbix.dbtype: "mysql"
-   com.zabbix.os: "alpine"
+   
+ #zabbix-proxy-mysql:
+ # image: zabbix/zabbix-proxy-mysql:alpine-5.0-latest
+ # ports:
+ #  - "10071:10051"
+ # volumes:
+ #  - /etc/localtime:/etc/localtime:ro
+ #  - /etc/timezone:/etc/timezone:ro
+ #  - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
+ #  - ./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
+ #  - ./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: 31495
+ #  nofile:
+ #   soft: 20000
+ #   hard: 40000
+ # deploy:
+ #  resources:
+ #   limits:
+ #     cpus: '0.70'
+ #     memory: 512M
+ #   reservations:
+ #     cpus: '0.3'
+ #     memory: 256M
+ # env_file:
+ #  - .env_db_mysql_proxy
+ #  - .env_prx
+ #  - .env_prx_mysql
+ # depends_on:
+ #  - mysql-server
+ #  - zabbix-java-gateway
+ #  - zabbix-snmptraps
+ # secrets:
+ #  - MYSQL_USER
+ #  - MYSQL_PASSWORD
+ #  - MYSQL_ROOT_PASSWORD
+##   - client-key.pem
+##   - client-cert.pem
+##   - root-ca.pem
+ # networks:
+ #  zbx_net_backend:
+ #   aliases:
+ #    - zabbix-proxy-mysql
+ #    - zabbix-proxy-alpine-mysql
+ #    - zabbix-proxy-mysql-alpine
+ #  zbx_net_frontend:
+ # stop_grace_period: 30s
+ # security_opt:
+ #   - seccomp:unconfined
+  
+#  labels:
+#   com.zabbix.description: "Zabbix proxy with MySQL database support"
+#   com.zabbix.company: "Zabbix LLC"
+#   com.zabbix.component: "zabbix-proxy"
+#   com.zabbix.dbtype: "mysql"
+#   com.zabbix.os: "alpine"

 zabbix-web-apache-mysql:
  image: zabbix/zabbix-web-apache-mysql:alpine-5.0-latest
  environment:
-    - VIRTUAL_HOST=zab.airdog.site
-    - LETSENCRYPT_HOST=zab.airdog.site
+    - VIRTUAL_HOST=zab.franv.site
+    - LETSENCRYPT_HOST=zab.franv.site
    - LETSENCRYPT_EMAIL=ouch@thetrauma.org
    - VIRTUAL_PORT=8080
   
-#  ports:
-#   - "8080:8080"
-#   - "8443:8443"
+  ports:
+   - "8082:8080"
+   - "8443:8443"
  links:
   - mysql-server:mysql-server
   - zabbix-server:zabbix-server
@ -179,10 +183,10 @@ services:
     - zabbix-web-apache-alpine-mysql
     - zabbix-web-apache-mysql-alpine
   zbx_net_frontend:
-   franvproxy_test_proxy-tier:
+   acme-companion_proxy-tier:
  stop_grace_period: 10s
-  sysctls:
-   - net.core.somaxconn=65535
+#  sysctls:
+#   - /proc/zabbix1/net.core.somaxconn=65535
  labels:
   com.zabbix.description: "Zabbix frontend on Apache web-server with MySQL database support"
   com.zabbix.company: "Zabbix LLC"
@ -191,44 +195,44 @@ services:
   com.zabbix.dbtype: "mysql"
   com.zabbix.os: "alpine"

- zabbix-agent:
-  image: zabbix/zabbix-agent:alpine-5.0-latest
-  ports:
-   - "10050:10050"
-  volumes:
-   - /etc/localtime:/etc/localtime:ro
-   - /etc/timezone:/etc/timezone:ro
-   - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
-   - ./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:
-      cpus: '0.2'
-      memory: 128M
-    reservations:
-      cpus: '0.1'
-      memory: 64M
-   mode: global
-  env_file:
-   - .env_agent
-  privileged: true
-  pid: "host"
-  networks:
-   zbx_net_backend:
-    aliases:
-     - zabbix-agent
-     - zabbix-agent-passive
-     - zabbix-agent-alpine
-  stop_grace_period: 5s
-  labels:
-   com.zabbix.description: "Zabbix agent"
-   com.zabbix.company: "Zabbix LLC"
-   com.zabbix.component: "zabbix-agentd"
-   com.zabbix.os: "alpine"
+# zabbix-agent:
+#  image: zabbix/zabbix-agent:alpine-5.0-latest
+#  ports:
+#   - "10050:10050"
+#  volumes:
+#   - /etc/localtime:/etc/localtime:ro
+#   - /etc/timezone:/etc/timezone:ro
+#   - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
+#   - ./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:
+#      cpus: '0.2'
+#      memory: 128M
+#    reservations:
+#      cpus: '0.1'
+#      memory: 64M
+#   mode: global
+#  env_file:
+#   - .env_agent
+#  privileged: true
+#  pid: "host"
+#  networks:
+#   zbx_net_backend:
+#    aliases:
+#     - zabbix-agent
+#     - zabbix-agent-passive
+#     - zabbix-agent-alpine
+#  stop_grace_period: 5s
+#  labels:
+#   com.zabbix.description: "Zabbix agent"
+#   com.zabbix.company: "Zabbix LLC"
+#   com.zabbix.component: "zabbix-agentd"
+#   com.zabbix.os: "alpine"

 zabbix-java-gateway:
  image: zabbix/zabbix-java-gateway:alpine-5.0-latest
@ -307,7 +311,7 @@ services:
 #   - root-ca.pem
  stop_grace_period: 1m
  networks:
-   franvproxy_test_proxy-tier:
+#   franvproxy_test_proxy-tier:
   zbx_net_backend:
    aliases:
     - mysql-server
@ -330,7 +334,7 @@ services:
 #     - elasticsearch

 networks:
-  franvproxy_test_proxy-tier:
+  acme-companion_proxy-tier:
    external: true
  zbx_net_frontend:
    driver: bridge