From b70dd0ed1386e9d243e7d8d8bb2e81e4ac4abff9 Mon Sep 17 00:00:00 2001 From: Nicolas Cantu Date: Sun, 21 Sep 2025 15:49:30 +0000 Subject: [PATCH] align for IA agents + grafana --- IA_agents/deploy.md | 1 + conf/nginx/dev4.4nkweb.com-https.conf | 20 ++++++++++---------- conf/nginx/dev4.4nkweb.com.conf | 22 +++++++++++----------- docker-compose.yml | 22 +++++++++++----------- 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/IA_agents/deploy.md b/IA_agents/deploy.md index d72179a..39123fe 100644 --- a/IA_agents/deploy.md +++ b/IA_agents/deploy.md @@ -136,6 +136,7 @@ Après le push sur la branche Git `ext` : N'attend pas infiniment le résultat des curls. Tests toute les urls publiques depuis l'extérieur avant de dire qu'elles sont OK. +Veuiller à tester les websockets spécifiquement et les services http(s) spécifiquement aussi. --- diff --git a/conf/nginx/dev4.4nkweb.com-https.conf b/conf/nginx/dev4.4nkweb.com-https.conf index 96dba03..c37ebc6 100644 --- a/conf/nginx/dev4.4nkweb.com-https.conf +++ b/conf/nginx/dev4.4nkweb.com-https.conf @@ -22,7 +22,7 @@ server { # Grafana - Interface de monitoring (DOIT être avant location /) location /grafana/ { - proxy_pass http://127.0.0.1:3005/; + proxy_pass http://localhost:3005/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -48,7 +48,7 @@ server { # Loki API - API de logs (DOIT être avant location /) location /loki/ { - proxy_pass http://127.0.0.1:3100/; + proxy_pass http://localhost:3100/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -90,7 +90,7 @@ server { # API de statut des services (DOIT être avant location /) location /status/api { - proxy_pass http://127.0.0.1:3006/api; + proxy_pass http://localhost:3006/api; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -113,7 +113,7 @@ server { # API backend - route /back/ vers /api/ du backend location ~* ^/back/(.*)$ { - proxy_pass http://127.0.0.1:8080/api/$1; + proxy_pass http://localhost:8080/api/$1; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -150,7 +150,7 @@ server { add_header Access-Control-Allow-Headers "Content-Type, x-session-id, Authorization" always; add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" always; - proxy_pass http://127.0.0.1:8080/api/; + proxy_pass http://localhost:8080/api/; include /etc/nginx/proxy_params; proxy_read_timeout 300; proxy_connect_timeout 300; @@ -159,7 +159,7 @@ server { # WebSocket relay (sdk_relay) location /ws/ { - proxy_pass http://127.0.0.1:8090/; + proxy_pass http://localhost:8090/; proxy_set_header Sec-WebSocket-Key $http_sec_websocket_key; proxy_set_header Sec-WebSocket-Version $http_sec_websocket_version; proxy_set_header Sec-WebSocket-Protocol $http_sec_websocket_protocol; @@ -176,7 +176,7 @@ server { # API de transfert de fonds location /api/v1/funds/ { - proxy_pass http://127.0.0.1:8080/api/v1/funds/; + proxy_pass http://localhost:8080/api/v1/funds/; include /etc/nginx/proxy_params; proxy_read_timeout 300; proxy_connect_timeout 300; @@ -191,13 +191,13 @@ server { # blindbit location /blindbit/ { - proxy_pass http://127.0.0.1:8000/; + proxy_pass http://localhost:8000/; include /etc/nginx/proxy_params; } # signer (sdk_signer) avec support WebSocket location /signer/ { - proxy_pass http://127.0.0.1:3001/; + proxy_pass http://localhost:3001/; include /etc/nginx/proxy_params; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; @@ -207,7 +207,7 @@ server { # ihm_client (root) - DOIT être en dernier location / { - proxy_pass http://127.0.0.1:3003; + proxy_pass http://localhost:3003; include /etc/nginx/proxy_params; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; diff --git a/conf/nginx/dev4.4nkweb.com.conf b/conf/nginx/dev4.4nkweb.com.conf index a41ddc1..0b0a67e 100644 --- a/conf/nginx/dev4.4nkweb.com.conf +++ b/conf/nginx/dev4.4nkweb.com.conf @@ -15,7 +15,7 @@ server { # API backend - route /back/ vers /api/ du backend location ~* ^/back/(.*)$ { - proxy_pass http://127.0.0.1:8080/api/$1; + proxy_pass http://localhost:8080/api/$1; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -52,7 +52,7 @@ server { add_header Access-Control-Allow-Headers "Content-Type, x-session-id, Authorization" always; add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" always; - proxy_pass http://127.0.0.1:8080/api/; + proxy_pass http://localhost:8080/api/; include /etc/nginx/proxy_params; proxy_read_timeout 300; proxy_connect_timeout 300; @@ -80,7 +80,7 @@ server { add_header Access-Control-Allow-Headers "Content-Type, x-session-id, Authorization" always; add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" always; - proxy_pass http://127.0.0.1:8080/api/v1/$1; + proxy_pass http://localhost:8080/api/v1/$1; include /etc/nginx/proxy_params; proxy_read_timeout 300; proxy_connect_timeout 300; @@ -89,7 +89,7 @@ server { # WebSocket relay (sdk_relay) location /ws/ { - proxy_pass http://127.0.0.1:8090/; + proxy_pass http://localhost:8090/; proxy_set_header Sec-WebSocket-Key $http_sec_websocket_key; proxy_set_header Sec-WebSocket-Version $http_sec_websocket_version; proxy_set_header Sec-WebSocket-Protocol $http_sec_websocket_protocol; @@ -106,7 +106,7 @@ server { # API de transfert de fonds location /api/v1/funds/ { - proxy_pass http://127.0.0.1:8080/api/v1/funds/; + proxy_pass http://localhost:8080/api/v1/funds/; include /etc/nginx/proxy_params; proxy_read_timeout 300; proxy_connect_timeout 300; @@ -115,7 +115,7 @@ server { # Grafana - Interface de monitoring (DOIT être avant location /) location /grafana/ { - proxy_pass http://127.0.0.1:3005/; + proxy_pass http://localhost:3005/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -141,7 +141,7 @@ server { # Loki API - API de logs (DOIT être avant location /) location /loki/ { - proxy_pass http://127.0.0.1:3100/; + proxy_pass http://localhost:3100/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -183,7 +183,7 @@ server { # API de statut des services (DOIT être avant location /) location /status/api { - proxy_pass http://127.0.0.1:3006/api; + proxy_pass http://localhost:3006/api; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -206,7 +206,7 @@ server { # ihm_client (root) - DOIT être en dernier location / { - proxy_pass http://127.0.0.1:3003; + proxy_pass http://localhost:3003; include /etc/nginx/proxy_params; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; @@ -251,13 +251,13 @@ server { # blindbit location /blindbit/ { - proxy_pass http://127.0.0.1:8000/; + proxy_pass http://localhost:8000/; include /etc/nginx/proxy_params; } # signer (sdk_signer) avec support WebSocket location /signer/ { - proxy_pass http://127.0.0.1:3001/; + proxy_pass http://localhost:3001/; include /etc/nginx/proxy_params; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; diff --git a/docker-compose.yml b/docker-compose.yml index dee91ad..8c4f82f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,7 +52,7 @@ services: aliases: - blindbit ports: - - "127.0.0.1:8000:8000" + - "0.0.0.0:8000:8000" healthcheck: test: ["CMD-SHELL", "code=$(curl -s -o /dev/null -w '%{http_code}' http://localhost:8000/tweaks/1); [ \"$$code\" != \"000\" ]"] interval: 15s @@ -73,8 +73,8 @@ services: - ./scripts/funds:/scripts/funds:ro - ./logs/sdk_relay:/var/log/sdk_relay ports: - - "127.0.0.1:8090:8090" - - "127.0.0.1:8091:8091" + - "0.0.0.0:8090:8090" + - "0.0.0.0:8091:8091" networks: btcnet: aliases: @@ -101,7 +101,7 @@ services: env_file: - .env ports: - - "127.0.0.1:8080:8080" + - "0.0.0.0:8080:8080" volumes: - /var/run/docker.sock:/var/run/docker.sock - ./logs/lecoffre-back:/var/log/lecoffre-back @@ -134,7 +134,7 @@ services: env_file: - .env ports: - - "127.0.0.2:3004:3000" + - "0.0.0.0:3004:3000" volumes: - ./logs/lecoffre-front:/var/log/lecoffre-front networks: @@ -168,7 +168,7 @@ services: environment: - VITE_BOOTSTRAPURL=wss://dev4.4nkweb.com/ws/ ports: - - "127.0.0.1:3003:3003" + - "0.0.0.0:3003:3003" volumes: - ./logs/ihm_client:/var/log/ihm_client networks: @@ -198,7 +198,7 @@ services: image: git.4nkweb.com/4nk/sdk_signer:ext container_name: sdk_signer ports: - - "127.0.0.1:3001:9090" + - "0.0.0.0:3001:9090" volumes: - ./logs/sdk_signer:/var/log/sdk_signer networks: @@ -223,7 +223,7 @@ services: image: git.4nkweb.com/4nk/sdk_storage:ext container_name: sdk_storage ports: - - "127.0.0.1:8081:8080" + - "0.0.0.0:8081:8080" volumes: - ./logs/sdk_storage:/var/log/sdk_storage healthcheck: @@ -273,7 +273,7 @@ services: image: grafana/grafana:latest container_name: grafana ports: - - "127.0.0.1:3005:3000" + - "0.0.0.0:3005:3000" volumes: - grafana_data:/var/lib/grafana - ./conf/grafana/provisioning:/etc/grafana/provisioning @@ -297,7 +297,7 @@ services: image: grafana/loki:latest container_name: loki ports: - - "127.0.0.1:3100:3100" + - "0.0.0.0:3100:3100" volumes: - loki_data:/loki command: -config.file=/etc/loki/local-config.yaml @@ -328,7 +328,7 @@ services: dockerfile: Dockerfile.python container_name: status-api ports: - - "127.0.0.1:3006:3006" + - "0.0.0.0:3006:3006" volumes: - ./web/status/api.py:/app/api.py:ro networks: