From b342c6ddb657fdabac1bc06e750826ddb3d4c07b Mon Sep 17 00:00:00 2001
From: Jonathan Sharman <jon.w.sharman@gmail.com>
Date: Wed, 18 Sep 2024 14:52:03 -0700
Subject: [PATCH] chore: fix the client and sandbox postgres version

---
 helm/grafana/.env.example             | 31 +++++++++++++++++++++++++--
 helm/grafana/README.md                |  2 ++
 helm/grafana/values-e4ca1d-tools.yaml | 10 ++++-----
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/helm/grafana/.env.example b/helm/grafana/.env.example
index 94f4a81..804945b 100644
--- a/helm/grafana/.env.example
+++ b/helm/grafana/.env.example
@@ -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=
 
@@ -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=
diff --git a/helm/grafana/README.md b/helm/grafana/README.md
index c39c7a3..0727d2a 100644
--- a/helm/grafana/README.md
+++ b/helm/grafana/README.md
@@ -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
diff --git a/helm/grafana/values-e4ca1d-tools.yaml b/helm/grafana/values-e4ca1d-tools.yaml
index 25a1037..55f82e8 100644
--- a/helm/grafana/values-e4ca1d-tools.yaml
+++ b/helm/grafana/values-e4ca1d-tools.yaml
@@ -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:
@@ -48,7 +48,7 @@ grafana:
             maxOpenConns:
             maxIdleConns: 2
             connMaxLifetime: 14400
-            postgresVersion: 1400
+            postgresVersion: 1500
             timescaledb: false
         - name: SSO Keycloak Test
           type: postgres
@@ -65,7 +65,7 @@ grafana:
             maxOpenConns:
             maxIdleConns: 2
             connMaxLifetime: 14400
-            postgresVersion: 1400
+            postgresVersion: 1500
             timescaledb: false
         - name: SSO Keycloak Prod
           type: postgres
@@ -82,7 +82,7 @@ grafana:
             maxOpenConns:
             maxIdleConns: 2
             connMaxLifetime: 14400
-            postgresVersion: 1400
+            postgresVersion: 1500
             timescaledb: false
         - name: SSO Loki
           type: loki