mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-11-25 01:04:01 +01:00
Merge branch 'master' into 5.0
This commit is contained in:
commit
2fde266b3b
@ -22,6 +22,7 @@ RUN set -eux && \
|
||||
adduser zabbix root && \
|
||||
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 && \
|
||||
|
@ -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.
|
||||
|
@ -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"
|
||||
|
@ -32,6 +32,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 && \
|
||||
|
@ -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.
|
||||
|
@ -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"
|
||||
|
@ -31,6 +31,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 && \
|
||||
|
@ -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.
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user