- Corrections for setting up the test environment

- Correction of some bugs discovered

docker/build_and_push_eveai.sh

@@ -141,7 +141,7 @@ if [ $# -eq 0 ]; then
     SERVICES=()
     while IFS= read -r line; do
         SERVICES+=("$line")
-    done < <(yq e '.services | keys | .[]' compose_dev.yaml | grep -E '^(nginx|eveai_|flower)')
+    done < <(yq e '.services | keys | .[]' compose_dev.yaml | grep -E '^(nginx|eveai_|flower|prometheus|grafana)')
 else
     SERVICES=("$@")
 fi
@@ -161,14 +161,14 @@ for SERVICE in "${SERVICES[@]}"; do
     if [[ "$SERVICE" == "nginx" ]]; then
       ./copy_specialist_svgs.sh ../config ../nginx/static/assets
     fi
-    if [[ "$SERVICE" == "nginx" || "$SERVICE" == eveai_* || "$SERVICE" == "flower" ]]; then
+    if [[ "$SERVICE" == "nginx" || "$SERVICE" == eveai_* || "$SERVICE" == "flower" || "$SERVICE" == "prometheus" || "$SERVICE" == "grafana" ]]; then
         if process_service "$SERVICE"; then
             echo "Successfully processed $SERVICE"
         else
             echo "Failed to process $SERVICE"
         fi
     else
-        echo "Skipping $SERVICE as it's not nginx or doesn't start with eveai_"
+        echo "Skipping $SERVICE as it's not nginx, flower, prometheus, grafana or doesn't start with eveai_"
     fi
 done
 

docker/compose_dev.yaml

@@ -375,6 +375,9 @@ services:
 
   prometheus:
     image: prom/prometheus:latest
+    build:
+      context: ./prometheus
+      dockerfile: Dockerfile
     container_name: prometheus
     ports:
       - "9090:9090"
@@ -401,6 +404,9 @@ services:
 
   grafana:
     image: grafana/grafana:latest
+    build:
+      context: ./grafana
+      dockerfile: Dockerfile
     container_name: grafana
     ports:
       - "3000:3000"

docker/compose_test.yaml

@@ -9,7 +9,7 @@
 # https://github.com/docker/awesome-compose
 
 x-common-variables: &common-variables
-  DB_HOST: db
+  DB_HOST: minty.ask-eve-ai-local.com
   DB_USER: luke
   DB_PASS: 'Skywalker!'
   DB_NAME: eveai
@@ -53,6 +53,7 @@ services:
       - eveai_api
     networks:
       - eveai-network
+    restart: "no"
 
   eveai_app:
     image: josakola/eveai_app:${EVEAI_VERSION:-latest}
@@ -67,8 +68,6 @@ services:
       - eveai_logs:/app/logs
       - crewai_storage:/app/crewai_storage
     depends_on:
-      db:
-        condition: service_healthy
       redis:
         condition: service_healthy
       minio:
@@ -81,6 +80,7 @@ services:
       start_period: 30s
     networks:
       - eveai-network
+    restart: "no"
 
   eveai_workers:
     image: josakola/eveai_workers:${EVEAI_VERSION:-latest}
@@ -93,14 +93,13 @@ services:
       - eveai_logs:/app/logs
       - crewai_storage:/app/crewai_storage
     depends_on:
-      db:
-        condition: service_healthy
       redis:
         condition: service_healthy
       minio:
         condition: service_healthy
     networks:
       - eveai-network
+    restart: "no"
 
   eveai_chat_workers:
     image: josakola/eveai_chat_workers:${EVEAI_VERSION:-latest}
@@ -113,12 +112,11 @@ services:
       - eveai_logs:/app/logs
       - crewai_storage:/app/crewai_storage
     depends_on:
-      db:
-        condition: service_healthy
       redis:
         condition: service_healthy
     networks:
       - eveai-network
+    restart: "no"
 
   eveai_api:
     image: josakola/eveai_api:${EVEAI_VERSION:-latest}
@@ -133,8 +131,6 @@ services:
       - eveai_logs:/app/logs
       - crewai_storage:/app/crewai_storage
     depends_on:
-      db:
-        condition: service_healthy
       redis:
         condition: service_healthy
       minio:
@@ -147,6 +143,7 @@ services:
       start_period: 30s
     networks:
       - eveai-network
+    restart: "no"
 
   eveai_beat:
     image: josakola/eveai_beat:${EVEAI_VERSION:-latest}
@@ -161,6 +158,7 @@ services:
         condition: service_healthy
     networks:
       - eveai-network
+    restart: "no"
 
   eveai_entitlements:
     image: josakola/eveai_entitlements:${EVEAI_VERSION:-latest}
@@ -173,39 +171,17 @@ services:
       - eveai_logs:/app/logs
       - crewai_storage:/app/crewai_storage
     depends_on:
-      db:
-        condition: service_healthy
       redis:
         condition: service_healthy
       minio:
         condition: service_healthy
     networks:
       - eveai-network
-
-  db:
-    hostname: db
-    image: ankane/pgvector
-    ports:
-      - 5432:5432
-    restart: always
-    environment:
-      - POSTGRES_DB=eveai
-      - POSTGRES_USER=luke
-      - POSTGRES_PASSWORD=Skywalker!
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-      - ./docker/db/init.sql:/docker-entrypoint-initdb.d/init.sql
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -d eveai -U luke" ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    networks:
-      - eveai-network
+    restart: "no"
 
   redis:
     image: redis:7.2.5
-    restart: always
+    restart: no
     ports:
       - "6379:6379"
     volumes:
@@ -228,6 +204,7 @@ services:
       - redis
     networks:
       - eveai-network
+    restart: "no"
 
   minio:
     image: minio/minio
@@ -251,14 +228,14 @@ services:
       start_period: 30s
     networks:
       - eveai-network
+    restart: "no"
 
   prometheus:
-    image: prom/prometheus:latest
+    image: josakola/prometheus:${EVEAI_VERSION:-latest}
     container_name: prometheus
     ports:
       - "9090:9090"
     volumes:
-      - ./docker/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
       - prometheusdata:/prometheus
     command:
       - '--config.file=/etc/prometheus/prometheus.yml'
@@ -266,7 +243,7 @@ services:
       - '--web.console.libraries=/etc/prometheus/console_libraries'
       - '--web.console.templates=/etc/prometheus/consoles'
       - '--web.enable-lifecycle'
-    restart: unless-stopped
+    restart: no
     networks:
       - eveai-network
 
@@ -279,18 +256,17 @@ services:
       - eveai-network
 
   grafana:
-    image: grafana/grafana:latest
+    image: josakola/grafana:${EVEAI_VERSION:-latest}
     container_name: grafana
     ports:
       - "3000:3000"
     volumes:
-      - ./docker/grafana/provisioning:/etc/grafana/provisioning
       - grafanadata:/var/lib/grafana
     environment:
       - GF_SECURITY_ADMIN_USER=admin
       - GF_SECURITY_ADMIN_PASSWORD=admin
       - GF_USERS_ALLOW_SIGN_UP=false
-    restart: unless-stopped
+    restart: no
     depends_on:
       - prometheus
     networks:

docker/grafana/Dockerfile

@@ -0,0 +1,13 @@
+FROM grafana/grafana:latest
+
+# Copy dashboard and datasource provisioning configurations
+COPY provisioning/dashboards /etc/grafana/provisioning/dashboards
+COPY provisioning/datasources /etc/grafana/provisioning/datasources
+
+# Set environment variables
+ENV GF_SECURITY_ADMIN_USER=admin
+ENV GF_SECURITY_ADMIN_PASSWORD=admin
+ENV GF_USERS_ALLOW_SIGN_UP=false
+
+# Expose the Grafana web interface
+EXPOSE 3000

docker/prometheus/Dockerfile

@@ -0,0 +1,13 @@
+FROM prom/prometheus:latest
+
+COPY prometheus.yml /etc/prometheus/prometheus.yml
+
+# Expose the Prometheus UI and metrics endpoint
+EXPOSE 9090
+
+# Run Prometheus with the config file
+CMD ["--config.file=/etc/prometheus/prometheus.yml", \
+     "--storage.tsdb.path=/prometheus", \
+     "--web.console.libraries=/etc/prometheus/console_libraries", \
+     "--web.console.templates=/etc/prometheus/consoles", \
+     "--web.enable-lifecycle"]