fix: Set up grafana datasource and apply small fixes

julep-ai · Oct 11, 2024 · b13cb6b · b13cb6b
1 parent 27905f1
commit b13cb6b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       - 3000:3000
     volumes:
       - grafana_data:/var/lib/grafana
+      - ./provisioning:/etc/grafana/provisioning
     profiles:
       - multi-tenant
 

diff --git a/grafana/grafana_data/.gitkeep b/grafana/grafana_data/.gitkeep
diff --git a/grafana/provisioning/datasources/datasource.yml b/grafana/provisioning/datasources/datasource.yml
@@ -0,0 +1,9 @@
+datasources:
+-  access: 'proxy'
+   editable: true
+   is_default: true
+   name: 'agents-api'
+   org_id: 1
+   type: 'prometheus'
+   url: 'http://prometheus:9090'
+   version: 1           
diff --git a/prometheus/prometheus_data/prometheus.yml → prometheus/config/prometheus.yml b/prometheus/prometheus_data/prometheus.yml → prometheus/config/prometheus.yml
@@ -12,7 +12,7 @@ alerting:
     static_configs:
     - targets: []
 scrape_configs:
-- job_name: prometheus
+- job_name: agents-api
   honor_timestamps: true
   scrape_interval: 15s
   scrape_timeout: 10s
@@ -21,9 +21,4 @@ scrape_configs:
   follow_redirects: true
   static_configs:
   - targets:
-    - localhost:9090
-- job_name: 'fastapi'
-  scrape_interval: 10s
-  metrics_path: /metrics
-  static_configs:
-    - targets: ['http://agents-api-multi-tenant:8080']
+    - agents-api-multi-tenant:8080
diff --git a/prometheus/docker-compose.yml b/prometheus/docker-compose.yml
@@ -6,16 +6,18 @@ services:
     container_name: prometheus
     profiles:
       - multi-tenant
-
-    ports:
-      - 11000:9090
 
     volumes:
-      - ./prometheus_data/prometheus.yml:/etc/prometheus/prometheus.yml
+      - ./config/prometheus.yml:/etc/prometheus/prometheus.yml
+      - prometheus_data:/prometheus
 
     depends_on:
       agents-api-multi-tenant:
         condition: service_started
 
     command:
       - '--config.file=/etc/prometheus/prometheus.yml'
+
+volumes:
+  prometheus_data:
+    external: true