6.0

2022-11-23 14:59:43 +09:00 · 2022-11-23 14:59:43 +09:00 · d13ec949f3
parent a1be22c3ec
commit d13ec949f3
5 changed files with 72 additions and 9 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM zabbix/zabbix-web-apache-mysql:alpine-4.0-latest
+FROM zabbix/zabbix-web-apache-mysql:alpine-6.0-latest
 USER root
 ADD ca.crt /usr/local/share/ca-certificates
 RUN update-ca-certificates
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,7 +1,7 @@
 version: '3.5'
 services:
 zabbix-server:
-  image: zabbix/zabbix-server-mysql:alpine-4.0-latest
+  image: zabbix/zabbix-server-mysql:alpine-6.0-latest
  container_name: zabbix-server
  restart: "unless-stopped"
  ports:
@ -39,6 +39,9 @@ services:
   - MYSQL_PASSWORD
   - MYSQL_ROOT_USER
   - MYSQL_ROOT_PASSWORD
+#   - client-key.pem
+#   - client-cert.pem
+#   - root-ca.pem
  depends_on:
   - zabbix-mysql
  networks:
@ -65,11 +68,11 @@ services:
   com.zabbix.os: "alpine"

 zabbix-web-apache-mysql:
-  image: zabbix/zabbix-web-apache-mysql:alpine-4.0-latest
+  image: zabbix/zabbix-web-apache-mysql:alpine-6.0-latest
 #build:
 # context: ./
 # dockerfile: Dockerfile-apache
- #image: custom/zabbix-web-apache-mysql-4
+ #image: custom/zabbix-web-apache-mysql-6
  container_name: zabbix-apache
  restart: "unless-stopped"
  ports:
@ -79,6 +82,7 @@ services:
   - /etc/localtime:/etc/localtime:ro
   - /etc/timezone:/etc/timezone:ro
   - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
+   - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro
   - ./fonts/usr/share/fonts/truetype/mplus/mplus-2p-regular.ttf:/usr/share/zabbix/assets/fonts/DejaVuSans.ttf:ro
  deploy:
   resources:
@ -94,6 +98,9 @@ services:
  secrets:
   - MYSQL_USER
   - MYSQL_PASSWORD
+#   - client-key.pem
+#   - client-cert.pem
+#   - root-ca.pem
  depends_on:
   - zabbix-mysql
   - zabbix-server
@ -122,7 +129,7 @@ services:
   com.zabbix.os: "alpine"

 zabbix-agent:
-  image: zabbix/zabbix-agent:alpine-4.0-latest
+  image: zabbix/zabbix-agent:alpine-6.0-latest
  container_name: zabbix-agent
  restart: "unless-stopped"
  ports:
@ -166,10 +173,15 @@ services:
  restart: "unless-stopped"
  command:
   - mysqld
-   - --character-set-server=utf8
-   - --collation-server=utf8_bin
+   - --character-set-server=utf8mb4
+   - --collation-server=utf8mb4_bin
+   - --skip-character-set-client-handshake
   - --default-authentication-plugin=mysql_native_password
   - --innodb_strict_mode=OFF
+#   - --require-secure-transport
+#   - --ssl-ca=/run/secrets/root-ca.pem
+#   - --ssl-cert=/run/secrets/server-cert.pem
+#   - --ssl-key=/run/secrets/server-key.pem
  volumes:
   - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw
  env_file:
@ -178,6 +190,9 @@ services:
   - MYSQL_USER
   - MYSQL_PASSWORD
   - MYSQL_ROOT_PASSWORD
+#   - server-key.pem
+#   - server-cert.pem
+#   - root-ca.pem
  stop_grace_period: 1m
  networks:
   zbx_net_backend:
@ -219,3 +234,13 @@ secrets:
    file: ./env_vars/.MYSQL_ROOT_USER
  MYSQL_ROOT_PASSWORD:
    file: ./env_vars/.MYSQL_ROOT_PASSWORD
+#  client-key.pem:
+#    file: ./env_vars/.ZBX_DB_KEY_FILE
+#  client-cert.pem:
+#    file: ./env_vars/.ZBX_DB_CERT_FILE
+#  root-ca.pem:
+#    file: ./env_vars/.ZBX_DB_CA_FILE
+#  server-cert.pem:
+#    file: ./env_vars/.DB_CERT_FILE
+#  server-key.pem:
+#    file: ./env_vars/.DB_KEY_FILE
--- a/env_vars/.env_agent
+++ b/env_vars/.env_agent
@ -1,13 +1,16 @@
 # ZBX_SOURCEIP=
 # ZBX_DEBUGLEVEL=3
-# ZBX_ENABLEREMOTECOMMANDS=0
+# ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 # ZBX_LOGREMOTECOMMANDS=0
+# ZBX_HOSTINTERFACE= # Available since 4.4.0
+# ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
 # ZBX_SERVER_HOST=zabbix-server
 # ZBX_PASSIVE_ALLOW=true
 # ZBX_PASSIVESERVERS=
 # ZBX_ACTIVE_ALLOW=true
 # ZBX_ACTIVESERVERS=
 # ZBX_LISTENIP=
