Added Zabbix web service image

2025-01-08 23:00:10 +01:00 · 2021-04-27 17:10:15 -04:00 · 2021-04-27 17:10:15 -04:00 · 1bbe37282f
commit 1bbe37282f
parent d6e4e6d576
23 changed files with 426 additions and 0 deletions
--- a/.env_srv
+++ b/.env_srv
@ -58,3 +58,5 @@ ZBX_ENABLE_SNMP_TRAPS=true
 # ZBX_VAULTDBPATH=
 # ZBX_VAULTURL=https://127.0.0.1:8200
 # VAULT_TOKEN=
+# ZBX_STARTREPORTWRITERS=0
+# ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report
--- a/docker-compose_v3_alpine_mysql_latest.yaml
+++ b/docker-compose_v3_alpine_mysql_latest.yaml
@ -378,6 +378,37 @@ services:
   com.zabbix.component: "snmptraps"
   com.zabbix.os: "alpine"

+ zabbix-web-service:
+  image: zabbix/zabbix-web-service:alpine-trunk
+  profiles:
+   - full
+   - all
+  ports:
+   - "10053:10053"
+  cap_add:
+   - SYS_ADMIN
+  deploy:
+   resources:
+    limits:
+      cpus: '0.5'
+      memory: 512M
+    reservations:
+      cpus: '0.25'
+      memory: 256M
+  env_file:
+   - .env_web_service
+  networks:
+   zbx_net_backend:
+    aliases:
+     - zabbix-web-service
+     - zabbix-web-service-alpine
+  stop_grace_period: 5s
+  labels:
+   com.zabbix.description: "Zabbix web service"
+   com.zabbix.company: "Zabbix LLC"
+   com.zabbix.component: "web-service"
+   com.zabbix.os: "alpine"
+
 mysql-server:
  image: mysql:8.0
  command:
--- a/docker-compose_v3_alpine_mysql_local.yaml
+++ b/docker-compose_v3_alpine_mysql_local.yaml
@ -410,6 +410,41 @@ services:
   com.zabbix.component: "snmptraps"
   com.zabbix.os: "alpine"

+ zabbix-web-service:
+  build:
+   context: ./web-service/alpine
+   cache_from:
+    - alpine:3.13
+  image: zabbix-web-service:alpine-local
+  profiles:
+   - full
+   - all
+  ports:
+   - "10053:10053"
+  cap_add:
+   - SYS_ADMIN
+  deploy:
+   resources:
+    limits:
+      cpus: '0.5'
+      memory: 512M
+    reservations:
+      cpus: '0.25'
+      memory: 256M
+  env_file:
+   - .env_web_service
+  networks:
+   zbx_net_backend:
+    aliases:
+     - zabbix-web-service
+     - zabbix-web-service-alpine
+  stop_grace_period: 5s
+  labels:
+   com.zabbix.description: "Zabbix web service"
+   com.zabbix.company: "Zabbix LLC"
+   com.zabbix.component: "web-service"
+   com.zabbix.os: "alpine"
+
 mysql-server:
  image: mysql:8.0
  command:
--- a/docker-compose_v3_alpine_pgsql_latest.yaml
+++ b/docker-compose_v3_alpine_pgsql_latest.yaml
@ -374,6 +374,37 @@ services:
   com.zabbix.component: "snmptraps"
   com.zabbix.os: "alpine"

+ zabbix-web-service:
+  image: zabbix/zabbix-web-service:alpine-trunk
+  profiles:
+   - full
+   - all
+  ports:
+   - "10053:10053"
+  cap_add:
+   - SYS_ADMIN
+  deploy:
+   resources:
+    limits:
+      cpus: '0.5'
+      memory: 512M
+    reservations:
+      cpus: '0.25'
+      memory: 256M
+  env_file:
+   - .env_web_service
+  networks:
+   zbx_net_backend:
+    aliases:
+     - zabbix-web-service
+     - zabbix-web-service-alpine
+  stop_grace_period: 5s
+  labels:
+   com.zabbix.description: "Zabbix web service"
+   com.zabbix.company: "Zabbix LLC"
+   com.zabbix.component: "web-service"
+   com.zabbix.os: "alpine"
+
 mysql-server:
  image: mysql:8.0
  profiles:
--- a/docker-compose_v3_alpine_pgsql_local.yaml
+++ b/docker-compose_v3_alpine_pgsql_local.yaml
@ -406,6 +406,41 @@ services:
   com.zabbix.component: "snmptraps"
   com.zabbix.os: "alpine"

+ zabbix-web-service:
+  build:
+   context: ./web-service/alpine
+   cache_from:
+    - alpine:3.13
+  image: zabbix-web-service:alpine-local
+  profiles:
+   - full
+   - all
+  ports:
+   - "10053:10053"
+  cap_add:
+   - SYS_ADMIN
+  deploy:
+   resources:
+    limits:
+      cpus: '0.5'
+      memory: 512M
+    reservations:
+      cpus: '0.25'
+      memory: 256M
+  env_file:
+   - .env_web_service
+  networks:
+   zbx_net_backend:
+    aliases:
+     - zabbix-web-service
+     - zabbix-web-service-alpine
+  stop_grace_period: 5s
+  labels:
+   com.zabbix.description: "Zabbix web service"
+   com.zabbix.company: "Zabbix LLC"
+   com.zabbix.component: "web-service"
+   com.zabbix.os: "alpine"
+
 mysql-server:
  image: mysql:8.0
  profiles:
--- a/docker-compose_v3_centos_mysql_latest.yaml
+++ b/docker-compose_v3_centos_mysql_latest.yaml
@ -378,6 +378,37 @@ services:
   com.zabbix.component: "snmptraps"
   com.zabbix.os: "centos"

+ zabbix-web-service:
+  image: zabbix/zabbix-web-service:centos-trunk
+  profiles:
+   - full
+   - all
+  ports:
+   - "10053:10053"
+  cap_add:
+   - SYS_ADMIN
+  deploy:
+   resources:
+    limits:
+      cpus: '0.5'
+      memory: 512M
+    reservations:
+      cpus: '0.25'
+      memory: 256M
+  env_file:
+   - .env_web_service
+  networks:
+   zbx_net_backend:
+    aliases:
+     - zabbix-web-service
+     - zabbix-web-service-centos
+  stop_grace_period: 5s
+  labels:
+   com.zabbix.description: "Zabbix web service"
+   com.zabbix.company: "Zabbix LLC"
+   com.zabbix.component: "web-service"
+   com.zabbix.os: "centos"
+
 mysql-server:
  image: mysql:8.0
  command:
--- a/docker-compose_v3_centos_mysql_local.yaml
+++ b/docker-compose_v3_centos_mysql_local.yaml
@ -410,6 +410,41 @@ services:
   com.zabbix.component: "snmptraps"
   com.zabbix.os: "centos"

+ zabbix-web-service:
+  build:
+   context: ./web-service/centos
+   cache_from:
+    - centos:centos8
+  image: zabbix-web-service:centos-local
+  profiles:
+   - full
+   - all
+  ports:
+   - "10053:10053"
+  cap_add:
+   - SYS_ADMIN
+  deploy:
+   resources:
+    limits:
+      cpus: '0.5'
+      memory: 512M
+    reservations:
+      cpus: '0.25'
+      memory: 256M
+  env_file:
+   - .env_web_service
+  networks:
+   zbx_net_backend:
+    aliases:
+     - zabbix-web-service
+     - zabbix-web-service-centos
+  stop_grace_period: 5s
+  labels:
+   com.zabbix.description: "Zabbix web service"
+   com.zabbix.company: "Zabbix LLC"
+   com.zabbix.component: "web-service"
+   com.zabbix.os: "centos"
+
 mysql-server:
  image: mysql:8.0
  command:
--- a/docker-compose_v3_centos_pgsql_latest.yaml
+++ b/docker-compose_v3_centos_pgsql_latest.yaml
@ -374,6 +374,37 @@ services:
   com.zabbix.component: "snmptraps"
   com.zabbix.os: "centos"

+ zabbix-web-service:
+  image: zabbix/zabbix-web-service:centos-trunk
+  profiles:
+   - full
+   - all
+  ports:
+   - "10053:10053"
+  cap_add:
+   - SYS_ADMIN
+  deploy:
+   resources:
+    limits:
+      cpus: '0.5'
+      memory: 512M
+    reservations:
+      cpus: '0.25'
+      memory: 256M
+  env_file:
+   - .env_web_service
+  networks:
+   zbx_net_backend:
+    aliases:
+     - zabbix-web-service
+     - zabbix-web-service-centos
+  stop_grace_period: 5s
+  labels:
+   com.zabbix.description: "Zabbix web service"
+   com.zabbix.company: "Zabbix LLC"
+   com.zabbix.component: "web-service"
+   com.zabbix.os: "centos"
+
 mysql-server:
  image: mysql:8.0
  profiles:
--- a/docker-compose_v3_centos_pgsql_local.yaml
+++ b/docker-compose_v3_centos_pgsql_local.yaml
@ -406,6 +406,41 @@ services:
   com.zabbix.component: "snmptraps"
   com.zabbix.os: "centos"

