Skip to content

fix(grafana): source postgres datasource secrets from file #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dargmuesli merged 3 commits into from
Feb 27, 2025
Merged

fix(grafana): source postgres datasource secrets from file #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3913052
refactor(postgres): rename root user variable
dargmuesli Feb 27, 2025
5d8dffa
fix(grafana): source postgres datasource secrets from file
dargmuesli Feb 27, 2025
a71950b
fix(grafana): update sql statement
dargmuesli Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/production/configurations/grafana/dashboards/postgres.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions src/production/configurations/grafana/provisioning/datasources/postgres.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
4 changes: 2 additions & 2 deletions src/production/configurations/postgres/docker-entrypoint-initdb.d/additional-databases.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down