From 840b51d25c22f81c4dcfe9bbb2eeac9a9678a11a Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Fri, 22 Nov 2019 14:01:14 +0900
Subject: [PATCH] Added missing parameters for Zabbix Server image

---
 server-mysql/alpine/Dockerfile           | 1 +
 server-mysql/alpine/README.md            | 8 ++++++++
 server-mysql/alpine/docker-entrypoint.sh | 5 +++++
 server-mysql/centos/Dockerfile           | 1 +
 server-mysql/centos/README.md            | 8 ++++++++
 server-mysql/centos/docker-entrypoint.sh | 5 +++++
 server-mysql/ubuntu/Dockerfile           | 1 +
 server-mysql/ubuntu/README.md            | 8 ++++++++
 server-mysql/ubuntu/docker-entrypoint.sh | 5 +++++
 server-pgsql/alpine/Dockerfile           | 1 +
 server-pgsql/alpine/README.md            | 8 ++++++++
 server-pgsql/alpine/docker-entrypoint.sh | 5 +++++
 server-pgsql/centos/Dockerfile           | 1 +
 server-pgsql/centos/README.md            | 8 ++++++++
 server-pgsql/centos/docker-entrypoint.sh | 5 +++++
 server-pgsql/ubuntu/Dockerfile           | 1 +
 server-pgsql/ubuntu/README.md            | 8 ++++++++
 server-pgsql/ubuntu/docker-entrypoint.sh | 5 +++++
 18 files changed, 84 insertions(+)

diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile
index acf8c08f8..857652b3f 100644
--- 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
index d2846429b..fa87d86a7 100644
--- 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
index db963191c..43dd30dfc 100755
--- a/server-mysql/alpine/docker-entrypoint.sh
+++ b/server-mysql/alpine/docker-entrypoint.sh
@@ -340,6 +340,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"
 
diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile
index 6c22a29b2..6f14384d5 100644
--- a/server-mysql/centos/Dockerfile
+++ b/server-mysql/centos/Dockerfile
@@ -147,6 +147,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/centos/README.md b/server-mysql/centos/README.md
index d2846429b..fa87d86a7 100644
--- a/server-mysql/centos/README.md
+++ b/server-mysql/centos/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/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh
index 9bbcf5b32..373570440 100755
--- a/server-mysql/centos/docker-entrypoint.sh
+++ b/server-mysql/centos/docker-entrypoint.sh
@@ -843,6 +843,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
+
     # Possible few fping locations
     if [ -f "/usr/bin/fping" ]; then
         update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile
index e7a222304..a7df560b1 100644
--- a/server-mysql/ubuntu/Dockerfile
+++ b/server-mysql/ubuntu/Dockerfile
@@ -175,6 +175,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/ubuntu/README.md b/server-mysql/ubuntu/README.md
index d2846429b..fa87d86a7 100644
--- a/server-mysql/ubuntu/README.md
+++ b/server-mysql/ubuntu/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/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh
index 9bbcf5b32..373570440 100755
--- a/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/server-mysql/ubuntu/docker-entrypoint.sh
@@ -843,6 +843,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
+
     # Possible few fping locations
     if [ -f "/usr/bin/fping" ]; then
         update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile
index 87034bd1a..3fb57665e 100644
--- a/server-pgsql/alpine/Dockerfile
+++ b/server-pgsql/alpine/Dockerfile
@@ -132,6 +132,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-pgsql/alpine/README.md b/server-pgsql/alpine/README.md
index d94f5e381..e3a0b7ebe 100644
--- a/server-pgsql/alpine/README.md
+++ b/server-pgsql/alpine/README.md
@@ -141,6 +141,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
@@ -154,8 +156,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
@@ -221,6 +225,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-pgsql` images come in many flavors, each designed for a specific use case.
diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh
index 3ed93607f..37d46efc8 100755
--- a/server-pgsql/alpine/docker-entrypoint.sh
+++ b/server-pgsql/alpine/docker-entrypoint.sh
@@ -381,6 +381,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"
 
diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile
index 004fb20b1..f4ce0805e 100644
--- a/server-pgsql/centos/Dockerfile
+++ b/server-pgsql/centos/Dockerfile
@@ -149,6 +149,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-pgsql/centos/README.md b/server-pgsql/centos/README.md
index d94f5e381..e3a0b7ebe 100644
--- a/server-pgsql/centos/README.md
+++ b/server-pgsql/centos/README.md
@@ -141,6 +141,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
@@ -154,8 +156,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
@@ -221,6 +225,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-pgsql` images come in many flavors, each designed for a specific use case.
diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh
index fb972d625..0b20a9906 100755
--- a/server-pgsql/centos/docker-entrypoint.sh
+++ b/server-pgsql/centos/docker-entrypoint.sh
@@ -843,6 +843,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
+
     # Possible few fping locations
     if [ -f "/usr/bin/fping" ]; then
         update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile
index 528dc8b33..4d98c2c36 100644
--- a/server-pgsql/ubuntu/Dockerfile
+++ b/server-pgsql/ubuntu/Dockerfile
@@ -176,6 +176,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-pgsql/ubuntu/README.md b/server-pgsql/ubuntu/README.md
index d94f5e381..e3a0b7ebe 100644
--- a/server-pgsql/ubuntu/README.md
+++ b/server-pgsql/ubuntu/README.md
@@ -141,6 +141,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
@@ -154,8 +156,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
@@ -221,6 +225,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-pgsql` images come in many flavors, each designed for a specific use case.
diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh
index fb972d625..0b20a9906 100755
--- a/server-pgsql/ubuntu/docker-entrypoint.sh
+++ b/server-pgsql/ubuntu/docker-entrypoint.sh
@@ -843,6 +843,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
+
     # Possible few fping locations
     if [ -f "/usr/bin/fping" ]; then
         update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"