Merge branch 'dev' into tournoment

.gitignore

@@ -62,12 +62,4 @@ node_modules
 *.pem
 
 
-backend/output.json
-
-# my stuff
-
-backend/backend/settings.py
-backend/user_api/views.py
-docker/backend/backend.sh
-frontend/package.json
-.gitignore
+docker/data

docker-compose.yaml

@@ -15,7 +15,6 @@ services:
     #   - 4000:4000
     restart: unless-stopped
     command: npm start
-
   backend:
     container_name: backend
     env_file:
@@ -32,7 +31,6 @@ services:
     restart: unless-stopped
     depends_on:
       - db
-
   db:
     image: postgres
     container_name: database
@@ -43,7 +41,40 @@ services:
     ports:
       - "5432:5432"
     restart: unless-stopped
-
+
+  prometheus:
+    image: prom/prometheus
+    container_name: prometheus
+    user: "root:root"
+    ports:
+      - "9090:9090"
+    volumes:
+      - ./docker/prometheus/:/etc/prometheus/
+      - ./docker/data/prometheus-data:/prometheus
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--storage.tsdb.path=/prometheus/data'
+      - '--storage.tsdb.retention.time=30d'
+    restart: unless-stopped
+  postgres-exporter:
+    image: wrouesnel/postgres_exporter
+    container_name: postgres-exporter
+    environment:
+      - DATA_SOURCE_NAME=postgresql://transcend_user:transcend_pwd@db:5432/transcend_users_db?sslmode=disable
+    ports:
+      - "9187:9187"
+    restart: unless-stopped
+  grafana:
+    image: grafana/grafana-oss:latest
+    container_name: grafana
+    user: "root:root"
+    ports:
+      - '3200:3200'
+    volumes:
+      - ./docker/data/grafana-data:/var/lib/grafana
+      - ./docker/grafana/provisioning/:/etc/grafana/provisioning/
+      - ./docker/grafana/defaults.ini:/etc/grafana/grafana.ini:ro
+
   nginx:
     container_name: nginx
     env_file: