-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed snmptrapd persistent directory
- Loading branch information
Showing
6 changed files
with
21 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 org.opencontainers.image.authors="Alexey Pustovalov <[email protected]>" \ | ||
| org.opencontainers.image.description="Zabbix SNMP traps receiver" \ | ||
| 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}/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/ | ||
|
|
@@ -57,7 +59,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/"] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 org.opencontainers.image.authors="Alexey Pustovalov <[email protected]>" \ | ||
| org.opencontainers.image.description="Zabbix SNMP traps receiver" \ | ||
| 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}/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/ | ||
|
|
@@ -63,7 +65,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/"] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 org.opencontainers.image.authors="Alexey Pustovalov <[email protected]>" \ | ||
| org.opencontainers.image.description="Zabbix SNMP traps receiver" \ | ||
| 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}/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/ | ||
|
|
@@ -62,7 +64,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/"] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,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="[email protected]" \ | ||
| name="zabbix/zabbix-snmptraps-70" \ | ||
|
|
@@ -93,7 +95,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/ | ||
|
|
@@ -102,7 +104,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/"] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 org.opencontainers.image.authors="Alexey Pustovalov <[email protected]>" \ | ||
| org.opencontainers.image.description="Zabbix SNMP traps receiver" \ | ||
| 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}/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/ | ||
|
|
@@ -60,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/"] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters