From a0307d1af98cff59f3ba780ef934cb57555d232f Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 27 Apr 2020 22:00:50 +0300 Subject: [PATCH] Prepare to new Web configuration params support --- .../alpine/conf/etc/zabbix/web/zabbix.conf.php | 14 ++++++++++++++ .../centos/conf/etc/zabbix/web/zabbix.conf.php | 14 ++++++++++++++ .../ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 14 ++++++++++++++ .../alpine/conf/etc/zabbix/web/zabbix.conf.php | 16 +++++++++++++++- .../centos/conf/etc/zabbix/web/zabbix.conf.php | 16 +++++++++++++++- .../ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 14 ++++++++++++++ .../alpine/conf/etc/zabbix/web/zabbix.conf.php | 14 ++++++++++++++ .../centos/conf/etc/zabbix/web/zabbix.conf.php | 14 ++++++++++++++ .../ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 14 ++++++++++++++ .../alpine/conf/etc/zabbix/web/zabbix.conf.php | 16 +++++++++++++++- .../centos/conf/etc/zabbix/web/zabbix.conf.php | 16 +++++++++++++++- .../ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 14 ++++++++++++++ 12 files changed, 172 insertions(+), 4 deletions(-) diff --git a/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 1c20c250b..326200409 100644 --- a/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -16,6 +16,20 @@ $ZBX_SERVER = '{ZBX_SERVER_HOST}'; $ZBX_SERVER_PORT = '{ZBX_SERVER_PORT}'; $ZBX_SERVER_NAME = '{ZBX_SERVER_NAME}'; +// Used for TLS connection. +$DB['ENCRYPTION'] = {ZBX_DB_ENCRYPTION}; +$DB['KEY_FILE'] = '{ZBX_DB_KEY_FILE}'; +$DB['CERT_FILE'] = '{ZBX_DB_CERT_FILE}'; +$DB['CA_FILE'] = '{ZBX_DB_CA_FILE}'; +$DB['VERIFY_HOST'] = {ZBX_DB_VERIFY_HOST}; +$DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; + +// Use IEEE754 compatible value range for 64-bit Numeric (float) history values. +// This option is enabled by default for new Zabbix installations. +// For upgraded installations, please read database upgrade notes before enabling this option. +$DB['DOUBLE_IEEE754'] = true; + + $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; // Elasticsearch url (can be string if same url is used for all types). diff --git a/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php index 1c20c250b..326200409 100644 --- a/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -16,6 +16,20 @@ $ZBX_SERVER = '{ZBX_SERVER_HOST}'; $ZBX_SERVER_PORT = '{ZBX_SERVER_PORT}'; $ZBX_SERVER_NAME = '{ZBX_SERVER_NAME}'; +// Used for TLS connection. +$DB['ENCRYPTION'] = {ZBX_DB_ENCRYPTION}; +$DB['KEY_FILE'] = '{ZBX_DB_KEY_FILE}'; +$DB['CERT_FILE'] = '{ZBX_DB_CERT_FILE}'; +$DB['CA_FILE'] = '{ZBX_DB_CA_FILE}'; +$DB['VERIFY_HOST'] = {ZBX_DB_VERIFY_HOST}; +$DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; + +// Use IEEE754 compatible value range for 64-bit Numeric (float) history values. +// This option is enabled by default for new Zabbix installations. +// For upgraded installations, please read database upgrade notes before enabling this option. +$DB['DOUBLE_IEEE754'] = true; + + $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; // Elasticsearch url (can be string if same url is used for all types). diff --git a/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index 1c20c250b..326200409 100644 --- a/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -16,6 +16,20 @@ $ZBX_SERVER = '{ZBX_SERVER_HOST}'; $ZBX_SERVER_PORT = '{ZBX_SERVER_PORT}'; $ZBX_SERVER_NAME = '{ZBX_SERVER_NAME}'; +// Used for TLS connection. +$DB['ENCRYPTION'] = {ZBX_DB_ENCRYPTION}; +$DB['KEY_FILE'] = '{ZBX_DB_KEY_FILE}'; +$DB['CERT_FILE'] = '{ZBX_DB_CERT_FILE}'; +$DB['CA_FILE'] = '{ZBX_DB_CA_FILE}'; +$DB['VERIFY_HOST'] = {ZBX_DB_VERIFY_HOST}; +$DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; + +// Use IEEE754 compatible value range for 64-bit Numeric (float) history values. +// This option is enabled by default for new Zabbix installations. +// For upgraded installations, please read database upgrade notes before enabling this option. +$DB['DOUBLE_IEEE754'] = true; + + $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; // Elasticsearch url (can be string if same url is used for all types). diff --git a/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 19e3833ac..326200409 100644 --- a/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -2,7 +2,7 @@ // Zabbix GUI configuration file. global $DB, $HISTORY; -$DB['TYPE'] = 'POSTGRESQL'; +$DB['TYPE'] = 'MYSQL'; $DB['SERVER'] = '{DB_SERVER_HOST}'; $DB['PORT'] = '{DB_SERVER_PORT}'; $DB['DATABASE'] = '{DB_SERVER_DBNAME}'; @@ -16,6 +16,20 @@ $ZBX_SERVER = '{ZBX_SERVER_HOST}'; $ZBX_SERVER_PORT = '{ZBX_SERVER_PORT}'; $ZBX_SERVER_NAME = '{ZBX_SERVER_NAME}'; +// Used for TLS connection. +$DB['ENCRYPTION'] = {ZBX_DB_ENCRYPTION}; +$DB['KEY_FILE'] = '{ZBX_DB_KEY_FILE}'; +$DB['CERT_FILE'] = '{ZBX_DB_CERT_FILE}'; +$DB['CA_FILE'] = '{ZBX_DB_CA_FILE}'; +$DB['VERIFY_HOST'] = {ZBX_DB_VERIFY_HOST}; +$DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; + +// Use IEEE754 compatible value range for 64-bit Numeric (float) history values. +// This option is enabled by default for new Zabbix installations. +// For upgraded installations, please read database upgrade notes before enabling this option. +$DB['DOUBLE_IEEE754'] = true; + + $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; // Elasticsearch url (can be string if same url is used for all types). diff --git a/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php index 19e3833ac..326200409 100644 --- a/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -2,7 +2,7 @@ // Zabbix GUI configuration file. global $DB, $HISTORY; -$DB['TYPE'] = 'POSTGRESQL'; +$DB['TYPE'] = 'MYSQL'; $DB['SERVER'] = '{DB_SERVER_HOST}'; $DB['PORT'] = '{DB_SERVER_PORT}'; $DB['DATABASE'] = '{DB_SERVER_DBNAME}'; @@ -16,6 +16,20 @@ $ZBX_SERVER = '{ZBX_SERVER_HOST}'; $ZBX_SERVER_PORT = '{ZBX_SERVER_PORT}'; $ZBX_SERVER_NAME = '{ZBX_SERVER_NAME}'; +// Used for TLS connection. +$DB['ENCRYPTION'] = {ZBX_DB_ENCRYPTION}; +$DB['KEY_FILE'] = '{ZBX_DB_KEY_FILE}'; +$DB['CERT_FILE'] = '{ZBX_DB_CERT_FILE}'; +$DB['CA_FILE'] = '{ZBX_DB_CA_FILE}'; +$DB['VERIFY_HOST'] = {ZBX_DB_VERIFY_HOST}; +$DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; + +// Use IEEE754 compatible value range for 64-bit Numeric (float) history values. +// This option is enabled by default for new Zabbix installations. +// For upgraded installations, please read database upgrade notes before enabling this option. +$DB['DOUBLE_IEEE754'] = true; + + $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; // Elasticsearch url (can be string if same url is used for all types). diff --git a/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index 1c20c250b..326200409 100644 --- a/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -16,6 +16,20 @@ $ZBX_SERVER = '{ZBX_SERVER_HOST}'; $ZBX_SERVER_PORT = '{ZBX_SERVER_PORT}'; $ZBX_SERVER_NAME = '{ZBX_SERVER_NAME}'; +// Used for TLS connection. +$DB['ENCRYPTION'] = {ZBX_DB_ENCRYPTION}; +$DB['KEY_FILE'] = '{ZBX_DB_KEY_FILE}'; +$DB['CERT_FILE'] = '{ZBX_DB_CERT_FILE}'; +$DB['CA_FILE'] = '{ZBX_DB_CA_FILE}'; +$DB['VERIFY_HOST'] = {ZBX_DB_VERIFY_HOST}; +$DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; + +// Use IEEE754 compatible value range for 64-bit Numeric (float) history values. +// This option is enabled by default for new Zabbix installations. +// For upgraded installations, please read database upgrade notes before enabling this option. +$DB['DOUBLE_IEEE754'] = true; + + $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; // Elasticsearch url (can be string if same url is used for all types). diff --git a/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 1c20c250b..326200409 100644 --- a/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -16,6 +16,20 @@ $ZBX_SERVER = '{ZBX_SERVER_HOST}'; $ZBX_SERVER_PORT = '{ZBX_SERVER_PORT}'; $ZBX_SERVER_NAME = '{ZBX_SERVER_NAME}'; +// Used for TLS connection. +$DB['ENCRYPTION'] = {ZBX_DB_ENCRYPTION}; +$DB['KEY_FILE'] = '{ZBX_DB_KEY_FILE}'; +$DB['CERT_FILE'] = '{ZBX_DB_CERT_FILE}'; +$DB['CA_FILE'] = '{ZBX_DB_CA_FILE}'; +$DB['VERIFY_HOST'] = {ZBX_DB_VERIFY_HOST}; +$DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; + +// Use IEEE754 compatible value range for 64-bit Numeric (float) history values. +// This option is enabled by default for new Zabbix installations. +// For upgraded installations, please read database upgrade notes before enabling this option. +$DB['DOUBLE_IEEE754'] = true; + + $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; // Elasticsearch url (can be string if same url is used for all types). diff --git a/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php index 1c20c250b..326200409 100644 --- a/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -16,6 +16,20 @@ $ZBX_SERVER = '{ZBX_SERVER_HOST}'; $ZBX_SERVER_PORT = '{ZBX_SERVER_PORT}'; $ZBX_SERVER_NAME = '{ZBX_SERVER_NAME}'; +// Used for TLS connection. +$DB['ENCRYPTION'] = {ZBX_DB_ENCRYPTION}; +$DB['KEY_FILE'] = '{ZBX_DB_KEY_FILE}'; +$DB['CERT_FILE'] = '{ZBX_DB_CERT_FILE}'; +$DB['CA_FILE'] = '{ZBX_DB_CA_FILE}'; +$DB['VERIFY_HOST'] = {ZBX_DB_VERIFY_HOST}; +$DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; + +// Use IEEE754 compatible value range for 64-bit Numeric (float) history values. +// This option is enabled by default for new Zabbix installations. +// For upgraded installations, please read database upgrade notes before enabling this option. +$DB['DOUBLE_IEEE754'] = true; + + $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; // Elasticsearch url (can be string if same url is used for all types). diff --git a/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index 1c20c250b..326200409 100644 --- a/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -16,6 +16,20 @@ $ZBX_SERVER = '{ZBX_SERVER_HOST}'; $ZBX_SERVER_PORT = '{ZBX_SERVER_PORT}'; $ZBX_SERVER_NAME = '{ZBX_SERVER_NAME}'; +// Used for TLS connection. +$DB['ENCRYPTION'] = {ZBX_DB_ENCRYPTION}; +$DB['KEY_FILE'] = '{ZBX_DB_KEY_FILE}'; +$DB['CERT_FILE'] = '{ZBX_DB_CERT_FILE}'; +$DB['CA_FILE'] = '{ZBX_DB_CA_FILE}'; +$DB['VERIFY_HOST'] = {ZBX_DB_VERIFY_HOST}; +$DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; + +// Use IEEE754 compatible value range for 64-bit Numeric (float) history values. +// This option is enabled by default for new Zabbix installations. +// For upgraded installations, please read database upgrade notes before enabling this option. +$DB['DOUBLE_IEEE754'] = true; + + $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; // Elasticsearch url (can be string if same url is used for all types). diff --git a/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 19e3833ac..326200409 100644 --- a/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -2,7 +2,7 @@ // Zabbix GUI configuration file. global $DB, $HISTORY; -$DB['TYPE'] = 'POSTGRESQL'; +$DB['TYPE'] = 'MYSQL'; $DB['SERVER'] = '{DB_SERVER_HOST}'; $DB['PORT'] = '{DB_SERVER_PORT}'; $DB['DATABASE'] = '{DB_SERVER_DBNAME}'; @@ -16,6 +16,20 @@ $ZBX_SERVER = '{ZBX_SERVER_HOST}'; $ZBX_SERVER_PORT = '{ZBX_SERVER_PORT}'; $ZBX_SERVER_NAME = '{ZBX_SERVER_NAME}'; +// Used for TLS connection. +$DB['ENCRYPTION'] = {ZBX_DB_ENCRYPTION}; +$DB['KEY_FILE'] = '{ZBX_DB_KEY_FILE}'; +$DB['CERT_FILE'] = '{ZBX_DB_CERT_FILE}'; +$DB['CA_FILE'] = '{ZBX_DB_CA_FILE}'; +$DB['VERIFY_HOST'] = {ZBX_DB_VERIFY_HOST}; +$DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; + +// Use IEEE754 compatible value range for 64-bit Numeric (float) history values. +// This option is enabled by default for new Zabbix installations. +// For upgraded installations, please read database upgrade notes before enabling this option. +$DB['DOUBLE_IEEE754'] = true; + + $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; // Elasticsearch url (can be string if same url is used for all types). diff --git a/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php index 19e3833ac..326200409 100644 --- a/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -2,7 +2,7 @@ // Zabbix GUI configuration file. global $DB, $HISTORY; -$DB['TYPE'] = 'POSTGRESQL'; +$DB['TYPE'] = 'MYSQL'; $DB['SERVER'] = '{DB_SERVER_HOST}'; $DB['PORT'] = '{DB_SERVER_PORT}'; $DB['DATABASE'] = '{DB_SERVER_DBNAME}'; @@ -16,6 +16,20 @@ $ZBX_SERVER = '{ZBX_SERVER_HOST}'; $ZBX_SERVER_PORT = '{ZBX_SERVER_PORT}'; $ZBX_SERVER_NAME = '{ZBX_SERVER_NAME}'; +// Used for TLS connection. +$DB['ENCRYPTION'] = {ZBX_DB_ENCRYPTION}; +$DB['KEY_FILE'] = '{ZBX_DB_KEY_FILE}'; +$DB['CERT_FILE'] = '{ZBX_DB_CERT_FILE}'; +$DB['CA_FILE'] = '{ZBX_DB_CA_FILE}'; +$DB['VERIFY_HOST'] = {ZBX_DB_VERIFY_HOST}; +$DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; + +// Use IEEE754 compatible value range for 64-bit Numeric (float) history values. +// This option is enabled by default for new Zabbix installations. +// For upgraded installations, please read database upgrade notes before enabling this option. +$DB['DOUBLE_IEEE754'] = true; + + $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; // Elasticsearch url (can be string if same url is used for all types). diff --git a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index 1c20c250b..326200409 100644 --- a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -16,6 +16,20 @@ $ZBX_SERVER = '{ZBX_SERVER_HOST}'; $ZBX_SERVER_PORT = '{ZBX_SERVER_PORT}'; $ZBX_SERVER_NAME = '{ZBX_SERVER_NAME}'; +// Used for TLS connection. +$DB['ENCRYPTION'] = {ZBX_DB_ENCRYPTION}; +$DB['KEY_FILE'] = '{ZBX_DB_KEY_FILE}'; +$DB['CERT_FILE'] = '{ZBX_DB_CERT_FILE}'; +$DB['CA_FILE'] = '{ZBX_DB_CA_FILE}'; +$DB['VERIFY_HOST'] = {ZBX_DB_VERIFY_HOST}; +$DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; + +// Use IEEE754 compatible value range for 64-bit Numeric (float) history values. +// This option is enabled by default for new Zabbix installations. +// For upgraded installations, please read database upgrade notes before enabling this option. +$DB['DOUBLE_IEEE754'] = true; + + $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; // Elasticsearch url (can be string if same url is used for all types).