From 162fc9148f18f7edafff5f968901c0571a7ec70d Mon Sep 17 00:00:00 2001
From: GitBluub <louis.auzuret@gmail.com>
Date: Wed, 20 Sep 2023 00:26:15 +0200
Subject: [PATCH] grafana: auto setup of dashboard

---
 .gitignore                                           |  1 +
 config/loki-config.yaml                              |  5 ++++-
 docker-compose.dev.yml                               |  9 +++++++++
 docker-compose.prod.yml                              |  9 ++++++++-
 docker-compose.yml                                   |  5 +++++
 grafana/dashboard.yaml                               | 12 ++++++++++++
 .../dashboards}/grafana_dashboard.json               |  2 +-
 7 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 grafana/dashboard.yaml
 rename {config => grafana/dashboards}/grafana_dashboard.json (98%)

diff --git a/.gitignore b/.gitignore
index 378d91e..d960e6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ log.html
 node_modules/
 ./front/coverage
 .venv
+.data
diff --git a/config/loki-config.yaml b/config/loki-config.yaml
index 775db58..d87373f 100644
--- a/config/loki-config.yaml
+++ b/config/loki-config.yaml
@@ -1,4 +1,5 @@
 ---
+auth_enabled: false
 server:
   http_listen_port: 3100
 memberlist:
@@ -22,11 +23,13 @@ common:
       insecure: true
       bucketnames: loki-data
       access_key_id: loki
-      secret_access_key: supersecret
+      secret_access_key: 12345678
       s3forcepathstyle: true
   ring:
     kvstore:
       store: memberlist
+query_range:
+  parallelise_shardable_queries: false
 ruler:
   storage:
     s3:
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 18c6255..03ace4e 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,6 +1,9 @@
 networks:
   loki:
 
+volumes:
+  scoro_logs:
+
 
 services:
   back:
@@ -28,6 +31,9 @@ services:
     volumes:
       - ./scorometer:/app
       - ./assets:/assets
+      - scoro_logs:/logs
+    networks:
+      - loki
 
   db:
     container_name: db
@@ -166,6 +172,9 @@ services:
         /run.sh
     ports:
       - "3001:3000"
+    volumes:
+      - ./grafana/dashboard.yaml:/etc/grafana/provisioning/dashboards/main.yaml
+      - ./grafana/dashboards:/var/lib/grafana/dashboards
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3001/api/health || exit 1" ]
       interval: 10s
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 7c5ae80..49ae9bf 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,6 +1,9 @@
 networks:
   loki:
 
+volumes:
+  scoro_logs:
+
 services:
   back:
     image: ghcr.io/chroma-case/back:main
@@ -18,13 +21,14 @@ services:
     ports:
       - "6543:6543"
     volumes:
+      - scoro_logs:/logs
       - ./assets:/assets
   db:
     container_name: db
     image: postgres:alpine3.14
     environment:
       - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORDgrafana}
       - POSTGRES_DB=${POSTGRES_DB}
     ports:
       - "5432:5432"
@@ -154,6 +158,9 @@ services:
         /run.sh
     ports:
       - "3001:3000"
+    volumes:
+      - ./grafana/dashboard.yaml:/etc/grafana/provisioning/dashboards/main.yaml
+      - ./grafana/dashboards:/var/lib/grafana/dashboards
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3001/api/health || exit 1" ]
       interval: 10s
diff --git a/docker-compose.yml b/docker-compose.yml
index e297fe7..aaed689 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,7 @@ networks:
 
 volumes:
   db:
+  scoro_logs:
 
 
 services:
@@ -24,6 +25,7 @@ services:
       - "6543:6543"
     volumes:
       - ./assets:/assets
+      - scoro_logs:/logs
   db:
     container_name: db
     image: postgres:alpine3.14
@@ -165,6 +167,9 @@ services:
         /run.sh
     ports:
       - "3001:3000"
+    volumes:
+      - ./grafana/dashboard.yaml:/etc/grafana/provisioning/dashboards/main.yaml
+      - ./grafana/dashboards:/var/lib/grafana/dashboards
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3001/api/health || exit 1" ]
       interval: 10s
diff --git a/grafana/dashboard.yaml b/grafana/dashboard.yaml
new file mode 100644
index 0000000..57d3797
--- /dev/null
+++ b/grafana/dashboard.yaml
@@ -0,0 +1,12 @@
+apiVersion: 1
+
+providers:
+  - name: "Dashboard provider"
+    orgId: 1
+    type: file
+    disableDeletion: false
+    updateIntervalSeconds: 10
+    allowUiUpdates: false
+    options:
+      path: /var/lib/grafana/dashboards
+      foldersFromFilesStructure: true
\ No newline at end of file
diff --git a/config/grafana_dashboard.json b/grafana/dashboards/grafana_dashboard.json
similarity index 98%
rename from config/grafana_dashboard.json
rename to grafana/dashboards/grafana_dashboard.json
index 05978fd..208a79f 100644
--- a/config/grafana_dashboard.json
+++ b/grafana/dashboards/grafana_dashboard.json
@@ -165,7 +165,7 @@
 			  "uid": "P8E80F9AEF21F6940"
 			},
 			"editorMode": "code",
-			"expr": "{container=\"chromacase-front-1\"} | json | userId = `$userId`",
+			"expr": "{container=\"chromacase-front-1\"} | json",
 			"key": "Q-a2f514d0-81a4-4c43-a260-bad7add20957-1",
 			"queryType": "range",
 			"refId": "B"