Merge remote-tracking branch 'upstream/main' into 2025/add/chatVendorService

Author: mrnicegyu11

services/maintenance-page/template.env

@@ -9,3 +9,4 @@ MONITORED_NETWORK=${MONITORED_NETWORK}
 REPO_CONFIG_LOCATION=${REPO_CONFIG_LOCATION}
 MAINTENANCE_PAGES_TRAEFIK_PRIORITY=${MAINTENANCE_PAGES_TRAEFIK_PRIORITY}
 VENDOR_MANUAL_SUBDOMAIN_PREFIX=${VENDOR_MANUAL_SUBDOMAIN_PREFIX}
+VENDOR_CHATBOT_SUBDOMAIN_PREFIX=${VENDOR_CHATBOT_SUBDOMAIN_PREFIX}

services/monitoring/prometheus/prometheus-simcore.yml

@@ -113,6 +113,12 @@ scrape_configs:
           - "tasks.master_webserver"
         type: "A"
         port: 8080
+      - names:
+          - "tasks.production_wb-auth"
+          - "tasks.staging_wb-auth"
+          - "tasks.master_wb-auth"
+        type: "A"
+        port: 8080
       - names:
           - "tasks.production_wb-api-server"
           - "tasks.staging_wb-api-server"

services/vendors/docker-compose.yml.j2

@@ -37,6 +37,8 @@ services:
   chat:
     image: ${VENDOR_CHATBOT_IMAGE}
     init: true
+    env_file:
+      - .env
 {%- raw %}
     hostname: "v-chat-{{.Node.Hostname}}-{{.Task.Slot}}"
 {%- endraw %}

services/vendors/template.env

@@ -9,4 +9,4 @@ VENDOR_CHATBOT_SUBDOMAIN_PREFIX=${VENDOR_CHATBOT_SUBDOMAIN_PREFIX}
 VENDOR_CHATBOT_PRODUCTS=${VENDOR_CHATBOT_PRODUCTS}
 VENDOR_CHATBOT_PORT=${VENDOR_CHATBOT_PORT}
 PUBLIC_NETWORK=${PUBLIC_NETWORK}
-OTEL_EXPORTER_OTLP_ENDPOINT=${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
+OPENAI_API_KEY=${OPENAI_API_KEY}