From 39130528da00eca1fdace27cd94ca5a368ca53aa Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 27 Feb 2025 22:28:06 +0100 Subject: [PATCH 1/3] refactor(postgres): rename root user variable --- .../docker-entrypoint-initdb.d/additional-databases.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/production/configurations/postgres/docker-entrypoint-initdb.d/additional-databases.sh b/src/production/configurations/postgres/docker-entrypoint-initdb.d/additional-databases.sh index c4dbf646..2f77c3a1 100755 --- a/src/production/configurations/postgres/docker-entrypoint-initdb.d/additional-databases.sh +++ b/src/production/configurations/postgres/docker-entrypoint-initdb.d/additional-databases.sh @@ -2,7 +2,7 @@ set -eu -username="$(cat /run/secrets/postgres_user)" +postgres_user="$(cat /run/secrets/postgres_user)" create_database_and_role() { db_name="$1" @@ -24,7 +24,7 @@ create_database_and_role() { echo "[INFO] Creating user and database: '$db_name'" - psql -v ON_ERROR_STOP=1 --username "$username" --dbname "postgres" <<-EOSQL + psql -v ON_ERROR_STOP=1 --username "$postgres_user" --dbname "postgres" <<-EOSQL CREATE ROLE "$db_username" WITH LOGIN PASSWORD '$db_password'; CREATE DATABASE "$db_name" OWNER "$db_username"; EOSQL From 5d8dffa6c0ed3b2b1cce01288715cedcda2a7990 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 27 Feb 2025 22:28:30 +0100 Subject: [PATCH 2/3] fix(grafana): source postgres datasource secrets from file --- .../grafana/provisioning/datasources/postgres.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/production/configurations/grafana/provisioning/datasources/postgres.yaml b/src/production/configurations/grafana/provisioning/datasources/postgres.yaml index d4ef785c..e9aea103 100644 --- a/src/production/configurations/grafana/provisioning/datasources/postgres.yaml +++ b/src/production/configurations/grafana/provisioning/datasources/postgres.yaml @@ -8,7 +8,7 @@ datasources: sslmode: 'disable' name: PostgreSQL secureJsonData: - password: postgres + password: $__file{/run/secrets/postgres_role_grafana_password} type: grafana-postgresql-datasource url: postgres:5432 - user: postgres + user: $__file{/run/secrets/postgres_role_grafana_username} From a71950b4ba5c6eaf6041a2b0816fcd6495bbb542 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 27 Feb 2025 22:31:21 +0100 Subject: [PATCH 3/3] fix(grafana): update sql statement --- src/production/configurations/grafana/dashboards/postgres.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/production/configurations/grafana/dashboards/postgres.json b/src/production/configurations/grafana/dashboards/postgres.json index 5917ac38..8e6f4601 100644 --- a/src/production/configurations/grafana/dashboards/postgres.json +++ b/src/production/configurations/grafana/dashboards/postgres.json @@ -213,7 +213,7 @@ "editorMode": "code", "format": "table", "rawQuery": true, - "rawSql": "SELECT created as time, row_number() OVER (ORDER BY created) FROM maevsi_private.account", + "rawSql": "SELECT created_at as time, row_number() OVER (ORDER BY created_at) FROM maevsi_private.account", "refId": "A", "sql": { "columns": [