Fixed usage Vault DB credentials with server and proxy

2025-05-30 22:56:56 +02:00 · 2025-03-13 15:24:12 +09:00 · 2025-03-13 15:24:12 +09:00 · 435e92fdbc
commit 435e92fdbc
parent d9888ffc48
15 changed files with 165 additions and 30 deletions
--- a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
@ -354,8 +354,17 @@ update_zbx_config() {
    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    export ZBX_SERVER_HOST="${ZBX_SERVER_HOST:="zabbix-server"}"

--- a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
@ -351,8 +351,17 @@ update_zbx_config() {
    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    export ZBX_SERVER_HOST="${ZBX_SERVER_HOST:="zabbix-server"}"

--- a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
@ -351,8 +351,17 @@ update_zbx_config() {
    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    export ZBX_SERVER_HOST="${ZBX_SERVER_HOST:="zabbix-server"}"

--- a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
@ -351,8 +351,17 @@ update_zbx_config() {
    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    export ZBX_SERVER_HOST="${ZBX_SERVER_HOST:="zabbix-server"}"

--- a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
@ -351,8 +351,17 @@ update_zbx_config() {
    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    export ZBX_SERVER_HOST="${ZBX_SERVER_HOST:="zabbix-server"}"

--- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
@ -367,8 +367,17 @@ update_zbx_config() {
    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    : ${ZBX_ENABLE_SNMP_TRAPS:="false"}
    [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1
--- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
@ -364,8 +364,17 @@ update_zbx_config() {
    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    : ${ZBX_ENABLE_SNMP_TRAPS:="false"}
    [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1
--- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
@ -364,8 +364,17 @@ update_zbx_config() {
    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    : ${ZBX_ENABLE_SNMP_TRAPS:="false"}
    [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1
--- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
@ -364,8 +364,17 @@ update_zbx_config() {
    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    : ${ZBX_ENABLE_SNMP_TRAPS:="false"}
    [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1
--- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
@ -364,8 +364,17 @@ update_zbx_config() {
    export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    : ${ZBX_ENABLE_SNMP_TRAPS:="false"}
    [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1
--- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
@ -394,8 +394,17 @@ update_zbx_config() {

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
    export ZBX_DB_SCHEMA="${DB_SERVER_SCHEMA}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    : ${ZBX_ENABLE_SNMP_TRAPS:="false"}
    [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1
--- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
@ -394,8 +394,17 @@ update_zbx_config() {

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
    export ZBX_DB_SCHEMA="${DB_SERVER_SCHEMA}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    : ${ZBX_ENABLE_SNMP_TRAPS:="false"}
    [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1
--- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
@ -394,8 +394,17 @@ update_zbx_config() {

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
    export ZBX_DB_SCHEMA="${DB_SERVER_SCHEMA}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    : ${ZBX_ENABLE_SNMP_TRAPS:="false"}
    [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1
--- a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh
@ -394,8 +394,17 @@ update_zbx_config() {

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
    export ZBX_DB_SCHEMA="${DB_SERVER_SCHEMA}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    : ${ZBX_ENABLE_SNMP_TRAPS:="false"}
    [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1
--- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
@ -394,8 +394,17 @@ update_zbx_config() {

    export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
    export ZBX_DB_SCHEMA="${DB_SERVER_SCHEMA}"
-    export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
-    export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+
+    if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then
+        export ZBX_DB_USER="${DB_SERVER_ZBX_USER}"
+        export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}"
+    else
+        unset ZBX_DB_USER
+        unset ZBX_DB_PASSWORD
+    fi

    : ${ZBX_ENABLE_SNMP_TRAPS:="false"}
    [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1