Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorViktors Tjarve <viktors.tjarve@zabbix.com>2021-01-12 14:55:02 +0300
committerViktors Tjarve <viktors.tjarve@zabbix.com>2021-01-12 14:55:02 +0300
commit6e45e2f4b8eedb7b61548d8f631a7acb0c1cbbe9 (patch)
tree11c05a853820c705a95fe4935e044c1bcd49fff5 /conf
parent815ca85d05f05cab073d1a69aa926c9fe027e6f8 (diff)
.......PS. [ZBXNEXT-5759] added Oracle DB tnsnames.ora service name lookup support
Diffstat (limited to 'conf')
-rw-r--r--conf/zabbix_proxy.conf2
-rw-r--r--conf/zabbix_server.conf2
2 files changed, 4 insertions, 0 deletions
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf
index a1deb62bd9b..70a6e67884f 100644
--- a/conf/zabbix_proxy.conf
+++ b/conf/zabbix_proxy.conf
@@ -150,6 +150,7 @@ LogFile=/tmp/zabbix_proxy.log
# Database host name.
# If set to localhost, socket is used for MySQL.
# If set to empty string, socket is used for PostgreSQL.
+# If set to empty string, the Net Service Name connection method is used to connect for Oracle.
#
# Mandatory: no
# Default:
@@ -158,6 +159,7 @@ LogFile=/tmp/zabbix_proxy.log
### Option: DBName
# Database name.
# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
+# For Oracle if the Net Service Name connection method is used, specify service name from tnsnames.ora or set to empty string.
# Warning: do not attempt to use the same database Zabbix server is using.
#
# Mandatory: yes
diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf
index dbc56efeb3f..17c2eb4699d 100644
--- a/conf/zabbix_server.conf
+++ b/conf/zabbix_server.conf
@@ -79,6 +79,7 @@ LogFile=/tmp/zabbix_server.log
# Database host name.
# If set to localhost, socket is used for MySQL.
# If set to empty string, socket is used for PostgreSQL.
+# If set to empty string, the Net Service Name connection method is used to connect for Oracle.
#
# Mandatory: no
# Default:
@@ -86,6 +87,7 @@ LogFile=/tmp/zabbix_server.log
### Option: DBName
# Database name.
+# For Oracle if the Net Service Name connection method is used, specify service name from tnsnames.ora or set to empty string.
#
# Mandatory: yes
# Default: