diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index c1c56e9d2..ff2d1fdaf 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -10,6 +10,8 @@ ENV TERM=xterm \ ZBX_SNMP_TRAP_USE_DNS=false \ ZABBIX_USER_HOME_DIR="/var/lib/zabbix" +ENV SNMP_PERSISTENT_DIR="${ZABBIX_USER_HOME_DIR}/snmptrapd_config" + LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix SNMP traps receiver" \ org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -45,7 +47,7 @@ RUN set -eux && \ mkdir -p ${ZABBIX_USER_HOME_DIR} && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \ 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/ && \ 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/ @@ -54,7 +56,7 @@ EXPOSE 1162/UDP 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/snmp/snmptrapd.conf", "/etc/snmp/"] diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index db15da792..f9a6cb6b0 100644 --- a/Dockerfiles/snmptraps/centos/Dockerfile +++ b/Dockerfiles/snmptraps/centos/Dockerfile @@ -11,6 +11,8 @@ ENV TERM=xterm \ ZBX_SNMP_TRAP_USE_DNS=false \ ZABBIX_USER_HOME_DIR="/var/lib/zabbix" +ENV SNMP_PERSISTENT_DIR="${ZABBIX_USER_HOME_DIR}/snmptrapd_config" + LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix SNMP traps receiver" \ org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -51,7 +53,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mkdir -p ${ZABBIX_USER_HOME_DIR} && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \ 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/ && \ 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/ @@ -60,7 +62,7 @@ EXPOSE 1162/UDP 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/snmp/snmptrapd.conf", "/etc/snmp/"] diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile index 4efb5e50f..8e072d22c 100644 --- a/Dockerfiles/snmptraps/ol/Dockerfile +++ b/Dockerfiles/snmptraps/ol/Dockerfile @@ -11,6 +11,8 @@ ENV TERM=xterm \ ZBX_SNMP_TRAP_USE_DNS=false \ ZABBIX_USER_HOME_DIR="/var/lib/zabbix" +ENV SNMP_PERSISTENT_DIR="${ZABBIX_USER_HOME_DIR}/snmptrapd_config" + LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix SNMP traps receiver" \ org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -52,7 +54,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mkdir -p ${ZABBIX_USER_HOME_DIR} && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \ 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/ && \ 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/ @@ -61,7 +63,7 @@ EXPOSE 1162/UDP 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/snmp/snmptrapd.conf", "/etc/snmp/"] diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index 1a295fabb..8d1225018 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -13,6 +13,8 @@ ENV TERM=xterm \ ZBX_SNMP_TRAP_USE_DNS=false \ ZABBIX_USER_HOME_DIR="/var/lib/zabbix" +ENV SNMP_PERSISTENT_DIR="${ZABBIX_USER_HOME_DIR}/snmptrapd_config" + LABEL description="Zabbix SNMP traps receiver" \ maintainer="alexey.pustovalov@zabbix.com" \ name="zabbix/zabbix-snmptraps-50" \ @@ -74,7 +76,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mkdir -p ${ZABBIX_USER_HOME_DIR} && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \ 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/ && \ 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/ @@ -83,7 +85,7 @@ EXPOSE 1162/UDP 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/snmp/snmptrapd.conf", "/etc/snmp/"] diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index 199113446..93b427516 100644 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile @@ -11,6 +11,8 @@ ENV TERM=xterm \ ZBX_SNMP_TRAP_USE_DNS=false \ ZABBIX_USER_HOME_DIR="/var/lib/zabbix" +ENV SNMP_PERSISTENT_DIR="${ZABBIX_USER_HOME_DIR}/snmptrapd_config" + LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix SNMP traps receiver" \ org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -50,6 +52,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ mkdir -p ${ZABBIX_USER_HOME_DIR} && \ mkdir -p ${ZABBIX_USER_HOME_DIR}/snmptraps && \ 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/ && \ 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/ @@ -58,7 +61,7 @@ EXPOSE 1162/UDP 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/snmp/snmptrapd.conf", "/etc/snmp/"] diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml index d29108879..e3ecfa36f 100644 --- a/compose_zabbix_components.yaml +++ b/compose_zabbix_components.yaml @@ -604,6 +604,7 @@ services: read_only: true volumes: - snmptraps:/var/lib/zabbix/snmptraps:rwz + - ${DATA_DIRECTORY}/var/lib/zabbix/snmptrapd_config:/var/lib/zabbix/snmptrapd_config:rw tmpfs: /tmp deploy: resources: