extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-03-11 12:58:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed snmptrapd persistent directory

Browse Source
This commit is contained in:
Alexey Pustovalov 2025-01-15 13:02:02 +09:00
parent 13b3bd8f05
commit 431b8007b6
6 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfiles/snmptraps/alpine/Dockerfile
View File

@ -13,6 +13,8 @@ ENV TERM=xterm \
ZBX_SNMP_TRAP_USE_DNS=false \ ZBX_SNMP_TRAP_USE_DNS=false \
ZABBIX_USER_HOME_DIR="/var/lib/zabbix" ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
ENV SNMP_PERSISTENT_DIR="${ZABBIX_USER_HOME_DIR}/snmptrapd_config"
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.description="Zabbix SNMP traps receiver" \ org.opencontainers.image.description="Zabbix SNMP traps receiver" \
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -48,7 +50,7 @@ RUN set -eux && \
mkdir -p ${ZABBIX_USER_HOME_DIR} && \ mkdir -p ${ZABBIX_USER_HOME_DIR} && \
mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \
mkdir -p ${ZABBIX_USER_HOME_DIR}/mibs && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/mibs && \
touch /var/lib/net-snmp/snmptrapd.conf && \ mkdir -p ${SNMP_PERSISTENT_DIR} && \
chown --quiet -R zabbix:root /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \ chown --quiet -R zabbix:root /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \ chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/
@ -57,7 +59,7 @@ EXPOSE 1162/UDP
WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/ WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/
VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"]
COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"] COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"]
COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"] COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"]

6
Dockerfiles/snmptraps/centos/Dockerfile
View File

@ -13,6 +13,8 @@ ENV TERM=xterm \
ZBX_SNMP_TRAP_USE_DNS=false \ ZBX_SNMP_TRAP_USE_DNS=false \
ZABBIX_USER_HOME_DIR="/var/lib/zabbix" ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
ENV SNMP_PERSISTENT_DIR="${ZABBIX_USER_HOME_DIR}/snmptrapd_config"
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.description="Zabbix SNMP traps receiver" \ org.opencontainers.image.description="Zabbix SNMP traps receiver" \
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -54,7 +56,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
mkdir -p ${ZABBIX_USER_HOME_DIR} && \ mkdir -p ${ZABBIX_USER_HOME_DIR} && \
mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \
mkdir -p ${ZABBIX_USER_HOME_DIR}/mibs && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/mibs && \
touch /var/lib/net-snmp/snmptrapd.conf && \ mkdir -p ${SNMP_PERSISTENT_DIR} && \
chown --quiet -R zabbix:root /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \ chown --quiet -R zabbix:root /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \ chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/
@ -63,7 +65,7 @@ EXPOSE 1162/UDP
WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/ WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/
VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"]
COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"] COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"]
COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"] COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"]

6
Dockerfiles/snmptraps/ol/Dockerfile
View File

@ -13,6 +13,8 @@ ENV TERM=xterm \
ZBX_SNMP_TRAP_USE_DNS=false \ ZBX_SNMP_TRAP_USE_DNS=false \
ZABBIX_USER_HOME_DIR="/var/lib/zabbix" ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
ENV SNMP_PERSISTENT_DIR="${ZABBIX_USER_HOME_DIR}/snmptrapd_config"
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.description="Zabbix SNMP traps receiver" \ org.opencontainers.image.description="Zabbix SNMP traps receiver" \
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -53,7 +55,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
mkdir -p ${ZABBIX_USER_HOME_DIR} && \ mkdir -p ${ZABBIX_USER_HOME_DIR} && \
mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \
mkdir -p ${ZABBIX_USER_HOME_DIR}/mibs && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/mibs && \
touch /var/lib/net-snmp/snmptrapd.conf && \ mkdir -p ${SNMP_PERSISTENT_DIR} && \
chown --quiet -R zabbix:root /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \ chown --quiet -R zabbix:root /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \ chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/
@ -62,7 +64,7 @@ EXPOSE 1162/UDP
WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/ WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/
VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"]
COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"] COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"]
COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"] COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"]

6
Dockerfiles/snmptraps/rhel/Dockerfile
View File

@ -15,6 +15,8 @@ ENV TERM=xterm \
ZBX_SNMP_TRAP_USE_DNS=false \ ZBX_SNMP_TRAP_USE_DNS=false \
ZABBIX_USER_HOME_DIR="/var/lib/zabbix" ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
ENV SNMP_PERSISTENT_DIR="${ZABBIX_USER_HOME_DIR}/snmptrapd_config"
LABEL description="Zabbix SNMP traps receiver" \ LABEL description="Zabbix SNMP traps receiver" \
maintainer="alexey.pustovalov@zabbix.com" \ maintainer="alexey.pustovalov@zabbix.com" \
name="zabbix/zabbix-snmptraps-72" \ name="zabbix/zabbix-snmptraps-72" \
@ -93,7 +95,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
mkdir -p ${ZABBIX_USER_HOME_DIR} && \ mkdir -p ${ZABBIX_USER_HOME_DIR} && \
mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \
mkdir -p ${ZABBIX_USER_HOME_DIR}/mibs && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/mibs && \
touch /var/lib/net-snmp/snmptrapd.conf && \ mkdir -p ${SNMP_PERSISTENT_DIR} && \
chown --quiet -R zabbix:root /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \ chown --quiet -R zabbix:root /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \ chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/
@ -102,7 +104,7 @@ EXPOSE 1162/UDP
WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/ WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/
VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"]
COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"] COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"]
COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"] COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"]

5
Dockerfiles/snmptraps/ubuntu/Dockerfile
View File

@ -13,6 +13,8 @@ ENV TERM=xterm \
ZBX_SNMP_TRAP_USE_DNS=false \ ZBX_SNMP_TRAP_USE_DNS=false \
ZABBIX_USER_HOME_DIR="/var/lib/zabbix" ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
ENV SNMP_PERSISTENT_DIR="${ZABBIX_USER_HOME_DIR}/snmptrapd_config"
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.description="Zabbix SNMP traps receiver" \ org.opencontainers.image.description="Zabbix SNMP traps receiver" \
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -52,6 +54,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
mkdir -p ${ZABBIX_USER_HOME_DIR} && \ mkdir -p ${ZABBIX_USER_HOME_DIR} && \
mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \
mkdir -p ${ZABBIX_USER_HOME_DIR}/mibs && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/mibs && \
mkdir -p ${SNMP_PERSISTENT_DIR} && \
chown --quiet -R zabbix:root /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \ chown --quiet -R zabbix:root /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \ chgrp -R 0 /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ && \
chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/ chmod -R g=u /etc/snmp/ ${ZABBIX_USER_HOME_DIR}/ /var/tmp/ /var/run/
@ -60,7 +63,7 @@ EXPOSE 1162/UDP
WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/ WORKDIR ${ZABBIX_USER_HOME_DIR}/snmptraps/
VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps"] VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${SNMP_PERSISTENT_DIR}"]
COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"] COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"]
COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"] COPY ["conf/etc/snmp/snmptrapd.conf", "/etc/snmp/"]

1
compose_zabbix_components.yaml
View File

@ -636,6 +636,7 @@ services:
read_only: true read_only: true
volumes: volumes:
- snmptraps:/var/lib/zabbix/snmptraps:rwz - snmptraps:/var/lib/zabbix/snmptraps:rwz
- ${DATA_DIRECTORY}/var/lib/zabbix/snmptrapd_config:/var/lib/zabbix/snmptrapd_config:rw
tmpfs: /tmp tmpfs: /tmp
deploy: deploy:
resources: resources: