From a8cb835f399ce2362ebcd9159cf71f8f331333ba Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Wed, 9 Oct 2024 13:05:31 -0400 Subject: [PATCH] - Updated deploy script to reqruie db service - updated manifest to hook grafana up to rds --- tdrs-backend/plg/deploy.sh | 2 +- tdrs-backend/plg/grafana/manifest.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tdrs-backend/plg/deploy.sh b/tdrs-backend/plg/deploy.sh index c3264f5ed..11adaebdd 100755 --- a/tdrs-backend/plg/deploy.sh +++ b/tdrs-backend/plg/deploy.sh @@ -46,7 +46,7 @@ deploy_grafana() { yq eval -i ".datasources[1].url = \"http://loki.apps.internal:8080\"" $DATASOURCES yq eval -i ".applications[0].services[0] = \"$1\"" $MANIFEST - cf push --no-route -f manifest.yml -t 180 --strategy rolling + cf push --no-route -f $MANIFEST -t 180 --strategy rolling # cf map-route $APP_NAME apps.internal --hostname $APP_NAME # Give Grafana a public route for now. Might be able to swap to internal route later. cf map-route "$APP_NAME" app.cloud.gov --hostname "${APP_NAME}" diff --git a/tdrs-backend/plg/grafana/manifest.yml b/tdrs-backend/plg/grafana/manifest.yml index 94b8fab33..2f796535f 100644 --- a/tdrs-backend/plg/grafana/manifest.yml +++ b/tdrs-backend/plg/grafana/manifest.yml @@ -13,6 +13,7 @@ applications: GF_PATHS_PLUGINS: "/conf/provisioning/plugins" GF_SERVER_HTTP_PORT: 8080 GF_DATABASE_TYPE: postgres + GF_DATABASE_SSL_MODE: require command: | HOST=$(echo $VCAP_SERVICES | jq -r '."aws-rds"[0].credentials.host') PORT=$(echo $VCAP_SERVICES | jq -r '."aws-rds"[0].credentials.port')