+ zabbix-web-service:
+  build:
+   context: ./web-service/centos
+   cache_from:
+    - centos:centos8
+  image: zabbix-web-service:centos-local
+  profiles:
+   - full
+   - all
+  ports:
+   - "10053:10053"
+  cap_add:
+   - SYS_ADMIN
+  deploy:
+   resources:
+    limits:
+      cpus: '0.5'
+      memory: 512M
+    reservations:
+      cpus: '0.25'
+      memory: 256M
+  env_file:
+   - .env_web_service
+  networks:
+   zbx_net_backend:
+    aliases:
+     - zabbix-web-service
+     - zabbix-web-service-centos
+  stop_grace_period: 5s
+  labels:
+   com.zabbix.description: "Zabbix web service"
+   com.zabbix.company: "Zabbix LLC"
+   com.zabbix.component: "web-service"
+   com.zabbix.os: "centos"
+
 mysql-server:
  image: mysql:8.0
  profiles:
--- a/docker-compose_v3_ubuntu_mysql_latest.yaml
+++ b/docker-compose_v3_ubuntu_mysql_latest.yaml
@ -370,6 +370,37 @@ services:
   com.zabbix.component: "snmptraps"
   com.zabbix.os: "ubuntu"

+ zabbix-web-service:
+  image: zabbix/zabbix-web-service:ubuntu-trunk
+  profiles:
+   - full
+   - all
+  ports:
+   - "10053:10053"
+  cap_add:
+   - SYS_ADMIN
+  deploy:
+   resources:
+    limits:
+      cpus: '0.5'
+      memory: 512M
+    reservations:
+      cpus: '0.25'
+      memory: 256M
+  env_file:
+   - .env_web_service
+  networks:
+   zbx_net_backend:
+    aliases:
+     - zabbix-web-service
+     - zabbix-web-service-ubuntu
+  stop_grace_period: 5s
+  labels:
+   com.zabbix.description: "Zabbix web service"
+   com.zabbix.company: "Zabbix LLC"
+   com.zabbix.component: "web-service"
+   com.zabbix.os: "ubuntu"
+
 mysql-server:
  image: mysql:8.0
  command:
--- a/docker-compose_v3_ubuntu_mysql_local.yaml
+++ b/docker-compose_v3_ubuntu_mysql_local.yaml
@ -404,6 +404,41 @@ services:
   com.zabbix.component: "snmptraps"
   com.zabbix.os: "ubuntu"

+ zabbix-web-service:
+  build:
+   context: ./web-service/ubuntu
+   cache_from:
+    - ubuntu:focal
+  image: zabbix-web-service:ubuntu-local
+  profiles:
+   - full
+   - all
+  ports:
+   - "10053:10053"
+  cap_add:
+   - SYS_ADMIN
+  deploy:
+   resources:
+    limits:
+      cpus: '0.5'
+      memory: 512M
+    reservations:
+      cpus: '0.25'
+      memory: 256M
+  env_file:
+   - .env_web_service
+  networks:
+   zbx_net_backend:
+    aliases:
+     - zabbix-web-service
+     - zabbix-web-service-ubuntu
+  stop_grace_period: 5s
+  labels:
+   com.zabbix.description: "Zabbix web service"
+   com.zabbix.company: "Zabbix LLC"
+   com.zabbix.component: "web-service"
+   com.zabbix.os: "ubuntu"
+
 mysql-server:
  image: mysql:8.0
  command:
--- a/docker-compose_v3_ubuntu_pgsql_latest.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml
@ -368,6 +368,37 @@ services:
   com.zabbix.component: "snmptraps"
   com.zabbix.os: "ubuntu"

+ zabbix-web-service:
+  image: zabbix/zabbix-web-service:ubuntu-trunk
+  profiles:
+   - full
+   - all
+  ports:
+   - "10053:10053"
+  cap_add:
+   - SYS_ADMIN
+  deploy:
+   resources:
+    limits:
+      cpus: '0.5'
+      memory: 512M
+    reservations:
+      cpus: '0.25'
+      memory: 256M
+  env_file:
+   - .env_web_service
+  networks:
+   zbx_net_backend:
+    aliases:
+     - zabbix-web-service
+     - zabbix-web-service-ubuntu
+  stop_grace_period: 5s
+  labels:
+   com.zabbix.description: "Zabbix web service"
+   com.zabbix.company: "Zabbix LLC"
+   com.zabbix.component: "web-service"
+   com.zabbix.os: "ubuntu"
+
 mysql-server:
  image: mysql:8.0
  profiles:
--- a/docker-compose_v3_ubuntu_pgsql_local.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_local.yaml
@ -400,6 +400,41 @@ services:
   com.zabbix.component: "snmptraps"
   com.zabbix.os: "ubuntu"

+ zabbix-web-service:
+  build:
+   context: ./web-service/ubuntu
+   cache_from:
+    - ubuntu:focal
+  image: zabbix-web-service:ubuntu-local
+  profiles:
+   - full
+   - all
+  ports:
+   - "10053:10053"
+  cap_add:
+   - SYS_ADMIN
+  deploy:
+   resources:
+    limits:
+      cpus: '0.5'
+      memory: 512M
+    reservations:
+      cpus: '0.25'
+      memory: 256M
+  env_file:
+   - .env_web_service
+  networks:
+   zbx_net_backend:
+    aliases:
+     - zabbix-web-service
+     - zabbix-web-service-ubuntu
+  stop_grace_period: 5s
+  labels:
+   com.zabbix.description: "Zabbix web service"
+   com.zabbix.company: "Zabbix LLC"
+   com.zabbix.component: "web-service"
+   com.zabbix.os: "ubuntu"
+
 mysql-server:
  image: mysql:8.0
  profiles:
--- a/proxy-mysql/centos/Dockerfile
+++ b/proxy-mysql/centos/Dockerfile
@ -51,6 +51,7 @@ RUN set -eux && \
            libevent \
            libssh \
            fping \
+            file-libs \
            libxml2 \
            mysql \
            mysql-libs \
--- a/proxy-sqlite3/centos/Dockerfile
+++ b/proxy-sqlite3/centos/Dockerfile
@ -50,6 +50,7 @@ RUN set -eux && \
            libevent \
            libssh \
            fping \
+            file-libs \
            libxml2 \
            net-snmp-libs \
            OpenIPMI-libs \
--- a/server-mysql/alpine/docker-entrypoint.sh
+++ b/server-mysql/alpine/docker-entrypoint.sh
@ -339,6 +339,10 @@ update_zbx_config() {
        update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
    fi

+    update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
+    : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
+    update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"
+
    update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
    update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
    update_config_var $ZBX_CONFIG "HistoryStorageDateIndex" "${ZBX_HISTORYSTORAGEDATEINDEX}"
--- a/server-mysql/centos/Dockerfile
+++ b/server-mysql/centos/Dockerfile
@ -65,6 +65,7 @@ RUN set -eux && \
            openssl-libs \
            pcre \
            zlib \
+            file-libs \
            unixODBC && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
--- a/server-mysql/centos/docker-entrypoint.sh
+++ b/server-mysql/centos/docker-entrypoint.sh
@ -336,6 +336,10 @@ update_zbx_config() {
        update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
    fi

+    update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
+    : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
+    update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"
+
    update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
    update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
    update_config_var $ZBX_CONFIG "HistoryStorageDateIndex" "${ZBX_HISTORYSTORAGEDATEINDEX}"
--- a/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/server-mysql/ubuntu/docker-entrypoint.sh
@ -336,6 +336,10 @@ update_zbx_config() {
        update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
    fi

+    update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
+    : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
+    update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"
+
    update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
    update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
    update_config_var $ZBX_CONFIG "HistoryStorageDateIndex" "${ZBX_HISTORYSTORAGEDATEINDEX}"
--- a/server-pgsql/alpine/docker-entrypoint.sh
+++ b/server-pgsql/alpine/docker-entrypoint.sh
@ -372,6 +372,10 @@ update_zbx_config() {
        update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
    fi

+    update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
+    : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
+    update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"
+
    update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
    update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
    update_config_var $ZBX_CONFIG "HistoryStorageDateIndex" "${ZBX_HISTORYSTORAGEDATEINDEX}"
--- a/server-pgsql/centos/Dockerfile
+++ b/server-pgsql/centos/Dockerfile
@ -49,6 +49,7 @@ RUN set -eux && \
    dnf -y install epel-release && \
    dnf -y install --setopt=tsflags=nodocs --setopt=install_weak_deps=False --best \
            fping \
+            file-libs \
            iputils \
            tzdata \
            traceroute \
--- a/server-pgsql/centos/docker-entrypoint.sh
+++ b/server-pgsql/centos/docker-entrypoint.sh
@ -372,6 +372,10 @@ update_zbx_config() {
        update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
    fi

+    update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
+    : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
+    update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"
+
    update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
    update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
    update_config_var $ZBX_CONFIG "HistoryStorageDateIndex" "${ZBX_HISTORYSTORAGEDATEINDEX}"
--- a/server-pgsql/ubuntu/docker-entrypoint.sh
+++ b/server-pgsql/ubuntu/docker-entrypoint.sh
@ -372,6 +372,10 @@ update_zbx_config() {
        update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
    fi

+    update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
+    : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
+    update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"
+
    update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
    update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
    update_config_var $ZBX_CONFIG "HistoryStorageDateIndex" "${ZBX_HISTORYSTORAGEDATEINDEX}"