Skip to content

refactor(grafana): load secrets by environment #208

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 1 commit into from
Jun 2, 2025
Merged

refactor(grafana): load secrets by environment #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ This project is deployed in accordance to the [DargStack template](https://githu
## secrets


- ### `grafana_admin_email` ![production](https://img.shields.io/badge/-production-informational.svg?style=flat-square)
- ### `grafana_admin_email`

The observation dashboard's admin email.

- ### `grafana_admin_password` ![production](https://img.shields.io/badge/-production-informational.svg?style=flat-square)
- ### `grafana_admin_password`

The observation dashboard's admin password.

- ### `grafana_admin_user` ![production](https://img.shields.io/badge/-production-informational.svg?style=flat-square)
- ### `grafana_admin_user`

The observation dashboard's admin user.

Expand Down
10 changes: 0 additions & 10 deletions src/development/configurations/grafana/grafana.ini
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/development/secrets/grafana/admin_email.secret
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
admin@localhost
1 change: 1 addition & 0 deletions src/development/secrets/grafana/admin_email.secret.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<string>
1 change: 1 addition & 0 deletions src/development/secrets/grafana/admin_password.secret
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
grafana
1 change: 1 addition & 0 deletions src/development/secrets/grafana/admin_password.secret.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<string>
1 change: 1 addition & 0 deletions src/development/secrets/grafana/admin_user.secret
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
grafana
1 change: 1 addition & 0 deletions src/development/secrets/grafana/admin_user.secret.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<string>
20 changes: 19 additions & 1 deletion src/development/stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
# https://github.com/maevsi/vibetype/
---
secrets:
grafana_admin_email:
# The observation dashboard's admin email.
file: ./secrets/grafana/admin_email.secret
grafana_admin_password:
# The observation dashboard's admin password.
file: ./secrets/grafana/admin_password.secret
grafana_admin_user:
# The observation dashboard's admin user.
file: ./secrets/grafana/admin_user.secret
grafana_discord_webhook:
# The observation dashboard's contact point for Discord.
file: ./secrets/grafana/discord_webhook.secret
Expand Down Expand Up @@ -161,15 +170,24 @@ services:
- traefik.http.routers.grafana_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
- traefik.http.services.grafana.loadbalancer.server.port=3000
environment:
GF_DATABASE_HOST: postgres:5432
GF_DATABASE_PASSWORD__FILE: /run/secrets/postgres_role_service_grafana_password
GF_DATABASE_TYPE: postgres
GF_DATABASE_USER__FILE: /run/secrets/postgres_role_service_grafana_username
GF_SECURITY_ADMIN_EMAIL__FILE: /run/secrets/grafana_admin_email
GF_SECURITY_ADMIN_PASSWORD__FILE: /run/secrets/grafana_admin_password
GF_SECURITY_ADMIN_USER__FILE: /run/secrets/grafana_admin_user
GF_SERVER_ROOT_URL: https://grafana.${STACK_DOMAIN}/
image: grafana/grafana:12.0.1
secrets:
- grafana_admin_email
- grafana_admin_password
- grafana_admin_user
- grafana_discord_webhook
- postgres_db
- postgres_role_service_grafana_password
- postgres_role_service_grafana_username
volumes:
- ./configurations/grafana/grafana.ini:/etc/grafana/grafana.ini:ro
- ../production/configurations/grafana/dashboards:/var/lib/grafana/dashboards:ro
- ../production/configurations/grafana/provisioning:/etc/grafana/provisioning:ro
- grafana_data:/var/lib/grafana
Expand Down
10 changes: 0 additions & 10 deletions src/production/configurations/grafana/grafana.ini
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/production/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
secrets:
grafana_admin_email:
# The observation dashboard's admin email.
external: true
grafana_admin_password:
# The observation dashboard's admin password.
external: true
grafana_admin_user:
# The observation dashboard's admin user.
external: true
postgres-backup_db:
# The database's name.
external: true
Expand Down