extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-22 07:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated MySQL from utf8 to utf8mb4

Browse Source
This commit is contained in:
Alexey Pustovalov 2021-11-17 01:37:07 +01:00
parent 0702033093
commit 96b02e7c5f
31 changed files with 72 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -270,7 +270,7 @@ create_db_database_mysql() {
if [ -z ${DB_EXISTS} ]; then if [ -z ${DB_EXISTS} ]; then
echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..." echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" 1>/dev/null
# better solution? # better solution?
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
else else
@ -359,6 +359,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}" update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}" update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}"

4
Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
View File

@ -268,7 +268,7 @@ create_db_database_mysql() {
if [ -z ${DB_EXISTS} ]; then if [ -z ${DB_EXISTS} ]; then
echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..." echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" 1>/dev/null
# better solution? # better solution?
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
else else
@ -357,6 +357,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}" update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}" update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}"

4
Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
View File

@ -268,7 +268,7 @@ create_db_database_mysql() {
if [ -z ${DB_EXISTS} ]; then if [ -z ${DB_EXISTS} ]; then
echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..." echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" 1>/dev/null
# better solution? # better solution?
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
else else
@ -357,6 +357,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}" update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}" update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}"

4
Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
View File

@ -269,7 +269,7 @@ create_db_database_mysql() {
if [ -z ${DB_EXISTS} ]; then if [ -z ${DB_EXISTS} ]; then
echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..." echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" 1>/dev/null
# better solution? # better solution?
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
else else
@ -358,6 +358,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}" update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}" update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}"

4
Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@ -267,7 +267,7 @@ create_db_database_mysql() {
if [ -z ${DB_EXISTS} ]; then if [ -z ${DB_EXISTS} ]; then
echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..." echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" 1>/dev/null
# better solution? # better solution?
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
else else
@ -356,6 +356,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}" update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}" update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}"

4
Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
View File

@ -265,7 +265,7 @@ create_db_database_mysql() {
if [ -z ${DB_EXISTS} ]; then if [ -z ${DB_EXISTS} ]; then
echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..." echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" 1>/dev/null
# better solution? # better solution?
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
else else
@ -340,6 +340,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}" update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
: ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"} : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}" update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"

4
Dockerfiles/server-mysql/centos/docker-entrypoint.sh
View File

@ -262,7 +262,7 @@ create_db_database_mysql() {
if [ -z ${DB_EXISTS} ]; then if [ -z ${DB_EXISTS} ]; then
echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..." echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" 1>/dev/null
# better solution? # better solution?
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
else else
@ -337,6 +337,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}" update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
: ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"} : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}" update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"

4
Dockerfiles/server-mysql/ol/docker-entrypoint.sh
View File

@ -262,7 +262,7 @@ create_db_database_mysql() {
if [ -z ${DB_EXISTS} ]; then if [ -z ${DB_EXISTS} ]; then
echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..." echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" 1>/dev/null
# better solution? # better solution?
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
else else
@ -337,6 +337,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}" update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
: ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"} : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}" update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"

4
Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
View File

@ -262,7 +262,7 @@ create_db_database_mysql() {
if [ -z ${DB_EXISTS} ]; then if [ -z ${DB_EXISTS} ]; then
echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..." echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" 1>/dev/null
# better solution? # better solution?
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
else else
@ -337,6 +337,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}" update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
: ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"} : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}" update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"

4
Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -262,7 +262,7 @@ create_db_database_mysql() {
if [ -z ${DB_EXISTS} ]; then if [ -z ${DB_EXISTS} ]; then
echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..." echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" 1>/dev/null
# better solution? # better solution?
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
else else
@ -337,6 +337,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}" update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
: ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"} : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}" update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"

2
Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
View File

@ -375,6 +375,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}" update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
: ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"} : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}" update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"

2
Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
View File

@ -375,6 +375,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}" update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
: ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"} : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}" update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"

2
Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
View File

@ -375,6 +375,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}" update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
: ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"} : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}" update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"

2
Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -375,6 +375,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi fi
update_config_var $ZBX_CONFIG "AllowUnsupportedDBVersions" "${ZBX_ALLOWUNSUPPORTEDDBVERSIONS}"
update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}" update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
: ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"} : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}" update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"

4
Dockerfiles/zabbix-appliance/rhel/docker-entrypoint.sh
View File

@ -184,7 +184,7 @@ configure_db_mysql() {
nohup $MYSQLD --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/mysql/plugin \ nohup $MYSQLD --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/mysql/plugin \
--log-output=none --pid-file=/var/lib/mysql/mysqld.pid \ --log-output=none --pid-file=/var/lib/mysql/mysqld.pid \
--port=3306 --character-set-server=utf8 --collation-server=utf8_bin $mysql_user & --port=3306 --character-set-server=utf8mb4 --collation-server=utf8mb4_bin $mysql_user &
} }
prepare_system() { prepare_system() {
@ -314,7 +314,7 @@ create_db_database_mysql() {
if [ -z ${DB_EXISTS} ]; then if [ -z ${DB_EXISTS} ]; then
echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..." echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" 1>/dev/null
# better solution? # better solution?
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
else else

4
docker-compose_v3_alpine_mysql_latest.yaml
View File

@ -415,8 +415,8 @@ services:
image: mysql:8.0 image: mysql:8.0
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
# - --require-secure-transport # - --require-secure-transport
# - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-ca=/run/secrets/root-ca.pem

4
docker-compose_v3_alpine_mysql_local.yaml
View File

@ -511,8 +511,8 @@ services:
image: mysql:8.0 image: mysql:8.0
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
# - --require-secure-transport # - --require-secure-transport
# - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-ca=/run/secrets/root-ca.pem

4
docker-compose_v3_alpine_pgsql_latest.yaml
View File

@ -413,8 +413,8 @@ services:
- all - all
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
volumes: volumes:
- ./zbx_env/var/lib/mysql:/var/lib/mysql:rw - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw

4
docker-compose_v3_alpine_pgsql_local.yaml
View File

@ -520,8 +520,8 @@ services:
- all - all
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
volumes: volumes:
- ./zbx_env/var/lib/mysql:/var/lib/mysql:rw - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw

4
docker-compose_v3_centos_mysql_latest.yaml
View File

@ -415,8 +415,8 @@ services:
image: mysql:8.0 image: mysql:8.0
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
# - --require-secure-transport # - --require-secure-transport
# - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-ca=/run/secrets/root-ca.pem

4
docker-compose_v3_centos_mysql_local.yaml
View File

@ -509,8 +509,8 @@ services:
image: mysql:8.0 image: mysql:8.0
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
# - --require-secure-transport # - --require-secure-transport
# - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-ca=/run/secrets/root-ca.pem

4
docker-compose_v3_centos_pgsql_latest.yaml
View File

@ -413,8 +413,8 @@ services:
- all - all
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
volumes: volumes:
- ./zbx_env/var/lib/mysql:/var/lib/mysql:rw - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw

4
docker-compose_v3_centos_pgsql_local.yaml
View File

@ -520,8 +520,8 @@ services:
- all - all
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
volumes: volumes:
- ./zbx_env/var/lib/mysql:/var/lib/mysql:rw - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw

4
docker-compose_v3_ol_mysql_latest.yaml
View File

@ -415,8 +415,8 @@ services:
image: mysql:8.0 image: mysql:8.0
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
# - --require-secure-transport # - --require-secure-transport
# - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-ca=/run/secrets/root-ca.pem

4
docker-compose_v3_ol_mysql_local.yaml
View File

@ -509,8 +509,8 @@ services:
image: mysql:8.0 image: mysql:8.0
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
# - --require-secure-transport # - --require-secure-transport
# - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-ca=/run/secrets/root-ca.pem

4
docker-compose_v3_ol_pgsql_latest.yaml
View File

@ -413,8 +413,8 @@ services:
- all - all
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
volumes: volumes:
- ./zbx_env/var/lib/mysql:/var/lib/mysql:rw - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw

4
docker-compose_v3_ol_pgsql_local.yaml
View File

@ -520,8 +520,8 @@ services:
- all - all
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
volumes: volumes:
- ./zbx_env/var/lib/mysql:/var/lib/mysql:rw - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw

4
docker-compose_v3_ubuntu_mysql_latest.yaml
View File

@ -407,8 +407,8 @@ services:
image: mysql:8.0 image: mysql:8.0
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
# - --require-secure-transport # - --require-secure-transport
# - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-ca=/run/secrets/root-ca.pem

4
docker-compose_v3_ubuntu_mysql_local.yaml
View File

@ -503,8 +503,8 @@ services:
image: mysql:8.0 image: mysql:8.0
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
# - --require-secure-transport # - --require-secure-transport
# - --ssl-ca=/run/secrets/root-ca.pem # - --ssl-ca=/run/secrets/root-ca.pem

4
docker-compose_v3_ubuntu_pgsql_latest.yaml
View File

@ -407,8 +407,8 @@ services:
- all - all
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
volumes: volumes:
- ./zbx_env/var/lib/mysql:/var/lib/mysql:rw - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw

4
docker-compose_v3_ubuntu_pgsql_local.yaml
View File

@ -514,8 +514,8 @@ services:
- all - all
command: command:
- mysqld - mysqld
- --character-set-server=utf8 - --character-set-server=utf8mb4
- --collation-server=utf8_bin - --collation-server=utf8mb4_bin
- --default-authentication-plugin=mysql_native_password - --default-authentication-plugin=mysql_native_password
volumes: volumes:
- ./zbx_env/var/lib/mysql:/var/lib/mysql:rw - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw