Merge branch 'main' into patch-1

keephq · Dec 29, 2024 · 93ee2c0 · 93ee2c0
2 parents 2ebba1e + a04c6b1
commit 93ee2c0
Show file tree

Hide file tree

Showing 22 changed files with 1,003 additions and 226 deletions.
diff --git a/.gitignore b/.gitignore
@@ -216,3 +216,6 @@ keepnew.db
 providers_cache.json
 
 tests/provision/*
+grafana/*
+!grafana/provisioning/
+!grafana/dashboards/
diff --git a/STRESS.md b/STRESS.md
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -26,3 +26,33 @@ services:
     extends:
       file: docker-compose.common.yml
       service: keep-websocket-server-common
+
+  grafana:
+    image: grafana/grafana:latest
+    profiles:
+      - grafana
+    ports:
+      - "3001:3000"
+    volumes:
+      - ./grafana:/var/lib/grafana
+      - ./grafana/provisioning:/etc/grafana/provisioning
+      - ./grafana/dashboards:/etc/grafana/dashboards
+    environment:
+      - GF_SECURITY_ADMIN_USER=admin
+      - GF_SECURITY_ADMIN_PASSWORD=admin
+      - GF_USERS_ALLOW_SIGN_UP=false
+    depends_on:
+      - prometheus
+
+  prometheus:
+    image: prom/prometheus:latest
+    profiles:
+      - grafana
+    ports:
+      - "9090:9090"
+    volumes:
+      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+    command:
+      - "--config.file=/etc/prometheus/prometheus.yml"
+    depends_on:
+      - keep-backend