Snarp/zabbix
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Merge changes with Zabbix trunk

Browse source
This commit is contained in:
Alexey Pustovalov 2026-07-11 01:48:26 +09:00
parent bedfac9654
commit 68e583ec61
11 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfiles/agent/rhel/README.html
View file

@ -115,7 +115,7 @@
<h2 id="issues">Issues</h2>
<p>If you have any problems with or questions about this image, please contact us through a <a href="https://github.com/zabbix/zabbix-docker/issues">GitHub issue</a>.</p>
<h3 id="known-issues">Known issues</h3>
<p>Currently it is not allowed to specify <code>ZBX_ALIAS</code> environment variable. Please use <code>/etc/zabbix/zabbix_agent.d</code> volume with additional configuration files with <code>Alias</code> options.</p>
<p>Currently it is not allowed to specify <code>ZBX_ALIAS</code> environment variable. Please use <code>/etc/zabbix/zabbix_agentd.d</code> volume with additional configuration files with <code>Alias</code> options.</p>
<h2 id="contributing">Contributing</h2>
<p>You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.</p>
<p>Before you start to code, we recommend discussing your plans through a <a href="https://github.com/zabbix/zabbix-docker/issues">GitHub issue</a>, especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.</p>

2
Dockerfiles/agent2/rhel/README.html
View file

@ -107,7 +107,7 @@
<h2 id="issues">Issues</h2>
<p>If you have any problems with or questions about this image, please contact us through a <a href="https://github.com/zabbix/zabbix-docker/issues">GitHub issue</a>.</p>
<h3 id="known-issues">Known issues</h3>
<p>Currently it is not allowed to specify <code>ZBX_ALIAS</code> environment variable. Please use <code>/etc/zabbix/zabbix_agent.d</code> volume with additional configuration files with <code>Alias</code> options.</p>
<p>Currently it is not allowed to specify <code>ZBX_ALIAS</code> environment variable. Please use <code>/etc/zabbix/zabbix_agentd.d</code> volume with additional configuration files with <code>Alias</code> options.</p>
<h2 id="contributing">Contributing</h2>
<p>You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.</p>
<p>Before you start to code, we recommend discussing your plans through a <a href="https://github.com/zabbix/zabbix-docker/issues">GitHub issue</a>, especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.</p>

2
Dockerfiles/build-base/rhel/Dockerfile
View file

@ -16,7 +16,7 @@ ENV TERM=xterm \
LABEL description="Prepared environment to build Zabbix components" \
maintainer="alexey.pustovalov@zabbix.com" \
name="zabbix/zabbix-build-base-trunk" \
name="zabbix/zabbix-build-base-74" \
release="${RELEASE}" \
summary="Zabbix build base" \
url="https://www.zabbix.com/" \

1
Dockerfiles/java-gateway/alpine/Dockerfile
View file

@ -59,7 +59,6 @@ RUN set -eux && \
--home ${ZABBIX_USER_HOME_DIR} \
zabbix && \
mkdir -p ${ZABBIX_CONF_DIR}/ \
/usr/bin/entrypoint_lib/ \
/usr/sbin/zabbix_java/ext_lib/ && \
rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \
mv /usr/sbin/zabbix_java/lib/logback-console.xml ${ZABBIX_CONF_DIR}/zabbix_java_gateway_logback.xml && \

6
Dockerfiles/proxy-sqlite3/rhel/Dockerfile
View file

@ -42,12 +42,12 @@ LABEL description="Zabbix proxy with SQLite3 database support" \
io.k8s.description="Zabbix proxy with SQLite3 database support" \
io.k8s.display-name="Zabbix proxy (SQLite3)" \
io.openshift.expose-services="10051:10051" \
io.openshift.tags="zabbix,zabbix-proxy,sqlite" \
io.openshift.tags="zabbix,zabbix-proxy,sqlite3" \
org.label-schema.build-date="${BUILD_DATE}" \
org.label-schema.description="Zabbix proxy with SQLite3 database support" \
org.label-schema.docker.cmd="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite3-74:${ZBX_VERSION}" \
org.label-schema.docker.cmd="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-74:${ZBX_VERSION}" \
org.label-schema.license="AGPL v3.0" \
org.label-schema.name="zabbix-proxy-sqlite-rhel" \
org.label-schema.name="zabbix-proxy-sqlite3-rhel" \
org.label-schema.schema-version="1.0" \
org.label-schema.url="https://zabbix.com/" \
org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

1
Dockerfiles/server-mysql/README.md
View file

@ -179,7 +179,6 @@ ZBX_SMSDEVICES=
ZBX_HOUSEKEEPINGFREQUENCY=1
ZBX_MAXHOUSEKEEPERDELETE=5000
ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0
ZBX_SENDERFREQUENCY=30 # Deprecated since 3.4.0
ZBX_CACHESIZE=8M
ZBX_CACHEUPDATEFREQUENCY=10
ZBX_STARTDBSYNCERS=4

