Feature/logging prometheus

docker-compose.yml

@@ -2,14 +2,55 @@ version: '3.9'
 
 services:
   web:
+    container_name: web
     build:
       context: .
       dockerfile: ./Dockerfile
-    ports:
-      - "8000:8000"
     image: ghcr.io/procollab-github/api:latest
     restart: always
     env_file:
       - .env
     environment:
-      HOST: 0.0.0.0
+      HOST: 0.0.0.0
+  grafana:
+    container_name: grafana
+    image: grafana/grafana:latest
+    ports:
+      - "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
+    ports:
+      - "9090"
+    volumes:
+      - prom-data:/prometheus
+      - ./prometheus:/etc/prometheus
+  node-exporter:
+    image: prom/node-exporter:v1.3.1
+    ports:
+      - "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
+    ports:
+      - 8000:80
+volumes:
+  grafana-data:
+  grafana-configs:
+  prom-data:
+  prom-configs:

nginx/Dockerfile

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

nginx/nginx.conf

@@ -0,0 +1,19 @@
+server {
+
+    listen 80;
+
+    server_name api.procollab.ru;
+    client_max_body_size 100M;
+
+    location / {
+        proxy_pass http://web:8000;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $host;
+        proxy_redirect off;
+    }
+
+    location /grafana {
+        proxy_pass         http://grafana:3000;
+        proxy_set_header   Host $host;
+    }
+}

procollab/settings.py

@@ -6,6 +6,7 @@
 from decouple import config
 from sentry_sdk.integrations.django import DjangoIntegration
 
+
 mimetypes.add_type("application/javascript", ".js", True)
 mimetypes.add_type("text/css", ".css", True)
 mimetypes.add_type("text/html", ".html", True)
@@ -26,7 +27,9 @@
 TAGGIT_CASE_INSENSITIVE = True
 
 CSRF_TRUSTED_ORIGINS = [
-    "http://localhost",
+    "http://localhost:8000",
+    "http://127.0.0.1:8000",
+    "http://0.0.0.0:8000",
     "https://api.procollab.ru",
     "https://procollab.ru",
     "https://www.procollab.ru",
@@ -40,7 +43,9 @@
     "0.0.0.0",
     "api.procollab.ru",
     "app.procollab.ru",
+    "dev.procollab.ru",
     "procollab.ru",
+    "web",  # From Docker
 ]
 
 PASSWORD_HASHERS = [
@@ -99,9 +104,11 @@
     "drf_yasg",
     "channels",
     "taggit",
+    "django_prometheus",
 ]
 
 MIDDLEWARE = [
+    "django_prometheus.middleware.PrometheusBeforeMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "whitenoise.middleware.WhiteNoiseMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
@@ -112,6 +119,7 @@
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "debug_toolbar.middleware.DebugToolbarMiddleware",
+    "django_prometheus.middleware.PrometheusAfterMiddleware",
 ]
 
 # CORS_ALLOWED_ORIGINS = [
@@ -169,14 +177,15 @@
 if DEBUG:
     DATABASES = {
         "default": {
-            "ENGINE": "django.db.backends.sqlite3",
+            "ENGINE": "django_prometheus.db.backends.sqlite3",
             "NAME": "db.sqlite3",
         }
     }
 
     CACHES = {
         "default": {
-            "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+            "BACKEND": "django_prometheus.cache.backends.filebased.FileBasedCache",
+            "LOCATION": "/var/tmp/django_cache",
         }
     }
 
@@ -215,7 +224,7 @@
 
     DATABASES = {
         "default": {
-            "ENGINE": "django.db.backends.postgresql",
+            "ENGINE": "django_prometheus.db.backends.postgresql",
             "NAME": config("DATABASE_NAME", default="postgres", cast=str),
             "USER": config("DATABASE_USER", default="postgres", cast=str),
             "PASSWORD": config("DATABASE_PASSWORD", default="postgres", cast=str),
@@ -313,3 +322,23 @@
 SELECTEL_CONTAINER_PASSWORD = config(
     "SELECTEL_CONTAINER_PASSWORD", cast=str, default="PWD"
 )
+
+PROMETHEUS_LATENCY_BUCKETS = (
+    0.01,
+    0.025,
+    0.05,
+    0.075,
+    0.1,
+    0.25,
+    0.5,
+    0.75,
+    1.0,
+    2.5,
+    5.0,
+    7.5,
+    10.0,
+    25.0,
+    50.0,
+    75.0,
+    float("inf"),
+)

procollab/urls.py

@@ -51,6 +51,7 @@
     path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"),
     path("api/token/verify/", TokenVerifyView.as_view(), name="token_verify"),
     path("", include("metrics.urls", namespace="metrics")),
+    path("django_prometheus/", include("django_prometheus.urls")),
 ]
 
 if settings.DEBUG:

prometheus/prometheus.yml

@@ -0,0 +1,10 @@
+global:
+  scrape_interval: 15s
+  evaluation_interval: 15s
+
+scrape_configs:
+  - job_name: monitoring
+    metrics_path: /django_prometheus/metrics
+    static_configs:
+      - targets:
+        - web:8000

pyproject.toml

@@ -58,6 +58,7 @@ python-magic = "^0.4.27"
 python-magic-bin = {version = "^0.4.14", markers = "sys_platform == 'win32'"}
 requests = "^2.31.0"
 coreapi = "^2.3.3"
+django-prometheus = "^2.3.1"
 
 
 [build-system]

users/migrations/0039_alter_customuser_first_name_and_more.py

@@ -0,0 +1,38 @@
+# Generated by Django 4.2.3 on 2023-07-25 20:49
+
+from django.db import migrations, models
+import users.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0038_alter_customuser_options_customuser_ordering_score"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="customuser",
+            name="first_name",
+            field=models.CharField(
+                max_length=255, validators=[users.validators.user_name_validator]
+            ),
+        ),
+        migrations.AlterField(
+            model_name="customuser",
+            name="last_name",
+            field=models.CharField(
+                max_length=255, validators=[users.validators.user_name_validator]
+            ),
+        ),
+        migrations.AlterField(
+            model_name="customuser",
+            name="patronymic",
+            field=models.CharField(
+                blank=True,
+                max_length=255,
+                null=True,
+                validators=[users.validators.user_name_validator],
+            ),
+        ),
+    ]