+# ZBX_LISTENBACKLOG=
 # ZBX_STARTAGENTS=3
 # ZBX_HOSTNAME=
 # ZBX_HOSTNAMEITEM=system.hostname
@ -31,3 +34,5 @@
 # ZBX_TLSKEYFILE=
 # ZBX_TLSPSKIDENTITY=
 # ZBX_TLSPSKFILE=
+# ZBX_DENYKEY=system.run[*]
+# ZBX_ALLOWKEY=
--- a/env_vars/.env_srv
+++ b/env_vars/.env_srv
@ -1,7 +1,19 @@
 # ZBX_LISTENIP=
+# ZBX_LISTENBACKLOG=
 # ZBX_HISTORYSTORAGEURL=http://elasticsearch:9200/ # Available since 3.4.5
 # ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.5
-# ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
+# ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0
+# ZBX_DBTLSCONNECT=required # 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_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0
+# ZBX_HANODENAME= # Available since 6.0.0
+# ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0
+# ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0
+# ZBX_NODEADDRESS=localhost:10051 # Available since 6.0.0
 # ZBX_DEBUGLEVEL=3
 # ZBX_STARTPOLLERS=5
 # ZBX_IPMIPOLLERS=0
@ -11,9 +23,11 @@
 # ZBX_STARTPINGERS=1
 # ZBX_STARTDISCOVERERS=1
 # ZBX_STARTHTTPPOLLERS=1
+# ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0
 # ZBX_STARTTIMERS=1
 # ZBX_STARTESCALATORS=1
 # ZBX_STARTALERTERS=3 # Available since 3.4.0
+# ZBX_STARTLLDPROCESSORS=2
 ZBX_JAVAGATEWAY_ENABLE=true
 # ZBX_JAVAGATEWAY=zabbix-java-gateway
 # ZBX_JAVAGATEWAYPORT=10052
@ -27,13 +41,16 @@ ZBX_ENABLE_SNMP_TRAPS=true
 # ZBX_SOURCEIP=
 # ZBX_HOUSEKEEPINGFREQUENCY=1
 # ZBX_MAXHOUSEKEEPERDELETE=5000
+# ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60
 # ZBX_SENDERFREQUENCY=30
 # ZBX_CACHESIZE=8M
 # ZBX_CACHEUPDATEFREQUENCY=60
 # ZBX_STARTDBSYNCERS=4
 # ZBX_HISTORYCACHESIZE=16M
 # ZBX_HISTORYINDEXCACHESIZE=4M
+# ZBX_HISTORYSTORAGEDATEINDEX=0
 # ZBX_TRENDCACHESIZE=4M
+# ZBX_TRENDFUNCTIONCACHESIZE=4M
 # ZBX_VALUECACHESIZE=8M
 # ZBX_TIMEOUT=4
 # ZBX_TRAPPERTIMEOUT=300
@ -50,3 +67,9 @@ ZBX_ENABLE_SNMP_TRAPS=true
 # ZBX_TLSCRLFILE=
 # ZBX_TLSCERTFILE=
 # ZBX_TLSKEYFILE=
+# ZBX_VAULTDBPATH=
+# ZBX_VAULTURL=https://127.0.0.1:8200
+# VAULT_TOKEN=
+# ZBX_STARTREPORTWRITERS=0
+# ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report
+# ZBX_SERVICEMANAGERSYNCFREQUENCY=60
--- a/env_vars/.env_web
+++ b/env_vars/.env_web
@ -1,8 +1,18 @@
 # ZBX_SERVER_HOST=zabbix-server
 # ZBX_SERVER_PORT=10051
 ZBX_SERVER_NAME=Composed installation
+# ZBX_DB_ENCRYPTION=true # Available since 5.0.0
+# ZBX_DB_KEY_FILE=/run/secrets/client-key.pem # Available since 5.0.0
+# ZBX_DB_CERT_FILE=/run/secrets/client-cert.pem # Available since 5.0.0
+# ZBX_DB_CA_FILE=/run/secrets/root-ca.pem # Available since 5.0.0
+# ZBX_DB_VERIFY_HOST=false # Available since 5.0.0
+# ZBX_DB_CIPHER_LIST= # Available since 5.0.0
+# ZBX_VAULTDBPATH=
+# ZBX_VAULTURL=https://127.0.0.1:8200
+# VAULT_TOKEN=
 # ZBX_HISTORYSTORAGEURL=http://elasticsearch:9200/ # Available since 3.4.5
 # ZBX_HISTORYSTORAGETYPES=['uint', 'dbl', 'str', 'text', 'log'] # Available since 3.4.5
+# ZBX_SSO_SETTINGS=[] # Available since 5.0.0
 # ENABLE_WEB_ACCESS_LOG=true
 # ZBX_MAXEXECUTIONTIME=600
 # ZBX_MEMORYLIMIT=128M