1
Dockerfiles/server-mysql/rhel/README.html
View file

@ -125,7 +125,6 @@ podman run --name some-zabbix-server-mysql <span class="hljs-_">-e</span> DB_SER
<span class="hljs-attr">ZBX_HOUSEKEEPINGFREQUENCY</span>=<span class="hljs-number">1</span>
<span class="hljs-attr">ZBX_MAXHOUSEKEEPERDELETE</span>=<span class="hljs-number">5000</span>
<span class="hljs-attr">ZBX_PROBLEMHOUSEKEEPINGFREQUENCY</span>=<span class="hljs-number">60</span> # Available since <span class="hljs-number">6.0</span>.<span class="hljs-number">0</span>
<span class="hljs-attr">ZBX_SENDERFREQUENCY</span>=<span class="hljs-number">30</span> # Depcrecated since <span class="hljs-number">3.4</span>.<span class="hljs-number">0</span>
<span class="hljs-attr">ZBX_CACHESIZE</span>=<span class="hljs-number">8</span>M
<span class="hljs-attr">ZBX_CACHEUPDATEFREQUENCY</span>=<span class="hljs-number">10</span>
<span class="hljs-attr">ZBX_STARTDBSYNCERS</span>=<span class="hljs-number">4</span>

1
Dockerfiles/server-pgsql/README.md
View file

@ -180,7 +180,6 @@ ZBX_SMSDEVICES=
ZBX_HOUSEKEEPINGFREQUENCY=1
ZBX_MAXHOUSEKEEPERDELETE=5000
ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0
ZBX_SENDERFREQUENCY=30 # Deprecated since 3.4.0
ZBX_CACHESIZE=8M
ZBX_CACHEUPDATEFREQUENCY=10
ZBX_STARTDBSYNCERS=4

1
Dockerfiles/server-pgsql/rhel/README.html
View file

@ -125,7 +125,6 @@ podman run --name some-zabbix-server-pgsql <span class="hljs-_">-e</span> DB_SER
<span class="hljs-attr">ZBX_HOUSEKEEPINGFREQUENCY</span>=<span class="hljs-number">1</span>
<span class="hljs-attr">ZBX_MAXHOUSEKEEPERDELETE</span>=<span class="hljs-number">5000</span>
<span class="hljs-attr">ZBX_PROBLEMHOUSEKEEPINGFREQUENCY</span>=<span class="hljs-number">60</span> # Available since <span class="hljs-number">6.0</span>.<span class="hljs-number">0</span>
<span class="hljs-attr">ZBX_SENDERFREQUENCY</span>=<span class="hljs-number">30</span> # Depcrecated since <span class="hljs-number">3.4</span>.<span class="hljs-number">0</span>
<span class="hljs-attr">ZBX_CACHESIZE</span>=<span class="hljs-number">8</span>M
<span class="hljs-attr">ZBX_CACHEUPDATEFREQUENCY</span>=<span class="hljs-number">10</span>
<span class="hljs-attr">ZBX_STARTDBSYNCERS</span>=<span class="hljs-number">4</span>

2
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf
View file

@ -43,7 +43,7 @@ location ~* \.(woff|woff2|ttf|otf)$ {
expires 30d;
}
location ~ ^/(app/|conf/|include/|local/|locale/|vendor/) {
location ~ /(app\/|conf[^\.]|include\/|local\/|locale\/|vendor\/) {
deny all;
return 404;
}

6
Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
View file

@ -43,7 +43,7 @@ LABEL description="Zabbix web-interface based on Nginx web server with PostgreSQ
maintainer="alexey.pustovalov@zabbix.com" \
name="zabbix/zabbix-web-pgsql-74" \
release="${RELEASE}" \
run="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74-74:${ZBX_VERSION}" \
run="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74:${ZBX_VERSION}" \
summary="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \
url="https://www.zabbix.com/" \
vendor="Zabbix SIA" \
@ -54,9 +54,9 @@ LABEL description="Zabbix web-interface based on Nginx web server with PostgreSQ
io.openshift.tags="zabbix,zabbix-web,pgsql,nginx" \
org.label-schema.build-date="${BUILD_DATE}" \
org.label-schema.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \
org.label-schema.docker.cmd="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74-74:${ZBX_VERSION}" \
org.label-schema.docker.cmd="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74:${ZBX_VERSION}" \
org.label-schema.license="AGPL v3.0" \
org.label-schema.name="zabbix-web-pgsql-74-rhel" \
org.label-schema.name="zabbix-web-pgsql-rhel" \
org.label-schema.schema-version="1.0" \
org.label-schema.url="https://zabbix.com/" \
org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \