Skip to content
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

chore: fix the client and sandbox postgres version #51

Merged
merged 1 commit into from
Sep 18, 2024
Merged

chore: fix the client and sandbox postgres version #51

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
31 changes: 29 additions & 2 deletions helm/grafana/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

## Comment out the env vars for the production or sandbox environment
# Sandbox grafana
NAME=sso-grafana
NAMESPACE=
NAMESPACE=e4ca1d-tools
SSO_CLIENT_ID=
SSO_CLIENT_SECRET=

Expand All @@ -23,3 +24,29 @@ DS_KEYCLOAK_PROD_DATABASE=
DS_AGGREGATOR_USERNAME=
DS_AGGREGATOR_PASSWORD=
DS_AGGREGATOR_DATABASE=

# # production creds
# NAME=sso-grafana
# NAMESPACE=eb75ad-tools
# SSO_CLIENT_ID=
# SSO_CLIENT_SECRET=

# DS_SSO_LOGS_USERNAME=
# DS_SSO_LOGS_PASSWORD=
# DS_SSO_LOGS_DATABASE=

# DS_KEYCLOAK_DEV_USERNAME=
# DS_KEYCLOAK_DEV_PASSWORD=
# DS_KEYCLOAK_DEV_DATABASE=

# DS_KEYCLOAK_TEST_USERNAME=
# DS_KEYCLOAK_TEST_PASSWORD=
# DS_KEYCLOAK_TEST_DATABASE=

# DS_KEYCLOAK_PROD_USERNAME=
# DS_KEYCLOAK_PROD_PASSWORD=
# DS_KEYCLOAK_PROD_DATABASE=

# DS_AGGREGATOR_USERNAME=
# DS_AGGREGATOR_PASSWORD=
# DS_AGGREGATOR_DATABASE=
2 changes: 2 additions & 0 deletions helm/grafana/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ envsubst < net-policy-sso-keycloak.yaml | oc apply -f -

#### Update Helm Values

You will need to create a separate set of environment values for the sandbox and production grafana instances. The sandbox grafana instance uses the `dev production 4492` client for authentication and the production grafana instance uses the `prod production 4492` client.

- create `.env` from `.env.example` and fill the values

### Installing/Upgrading the Chart
Expand Down
10 changes: 5 additions & 5 deletions helm/grafana/values-e4ca1d-tools.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ grafana:
root_url: https://sso-grafana-sandbox.apps.gold.devops.gov.bc.ca
auth.generic_oauth:
name: SSO Pathfinder Sandbox
auth_url: https://dev.sandbox.loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/auth
token_url: https://dev.sandbox.loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/token
auth_url: https://dev.loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/auth
token_url: https://dev.loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/token

datasources:
datasources.yaml:
Expand Down Expand Up @@ -48,7 +48,7 @@ grafana:
maxOpenConns:
maxIdleConns: 2
connMaxLifetime: 14400
postgresVersion: 1400
postgresVersion: 1500
timescaledb: false
- name: SSO Keycloak Test
type: postgres
Expand All @@ -65,7 +65,7 @@ grafana:
maxOpenConns:
maxIdleConns: 2
connMaxLifetime: 14400
postgresVersion: 1400
postgresVersion: 1500
timescaledb: false
- name: SSO Keycloak Prod
type: postgres
Expand All @@ -82,7 +82,7 @@ grafana:
maxOpenConns:
maxIdleConns: 2
connMaxLifetime: 14400
postgresVersion: 1400
postgresVersion: 1500
timescaledb: false
- name: SSO Loki
type: loki
Expand Down