Added missing parameters for Zabbix Server image

chujiangke · Nov 22, 2019 · 03aaaf3 · 03aaaf3
1 parent 7a161ec
commit 03aaaf3
Show file tree

Hide file tree

Showing 19 changed files with 481 additions and 0 deletions.
diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile
@@ -130,6 +130,7 @@ WORKDIR /var/lib/zabbix
 
 VOLUME ["/usr/lib/zabbix/alertscripts", "/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/mibs", "/var/lib/zabbix/modules"]
 VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"]
+VOLUME ["/var/lib/zabbix/export"]
 
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 

diff --git a/server-mysql/alpine/README.md b/server-mysql/alpine/README.md
@@ -144,6 +144,8 @@ ZBX_STARTALERTERS=3 # Available since 3.4.0
 ZBX_JAVAGATEWAY=zabbix-java-gateway
 ZBX_JAVAGATEWAYPORT=10052
 ZBX_STARTJAVAPOLLERS=5
+ZBX_STARTLLDPROCESSORS=2 # Available since 4.2.0
+ZBX_STATSALLOWEDIP= # Available since 4.0.5
 ZBX_STARTVMWARECOLLECTORS=0
 ZBX_VMWAREFREQUENCY=60
 ZBX_VMWAREPERFFREQUENCY=60
@@ -157,8 +159,10 @@ ZBX_SENDERFREQUENCY=30
 ZBX_CACHESIZE=8M
 ZBX_CACHEUPDATEFREQUENCY=60
 ZBX_STARTDBSYNCERS=4
+ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
 ZBX_HISTORYCACHESIZE=16M
 ZBX_HISTORYINDEXCACHESIZE=4M
+ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
 ZBX_TRENDCACHESIZE=4M
 ZBX_VALUECACHESIZE=8M
 ZBX_TRAPPERIMEOUT=300
@@ -224,6 +228,10 @@ SNMP traps processing feature could be enabled using shared volume and switched
 
 The volume allows to add new MIB files. It does not support subdirectories, all MIBs must be placed to ``/var/lib/zabbix/mibs``.
 
+### ``/var/lib/zabbix/export``
+
+Directory for real-time export of events, history and trends in newline-delimited JSON format. Could be enabled using ``ZBX_EXPORTFILESIZE`` environment variable.
+
 # The image variants
 
 The `zabbix-server-mysql` images come in many flavors, each designed for a specific use case.

diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh
@@ -341,6 +341,11 @@ update_zbx_config() {
     update_config_var $ZBX_CONFIG "AlertScriptsPath" "/usr/lib/zabbix/alertscripts"
     update_config_var $ZBX_CONFIG "ExternalScripts" "/usr/lib/zabbix/externalscripts"
 
+    if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
+        update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
+        update_config_var $ZBX_CONFIG "ExportFileSize" "{$ZBX_EXPORTFILESIZE}"
+    fi
+
     update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
     update_config_var $ZBX_CONFIG "Fping6Location"