chore: update env variables

Signed-off-by: Akiff Manji <akiff.manji@quartech.com>

scripts/.env-example

@@ -180,7 +180,9 @@ TENANT_UI_PORT=5101
 # which traction api are we using?
 # naming convention follows what is used by the tenant ui config
 SERVER_TRACTION_URL=http://localhost:8032
+SERVER_LOKI_URL=ws://localhost:3100
 FRONTEND_TENANT_PROXY_URL=http://localhost:8032
+FRONTEND_LOG_STREAM_URL=ws://localhost:5101/logStream
 IMAGE_BUILDTIME=
 IMAGE_TAG=scripts_tenant-ui:latest
 IMAGE_VERSION=latest

scripts/docker-compose.yml

@@ -134,7 +134,9 @@ services:
         condition: service_started
     environment:
       - SERVER_TRACTION_URL=${SERVER_TRACTION_URL}
+      - SERVER_LOKI_URL=${SERVER_LOKI_URL}
       - FRONTEND_TENANT_PROXY_URL=${FRONTEND_TENANT_PROXY_URL}
+      - FRONTEND_LOG_STREAM_URL=${FRONTEND_LOG_STREAM_URL}
       - IMAGE_BUILDTIME=${IMAGE_BUILDTIME}
       - IMAGE_TAG=${IMAGE_TAG}
       - IMAGE_VERSION=${IMAGE_VERSION}

scripts/manage

@@ -24,13 +24,14 @@ generate_traction_ascii_art() {
 
 # Global variable to hold Docker Compose command
 compose_cmd=""
+compose_files_opt="-f docker-compose.logs.yml -f docker-compose.yml"
 
 # Function to determine the correct Docker Compose command
 get_docker_compose_command() {
   if command -v "docker" > /dev/null && docker compose version > /dev/null 2>&1; then
-    compose_cmd="docker compose"
+    compose_cmd="docker compose $compose_files_opt"
   elif command -v docker-compose > /dev/null 2>&1; then
-    compose_cmd="docker-compose"
+    compose_cmd="docker-compose $compose_files_opt"
   else
     echo "Error: Neither 'docker compose' nor 'docker-compose' is installed." >&2
     exit 1
@@ -65,7 +66,7 @@ build_docker_images() {
   fi
 
   built_services="traction-acapy-image-builder tenant-ui tenant-proxy endorser-api endorser-api-1"
-  pulled_services="ngrok-traction-agent traction-db endorser-db endorser-db-1 maildev endorser-agent endorser-agent-1"
+  pulled_services="loki promtail grafana ngrok-traction-agent traction-db endorser-db endorser-db-1 maildev endorser-agent endorser-agent-1"
   $compose_cmd build $built_services --no-cache --parallel
   $compose_cmd pull $pulled_services
 }

services/tenant-ui/config/custom-environment-variables.json

@@ -1,6 +1,7 @@
 {
   "frontend": {
     "tenantProxyPath": "FRONTEND_TENANT_PROXY_URL",
+    "logStreamUrl": "FRONTEND_LOG_STREAM_URL",
     "showInnkeeperReservationPassword": "FRONTEND_INNKEEPER_SHOW_RESERVATION_PASSWORD",
     "showInnkeeperAdminLogin": "FRONTEND_INNKEEPER_SHOW_ADMIN",
     "showWritableComponents": "FRONTEND_TENANT_SHOW_WRITABLE_COMPONENTS",

services/tenant-ui/config/default.json

@@ -1,6 +1,7 @@
 {
   "frontend": {
     "tenantProxyPath": "http://localhost:8032",
+    "logStreamUrl": "ws://localhost:5101/logStream",
     "apiPath": "api/",
     "basePath": "/",
     "showDeveloper": true,
@@ -53,8 +54,8 @@
     "logLevel": "http",
     "port": "8080",
     "staticFiles": "../../frontend/dist",
-    "tractionUrl": "http://localhost:5100",
-    "lokiUrl": "ws://localhost:3100",
+    "tractionUrl": "http://host.docker.internal:8032",
+    "lokiUrl": "ws://host.docker.internal:3100",
     "oidc": {
       "jwksUri": "https://dev.loginproxy.gov.bc.ca/auth/realms/digitaltrust-citz/protocol/openid-connect/certs",
       "realm": "digitaltrust-citz",

services/tenant-ui/frontend/src/store/logStore.ts

@@ -43,7 +43,7 @@ export const useLogStore = defineStore('log', () => {
       }
       if (!logStream.value) {
         logStream.value = new WebSocket(
-          `${config.server.lokiUrl}?token=${token}`
+          `${config.frontend.logStreamUrl}?token=${token}`
         );
         logStream.value.onopen = () => {
           logStreamState.value = LogStreamState.OPEN;

services/tenant-ui/frontend/vite.config.ts

@@ -28,6 +28,12 @@ export default defineConfig({
   },
   server: {
     proxy: {
+      '/logStream': {
+        target: 'ws://localhost:8080',
+        ws: true,
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/logStream/, ''),
+      },
       '/api': proxyObject,
       '/config': proxyObject,
     },

services/tenant-ui/src/components/innkeeper.ts

@@ -1,17 +1,17 @@
 import axios from "axios";
 import config from "config";
-const TRACURL: string = config.get("server.tractionUrl");
-const INN_USER = config.get("server.innkeeper.user");
-const INN_PW = config.get("server.innkeeper.key");
+const TRACTION_URL: string = config.get("server.tractionUrl");
+const INNKEEPER_USER = config.get("server.innkeeper.user");
+const INNKEEPER_KEY = config.get("server.innkeeper.key");
 
 /**
  * @function login
  * Use the configured Inkeeper Admin key to get the token
  * @returns {string} The inkeeper token
  */
 export const login = async () => {
-  const loginUrl = `${TRACURL}/multitenancy/tenant/${INN_USER}/token`;
-  const payload = { wallet_key: INN_PW };
+  const loginUrl = `${TRACTION_URL}/multitenancy/tenant/${INNKEEPER_USER}/token`;
+  const payload = { wallet_key: INNKEEPER_KEY };
   const res = await axios({
     method: "post",
     url: loginUrl,
@@ -29,7 +29,7 @@ export const login = async () => {
 export const createReservation = async (req: any, token: string) => {
   try {
     const auth = `Bearer ${token}`;
-    const reservationUrl = `${TRACURL}/innkeeper/reservations`;
+    const reservationUrl = `${TRACTION_URL}/innkeeper/reservations`;
     const payload = req.body;
 
     const res = await axios({