Merge pull request #17 from thomasdesplaces/feature/4-create-dashboar…

…ds-for-these-application-stack Add FastAPI & Postgres dashboard in Grafana
thomasdesplaces · Mar 13, 2023 · e61ed79 · e61ed79
2 parents 8c8dc62 + 4f96725
commit e61ed79
Show file tree

Hide file tree

Showing 6 changed files with 2,389 additions and 1,061 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -72,8 +72,9 @@ services:
     volumes:
       - "./grafana/datasource.yaml:/etc/grafana/provisioning/datasources/default.yaml"
       - "./grafana/dashboard.yaml:/etc/grafana/provisioning/dashboards/default.yaml"
-      - "./grafana/catalogue.json:/var/lib/grafana/dashboards/catalogue.json"
-      - "./grafana/container_process.json:/var/lib/grafana/dashboards/container_process.json"
+      - "./grafana/fastapi.json:/var/lib/grafana/dashboards/fastapi.json"
+      - "./grafana/db.json:/var/lib/grafana/dashboards/db.json"
+      #- "./grafana/container_process.json:/var/lib/grafana/dashboards/container_process.json"
       - "./grafana/config.ini:/etc/grafana/grafana.ini"
     labels:
       namespace: monitoring

diff --git a/generate_data_application/backend/app/clients.py b/generate_data_application/backend/app/clients.py
@@ -19,7 +19,7 @@
 from observability import (
     LOGGER,
     tracer
-)   
+)
 
 
 

diff --git a/generate_data_application/backend/app/observability.py b/generate_data_application/backend/app/observability.py
@@ -153,4 +153,4 @@ def setting_otlp() -> TracerProvider():
 
     return tracer
 
-tracer = setting_otlp()
+tracer = setting_otlp()
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
     from observability import (
         LOGGER,
         tracer
-    )
+    )
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -153,4 +153,4 @@ def setting_otlp() -> TracerProvider():

		return tracer

		tracer = setting_otlp()
		tracer = setting_otlp()