diff --git a/proxy-sqlite3/ol/Dockerfile b/proxy-sqlite3/ol/Dockerfile index 51c4dfaba..4f689660d 100644 --- a/proxy-sqlite3/ol/Dockerfile +++ b/proxy-sqlite3/ol/Dockerfile @@ -34,6 +34,7 @@ RUN set -eux && \ zabbix && \ mkdir -p /etc/zabbix && \ mkdir -p /var/lib/zabbix && \ + mkdir -p /var/lib/zabbix/db_data && \ mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/mibs && \ mkdir -p /var/lib/zabbix/modules && \ diff --git a/proxy-sqlite3/ol/README.md b/proxy-sqlite3/ol/README.md index a36d873db..2a3c655d5 100644 --- a/proxy-sqlite3/ol/README.md +++ b/proxy-sqlite3/ol/README.md @@ -199,6 +199,10 @@ Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``. +### ``/var/lib/zabbix/db_data`` + +The volume stores SQLite3 database file and could be used for external database file storage. + ### ``/var/lib/zabbix/modules`` The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature. diff --git a/proxy-sqlite3/ol/docker-entrypoint.sh b/proxy-sqlite3/ol/docker-entrypoint.sh index 590a16714..ef783bc63 100755 --- a/proxy-sqlite3/ol/docker-entrypoint.sh +++ b/proxy-sqlite3/ol/docker-entrypoint.sh @@ -139,7 +139,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" update_config_var $ZBX_CONFIG "DBHost" - update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db" + update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/db_data/${ZBX_HOSTNAME:-"zabbix-proxy-sqlite3"}.sqlite" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPassword" diff --git a/proxy-sqlite3/rhel/Dockerfile b/proxy-sqlite3/rhel/Dockerfile index 524b3df12..977cb3c20 100644 --- a/proxy-sqlite3/rhel/Dockerfile +++ b/proxy-sqlite3/rhel/Dockerfile @@ -69,6 +69,7 @@ RUN set -eux && INSTALL_PKGS="bash \ zabbix && \ mkdir -p /etc/zabbix && \ mkdir -p /var/lib/zabbix && \ + mkdir -p /var/lib/zabbix/db_data && \ mkdir -p /var/lib/zabbix/enc && \ mkdir -p /usr/lib/zabbix/externalscripts && \ mkdir -p /var/lib/zabbix/mibs && \ diff --git a/proxy-sqlite3/rhel/README.md b/proxy-sqlite3/rhel/README.md index a36d873db..72cce7e2d 100644 --- a/proxy-sqlite3/rhel/README.md +++ b/proxy-sqlite3/rhel/README.md @@ -199,6 +199,10 @@ Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_proxy.conf``. +### ``/var/lib/zabbix/db_data`` + +The volume stores SQLite3 database file and could be used for external database file storage. + ### ``/var/lib/zabbix/modules`` The volume allows load additional modules and extend Zabbix proxy using ``LoadModule`` feature. @@ -248,7 +252,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. -## `zabbix-agent:ol-` +## `zabbix-proxy-sqlite3:ol-` Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. diff --git a/proxy-sqlite3/rhel/docker-entrypoint.sh b/proxy-sqlite3/rhel/docker-entrypoint.sh index 590a16714..ef783bc63 100755 --- a/proxy-sqlite3/rhel/docker-entrypoint.sh +++ b/proxy-sqlite3/rhel/docker-entrypoint.sh @@ -139,7 +139,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" update_config_var $ZBX_CONFIG "DBHost" - update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db" + update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/db_data/${ZBX_HOSTNAME:-"zabbix-proxy-sqlite3"}.sqlite" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPassword"