comments and container names added while debugging prometheus

docker-compose-deploy.yml

@@ -22,6 +22,7 @@ services:
       - main
 
   db:
+    container_name: db
     image: postgres:13-alpine
     restart: always
     volumes:
@@ -39,6 +40,7 @@ services:
       - main
 
   prometheus:
+    container_name: prometheus
     image: prom/prometheus
     volumes:
       - ./prometheus:/etc/prometheus
@@ -48,6 +50,7 @@ services:
       - main
 
   proxy:
+    container_name: proxy
     build:
       context: ./proxy
     restart: always

docker-compose.yml

@@ -30,6 +30,7 @@ services:
       - main
 
   db:
+    container_name: db
     image: postgres:13-alpine
     volumes:
       - dev-db-data:/var/lib/postgresql/data
@@ -48,6 +49,7 @@ services:
       - main
 
   prometheus:
+    container_name: prometheus
     image: prom/prometheus
     volumes:
       - ./prometheus:/etc/prometheus

prometheus/prometheus.yml

@@ -6,7 +6,13 @@ scrape_configs:
   - job_name: 'monitoring'
     metrics_path: /metrics
     static_configs:
-      - targets: [
-        'prometheus:9090',
-        'app:8000',  # can specify an IP
-        ]
+      - targets: ['app:8000']  # can specify an IP
+        # 127.0.0.1:8000 is http://cded26fdc423:8000/metrics
+        # app:8000 is http://app:8000/metrics
+        # for local deployment 'app:8000 works correctly'
+        # 172.27.0.1:8000 times out
+        # host.docker.internal:8000 400 bad request
+
+  - job_name: 'prometheus'
+    static_configs:
+      - targets: ['prometheus:9090']

proxy/default.conf.tpl

@@ -1,13 +1,19 @@
+{* pass in environment variables to nginx at runtime *}
+
 server {
+    {* port server will listen on *}
     listen ${LISTEN_PORT};
 
+    {* map /static url to /vol/static in system *}
     location /static {
         alias /vol/static;
     }
 
+    {* map the rest of the urls *}
     location / {
         uwsgi_pass              ${APP_HOST}:${APP_PORT};
         include                 /etc/nginx/uwsgi_params;
         client_max_body_size    10M;
+        {* proxy_pass           http://app:8000; *}
     }
 }

proxy/run.sh

@@ -3,4 +3,4 @@
 set -e
 
 envsubst < /etc/nginx/default.conf.tpl > /etc/nginx/conf.d/default.conf
-nginx -g 'daemon off;'
+nginx -g 'daemon off;'  # run nginx in the foreground with daemon off to ensure logs are output to screen

scripts/run.sh

@@ -7,4 +7,5 @@ python manage.py collectstatic --noinput
 python manage.py migrate
 python manage.py load_msisdn_data
 
+# run uwsgi service, on tcp socket, port 9000
 uwsgi --socket :9000 --workers 4 --master --enable-threads --module app.wsgi