Merge pull request #195 from PROCOLLAB-github/dev

Grafana, nginx, logs

Author: yakser

Dockerfile

@@ -22,8 +22,6 @@ COPY poetry.lock pyproject.toml /procollab/
 RUN poetry config virtualenvs.create false \
     && poetry install  --no-root
 
-EXPOSE 8000
-
 RUN mkdir /procollab/staticfiles
 RUN mkdir /procollab/static
 

docker-compose.dev-ci.yml

@@ -1,5 +1,5 @@
 version: '3.9'
-
+ 
 services:
   web:
     container_name: web
@@ -14,11 +14,13 @@ services:
       - .env
     environment:
       HOST: 0.0.0.0
+    expose:
+      - 8000
   grafana:
     container_name: grafana
     image: grafana/grafana:latest
-    ports:
-      - "3000"
+    expose:
+      - 3000
     volumes:
       - grafana-data:/var/lib/grafana
       - grafana-configs:/etc/grafana
@@ -28,16 +30,16 @@ services:
   prometheus:
     container_name: prometheus
     image: prom/prometheus:v2.36.0
-    ports:
-      - "9090"
+    expose:
+      - 9090
     volumes:
       - prom-data:/prometheus
       - ./prometheus:/etc/prometheus
   node-exporter:
     container_name: node-exporter
     image: prom/node-exporter:v1.3.1
-    ports:
-      - "9100"
+    expose:
+      - 9100
     volumes:
       - /proc:/host/proc:ro
       - /sys:/host/sys:ro
@@ -50,11 +52,13 @@ services:
   nginx:
     container_name: nginx
     build: ./nginx
+    depends_on:
+      - web
     ports:
       - 8000:80
 volumes:
   grafana-data:
   grafana-configs:
   prom-data:
   prom-configs:
-  log:
+  log:

docker-compose.prod-ci.yml

@@ -1,17 +1,64 @@
-version: "3.4"
+version: '3.9'
+
 services:
-  server:
-    ports:
-      - "8000:8000"
+  web:
+    container_name: web
+    build:
+      context: .
+      dockerfile: ./Dockerfile
     image: ghcr.io/procollab-github/api:latest
+    restart: always
+    volumes:
+      - log:/procollab/log
     env_file:
       - .env
-    restart: always
-    networks:
-      template-network:
-
-networks:
-  template-network:
-
+    environment:
+      HOST: 0.0.0.0
+    expose:
+      - 8000
+  grafana:
+    container_name: grafana
+    image: grafana/grafana:latest
+    expose:
+      - 3000
+    volumes:
+      - grafana-data:/var/lib/grafana
+      - grafana-configs:/etc/grafana
+    environment:
+      - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s:%(http_port)s/grafana
+      - GF_SERVER_SERVE_FROM_SUB_PATH=true
+  prometheus:
+    container_name: prometheus
+    image: prom/prometheus:v2.36.0
+    expose:
+      - 9090
+    volumes:
+      - prom-data:/prometheus
+      - ./prometheus:/etc/prometheus
+  node-exporter:
+    container_name: node-exporter
+    image: prom/node-exporter:v1.3.1
+    expose:
+      - 9100
+    volumes:
+      - /proc:/host/proc:ro
+      - /sys:/host/sys:ro
+      - /:/rootfs:ro
+    command:
+      - '--path.procfs=/host/proc'
+      - '--path.sysfs=/host/sys'
+      - '--collector.filesystem.mount-points-exclude'
+      - '^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)'
+  nginx:
+    container_name: nginx
+    build: ./nginx
+    depends_on:
+      - web
+    ports:
+      - 8000:80
 volumes:
-  db-volume:
+  grafana-data:
+  grafana-configs:
+  prom-data:
+  prom-configs:
+  log:

docker-compose.yml

@@ -14,11 +14,13 @@ services:
       - .env
     environment:
       HOST: 0.0.0.0
+    expose:
+      - 8000
   grafana:
     container_name: grafana
     image: grafana/grafana:latest
-    ports:
-      - "3000"
+    expose:
+      - 3000
     volumes:
       - grafana-data:/var/lib/grafana
       - grafana-configs:/etc/grafana
@@ -28,16 +30,16 @@ services:
   prometheus:
     container_name: prometheus
     image: prom/prometheus:v2.36.0
-    ports:
-      - "9090"
+    expose:
+      - 9090
     volumes:
       - prom-data:/prometheus
       - ./prometheus:/etc/prometheus
   node-exporter:
     container_name: node-exporter
     image: prom/node-exporter:v1.3.1
-    ports:
-      - "9100"
+    expose:
+      - 9100
     volumes:
       - /proc:/host/proc:ro
       - /sys:/host/sys:ro
@@ -50,6 +52,8 @@ services:
   nginx:
     container_name: nginx
     build: ./nginx
+    depends_on:
+      - web
     ports:
       - 8000:80
 volumes:

nginx/Dockerfile

@@ -1,4 +1,4 @@
 FROM nginx:1.21-alpine
 
 RUN rm /etc/nginx/conf.d/default.conf
-COPY nginx.conf /etc/nginx/conf.d
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf

nginx/nginx.conf

@@ -16,4 +16,4 @@ server {
         proxy_pass         http://grafana:3000;
         proxy_set_header   Host $host;
     }
-}
+}

procollab/settings.py

@@ -335,7 +335,7 @@
 LOGURU_LOGGING = {
     "rotation": "300 MB",
     "compression": "zip",
-    "retention": "10 days",
+    "retention": "60 days",
     "enqueue": True,
 }