extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-12-02 04:33:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0

Browse Source
This commit is contained in:
root 2019-04-11 19:42:45 +03:00
commit 080715e3fe
35 changed files with 205 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env_db_pgsql
View File

@ -6,4 +6,4 @@ POSTGRES_USER=zabbix
POSTGRES_PASSWORD=zabbix POSTGRES_PASSWORD=zabbix
# POSTGRES_DB=zabbix # POSTGRES_DB=zabbix
POSTGRES_DB=zabbix POSTGRES_DB=zabbix
# ZBX_DBSCHEMA=public # DB_SERVER_SCHEMA=public

8
agent/alpine/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
agent/centos/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
agent/ubuntu/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
java-gateway/alpine/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
java-gateway/centos/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
java-gateway/ubuntu/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
proxy-mysql/centos/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
proxy-sqlite3/alpine/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
proxy-sqlite3/centos/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
proxy-sqlite3/ubuntu/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
server-mysql/alpine/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
server-mysql/centos/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
server-pgsql/alpine/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
server-pgsql/centos/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
web-apache-mysql/alpine/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
web-apache-mysql/centos/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
web-apache-pgsql/alpine/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
web-apache-pgsql/centos/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
web-apache-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
web-nginx-mysql/centos/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
web-nginx-pgsql/centos/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
zabbix-appliance/alpine/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
zabbix-appliance/centos/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
zabbix-appliance/rhel/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then

8
zabbix-appliance/ubuntu/docker-entrypoint.sh
View File

@ -256,6 +256,8 @@ check_variables_postgresql() {
DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"} DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
if [ "$type" == "proxy" ]; then if [ "$type" == "proxy" ]; then
DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"} DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
else else
@ -409,6 +411,8 @@ create_db_database_postgresql() {
else else
echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!" echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
fi fi
psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
} }
create_db_schema_mysql() { create_db_schema_mysql() {
@ -435,11 +439,11 @@ create_db_schema_postgresql() {
local type=$1 local type=$1
DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = 'public' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}") c.relnamespace WHERE n.nspname = '{$DB_SERVER_SCHEMA}' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists." echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM public.dbversion" "${DB_SERVER_DBNAME}") ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
fi fi
if [ -z "${ZBX_DB_VERSION}" ]; then if [ -z "${ZBX_DB_VERSION}" ]; then