From d0c5869b9d81c6cfaf2bc512c6a3784f593d7435 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 24 Jul 2026 18:44:10 +0900 Subject: [PATCH] Fixed Java Gateway variable. ZBX_JAVA_OPTS is currently supported for additional arguments --- Dockerfiles/build-mysql/alpine/Dockerfile | 6 +++++- Dockerfiles/build-mysql/centos/Dockerfile | 6 +++++- Dockerfiles/build-mysql/ol/Dockerfile | 6 +++++- Dockerfiles/build-mysql/rhel/Dockerfile | 6 +++++- Dockerfiles/build-mysql/ubuntu/Dockerfile | 6 +++++- Dockerfiles/build-pgsql/alpine/Dockerfile | 6 +++++- Dockerfiles/build-pgsql/centos/Dockerfile | 6 +++++- Dockerfiles/build-pgsql/ol/Dockerfile | 6 +++++- Dockerfiles/build-pgsql/rhel/Dockerfile | 6 +++++- Dockerfiles/build-pgsql/ubuntu/Dockerfile | 6 +++++- Dockerfiles/build-sqlite3/alpine/Dockerfile | 6 +++++- Dockerfiles/build-sqlite3/centos/Dockerfile | 6 +++++- Dockerfiles/build-sqlite3/ol/Dockerfile | 6 +++++- Dockerfiles/build-sqlite3/rhel/Dockerfile | 6 +++++- Dockerfiles/build-sqlite3/ubuntu/Dockerfile | 6 +++++- Dockerfiles/java-gateway/README.md | 4 ++-- Dockerfiles/java-gateway/alpine/Dockerfile | 3 +-- Dockerfiles/java-gateway/centos/Dockerfile | 3 +-- Dockerfiles/java-gateway/ol/Dockerfile | 3 +-- Dockerfiles/java-gateway/rhel/Dockerfile | 3 +-- Dockerfiles/java-gateway/rhel/README.html | 4 ++-- Dockerfiles/java-gateway/ubuntu/Dockerfile | 3 +-- env_vars/.env_java | 2 +- .../java-gateway/zabbix_java_gateway_logback.xml | 11 +++++++++++ templates/entrypoints/java-gateway.sh | 13 ++----------- 25 files changed, 98 insertions(+), 41 deletions(-) create mode 100644 templates/config/java-gateway/zabbix_java_gateway_logback.xml diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index 021ae1ca..6ea07cc5 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -51,6 +51,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ @@ -147,7 +148,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index ac145000..6fc6401d 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -51,6 +51,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ @@ -147,7 +148,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile index e9bf01a2..bf632f05 100644 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ b/Dockerfiles/build-mysql/ol/Dockerfile @@ -51,6 +51,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ @@ -147,7 +148,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index 74eed2d6..da2450ec 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -62,6 +62,7 @@ RUN --mount=from=sources,target=/tmp/src,z \ ${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ @@ -157,7 +158,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index 423060ef..4bbcf804 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -51,6 +51,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ @@ -147,7 +148,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index 5900286c..7f657e01 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -53,6 +53,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ @@ -152,7 +153,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index d2f335b3..bb49f36b 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -53,6 +53,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ @@ -152,7 +153,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile index cdfb729e..d3557e5f 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -53,6 +53,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ @@ -152,7 +153,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ diff --git a/Dockerfiles/build-pgsql/rhel/Dockerfile b/Dockerfiles/build-pgsql/rhel/Dockerfile index 9ee40ea4..eba763e0 100644 --- a/Dockerfiles/build-pgsql/rhel/Dockerfile +++ b/Dockerfiles/build-pgsql/rhel/Dockerfile @@ -64,6 +64,7 @@ RUN --mount=from=sources,target=/tmp/src,z \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ @@ -163,7 +164,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 944b46c2..01ebf7a3 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -53,6 +53,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ @@ -152,7 +153,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index 1ed58962..516f6a1f 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -48,6 +48,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/general/sbin \ ${ZBX_OUTPUT_DIR}/general/bin \ @@ -131,7 +132,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index 02c6f445..6bd4aa94 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -48,6 +48,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/general/sbin \ ${ZBX_OUTPUT_DIR}/general/bin \ @@ -131,7 +132,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile index 3e7cd3e9..02c68dfd 100644 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ b/Dockerfiles/build-sqlite3/ol/Dockerfile @@ -48,6 +48,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/general/sbin \ ${ZBX_OUTPUT_DIR}/general/bin \ @@ -131,7 +132,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile index b0a01f08..9deea675 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -59,6 +59,7 @@ RUN --mount=from=sources,target=/tmp/src,z \ ${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/general/sbin \ ${ZBX_OUTPUT_DIR}/general/bin \ @@ -142,7 +143,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile index 0f05fb0b..ab236c3f 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -48,6 +48,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/general/sbin \ ${ZBX_OUTPUT_DIR}/general/bin \ @@ -131,7 +132,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ - cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ + cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \ + cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \ + cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \ mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ diff --git a/Dockerfiles/java-gateway/README.md b/Dockerfiles/java-gateway/README.md index 6c5a9865..8307792c 100644 --- a/Dockerfiles/java-gateway/README.md +++ b/Dockerfiles/java-gateway/README.md @@ -76,9 +76,9 @@ This variable is used to specify log level. By default, value is `info`. The var Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones. -### `ZABBIX_OPTIONS` +### `ZBX_JAVA_OPTS` -Additional arguments for Zabbix Java Gateway. Useful to enable additional libraries and features. +Additional Java Virtual Machine (JVM) options for Zabbix Java Gateway, for example `-Xms128m -Xmx1g`. ## Allowed volumes for the Zabbix Java Gateway container diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index d165defe..2ed8c1cb 100644 --- a/Dockerfiles/java-gateway/alpine/Dockerfile +++ b/Dockerfiles/java-gateway/alpine/Dockerfile @@ -32,6 +32,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov This variable is used to specify log level. By default, value is info. The variable allows next values: trace, debug, info, warn, error, all, off

ZBX_PROPERTIES_FILE

Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones.

-

ZABBIX_OPTIONS

-

Additional arguments for Zabbix Java Gateway. Useful to enable additional libraries and features.

+

ZBX_JAVA_OPTS

+

Additional Java Virtual Machine (JVM) options for Zabbix Java Gateway, for example -Xms128m -Xmx1g.

Allowed volumes for the Zabbix Java Gateway container

/usr/sbin/zabbix_java/ext_lib

The volume allows include additional JAR files to extend allowed protocols for Zabbix Java Gateway.

diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile index 0bba5594..1ce00afb 100644 --- a/Dockerfiles/java-gateway/ubuntu/Dockerfile +++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile @@ -31,6 +31,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + diff --git a/templates/entrypoints/java-gateway.sh b/templates/entrypoints/java-gateway.sh index 936c1384..e07bb84c 100644 --- a/templates/entrypoints/java-gateway.sh +++ b/templates/entrypoints/java-gateway.sh @@ -22,22 +22,13 @@ build_classpath() { printf '%s\n' "$classpath" } -update_config() { - info "** Preparing Zabbix Java Gateway log configuration file" - [[ -f "$ZBX_GATEWAY_CONFIG" ]] || error "Missing configuration file: $ZBX_GATEWAY_CONFIG" - - : "${ZBX_DEBUGLEVEL:=info}" - - info "Updating ${ZBX_GATEWAY_CONFIG} 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated" - sed -i -e "/^.*/" "$ZBX_GATEWAY_CONFIG" -} - run_service() { info "** Preparing Zabbix Java Gateway" : "${ZBX_TIMEOUT:=3}" - update_config + [[ -f "$ZBX_GATEWAY_CONFIG" ]] || error "Missing configuration file: $ZBX_GATEWAY_CONFIG" + cd "$ZABBIX_JAVA_DIR" local classpath