Merge branch 'main' of https://github.com/nashtech-garage/yas into fe…

…ature/yas-1171
nashtech-garage · Dec 8, 2024 · 4b8d36c · 4b8d36c
2 parents 8b5606e + 0887136
commit 4b8d36c
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,6 @@ YAS is a pet project aim to practice building a typical microservice application
 127.0.0.1 grafana
 127.0.0.1 elasticsearch
 127.0.0.1 kafka
-127.0.0.1 akhq
 ```
 3. Open terminal of your choice, go to `yas` directory, run `docker compose up`, wait for all the containers up and running
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -442,68 +442,68 @@ services:
       - ./deployment/app-config:/app-config
     networks:
       - yas-network
-  webhook:
-    build: ./webhook
-    image: ghcr.io/nashtech-garage/yas-webhook:latest
-    environment:
-      - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/webhook
-      - SERVER_SERVLET_CONTEXT_PATH=/webhook
-      - YAS_PUBLIC_URL=${YAS_PUBLIC_API_URL}/webhook
-      - YAS_SERVICES_LOCATION
-      - SERVER_PORT
-      - LOGGING_CONFIG
-      - JAVA_TOOL_OPTIONS
-      - OTEL_EXPORTER_OTLP_ENDPOINT
-      - OTEL_EXPORTER_OTLP_PROTOCOL
-      - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
-      - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=webhook-service
-      - OTEL_LOGS_EXPORTER
-      - OTEL_TRACES_EXPORTER
-      - OTEL_METRICS_EXPORTER
-      - OTEL_INSTRUMENTATION_LOGBACK-MDC_ADD-BAGGAGE
-      - OTEL_JAVAAGENT_LOGGING
-      - OTEL_JAVAAGENT_ENABLED
-      - OTEL_JAVAAGENT_DEBUG
-    volumes:
-      - ./docker/libs/opentelemetry-javaagent.jar:/opentelemetry-javaagent.jar
-      - ./deployment/app-config:/app-config
-    networks:
-      - yas-network
-  recommendation:
-    build: ./recommendation
-    image: ghcr.io/nashtech-garage/yas-recommendation:latest
-    ports:
-      - '9791:9791'
-    environment:
-      - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/recommendation
-      - SERVER_SERVLET_CONTEXT_PATH=/recommendation
-      - YAS_PUBLIC_URL=${YAS_PUBLIC_API_URL}/recommendation
-      - YAS_SERVICES_PRODUCT
-      - SERVER_PORT
-      - LOGGING_CONFIG
-      - JAVA_TOOL_OPTIONS
-      - OTEL_EXPORTER_OTLP_ENDPOINT
-      - OTEL_EXPORTER_OTLP_PROTOCOL
-      - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
-      - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=recommendation-service
-      - OTEL_LOGS_EXPORTER
-      - OTEL_TRACES_EXPORTER
-      - OTEL_METRICS_EXPORTER
-      - OTEL_INSTRUMENTATION_LOGBACK-MDC_ADD-BAGGAGE
-      - OTEL_JAVAAGENT_LOGGING
-      - OTEL_JAVAAGENT_ENABLED
-      - OTEL_JAVAAGENT_DEBUG
-      # OpenAI Config
-      - SPRING_AI_AZURE_OPENAI_API_KEY
-      - SPRING_AI_AZURE_OPENAI_ENDPOINT
-      - SPRING_AI_AZURE_OPENAI_EMBEDDING_OPTIONS_MODEL
-    volumes:
-      - ./docker/libs/opentelemetry-javaagent.jar:/opentelemetry-javaagent.jar
-      - ./deployment/app-config:/app-config
-    networks:
-      - yas-network
+  # webhook:
+  #   build: ./webhook
+  #   image: ghcr.io/nashtech-garage/yas-webhook:latest
+  #   environment:
+  #     - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/webhook
+  #     - SERVER_SERVLET_CONTEXT_PATH=/webhook
+  #     - YAS_PUBLIC_URL=${YAS_PUBLIC_API_URL}/webhook
+  #     - YAS_SERVICES_LOCATION
+  #     - SERVER_PORT
+  #     - LOGGING_CONFIG
+  #     - JAVA_TOOL_OPTIONS
+  #     - OTEL_EXPORTER_OTLP_ENDPOINT
+  #     - OTEL_EXPORTER_OTLP_PROTOCOL
+  #     - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
+  #     - OTEL_RESOURCE_ATTRIBUTES
+  #     - OTEL_SERVICE_NAME=webhook-service
+  #     - OTEL_LOGS_EXPORTER
+  #     - OTEL_TRACES_EXPORTER
+  #     - OTEL_METRICS_EXPORTER
+  #     - OTEL_INSTRUMENTATION_LOGBACK-MDC_ADD-BAGGAGE
+  #     - OTEL_JAVAAGENT_LOGGING
+  #     - OTEL_JAVAAGENT_ENABLED
+  #     - OTEL_JAVAAGENT_DEBUG
+  #   volumes:
+  #     - ./docker/libs/opentelemetry-javaagent.jar:/opentelemetry-javaagent.jar
+  #     - ./deployment/app-config:/app-config
+  #   networks:
+  #     - yas-network
+  # recommendation:
+  #   build: ./recommendation
+  #   image: ghcr.io/nashtech-garage/yas-recommendation:latest
+  #   ports:
+  #     - '9791:9791'
+  #   environment:
+  #     - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/recommendation
+  #     - SERVER_SERVLET_CONTEXT_PATH=/recommendation
+  #     - YAS_PUBLIC_URL=${YAS_PUBLIC_API_URL}/recommendation
+  #     - YAS_SERVICES_PRODUCT
+  #     - SERVER_PORT
+  #     - LOGGING_CONFIG
+  #     - JAVA_TOOL_OPTIONS
+  #     - OTEL_EXPORTER_OTLP_ENDPOINT
+  #     - OTEL_EXPORTER_OTLP_PROTOCOL
+  #     - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
+  #     - OTEL_RESOURCE_ATTRIBUTES
+  #     - OTEL_SERVICE_NAME=recommendation-service
+  #     - OTEL_LOGS_EXPORTER
+  #     - OTEL_TRACES_EXPORTER
+  #     - OTEL_METRICS_EXPORTER
+  #     - OTEL_INSTRUMENTATION_LOGBACK-MDC_ADD-BAGGAGE
+  #     - OTEL_JAVAAGENT_LOGGING
+  #     - OTEL_JAVAAGENT_ENABLED
+  #     - OTEL_JAVAAGENT_DEBUG
+  #     # OpenAI Config
+  #     - SPRING_AI_AZURE_OPENAI_API_KEY
+  #     - SPRING_AI_AZURE_OPENAI_ENDPOINT
+  #     - SPRING_AI_AZURE_OPENAI_EMBEDDING_OPTIONS_MODEL
+  #   volumes:
+  #     - ./docker/libs/opentelemetry-javaagent.jar:/opentelemetry-javaagent.jar
+  #     - ./deployment/app-config:/app-config
+  #   networks:
+  #     - yas-network
   swagger-ui:
     image: swaggerapi/swagger-ui:v5.17.14
     environment:

diff --git a/nginx/templates/default.conf.template b/nginx/templates/default.conf.template
@@ -46,13 +46,15 @@ server {
     proxy_pass http://payment;
   }
   location /webhook/ {
-    proxy_pass http://webhook;
+    set $docker_webhook_host "webhook";
+    proxy_pass http://$docker_webhook_host;
   }
   location /sampledata/ {
     proxy_pass http://sampledata;
   }
   location /recommendation/ {
-    proxy_pass http://recommendation;
+    set $docker_recommendation_host "recommendation";
+    proxy_pass http://$docker_recommendation_host;
   }
 }
 
@@ -124,15 +126,4 @@ server {
   location / {
     proxy_pass http://kafka:9092;
   }
-}
-
-server {
-  server_name akhq;
-
-  resolver 127.0.0.11;
-
-  location / {
-    set $docker_akhq_host "akhq";
-    proxy_pass http://$docker_akhq_host:8080;
-  }
 }