Tidy-up on config

.config/grafana/datasources/datasource.yml

@@ -27,7 +27,10 @@ datasources:
     basicAuth: false
     isDefault: false
     version: 1
-    editable: false
+    editable: true
+    jsonData:
+      # The recommended scrape interval is 60s.
+      timeInterval: '60s'
 
   - name: Loki
     type: loki
@@ -43,4 +46,25 @@ datasources:
         - datasourceUid: tempo
           matcherRegex: tid=(\w+)
           name: TraceID
-          url: $${__value.raw}
+          url: $${__value.raw}
+
+  - name: Tempo
+    type: tempo
+    access: proxy
+    orgId: 1
+    url: http://tempo:3200
+    basicAuth: false
+    isDefault: false
+    version: 1
+    editable: true
+    apiVersion: 1
+    uid: tempo
+  - name: Pyroscope
+    type: grafana-pyroscope-datasource
+    access: proxy
+    orgId: 1
+    url: http://pyroscope:4040/
+    basicAuth: false
+    isDefault: false
+    version: 1
+    editable: true

docker-compose.yml

@@ -1,9 +1,6 @@
-include:
-  - ./docker-compose/databases.yml
-
 services:
   grafana:
-    container_name: grafana-aitraining-app
+    container_name: grafana-with-training-app
     image: grafana/grafana-oss:11.1.3
     environment:
       - GF_DEFAULT_APP_MODE=development # Ideally this should be moved to grafana.ini
@@ -19,6 +16,12 @@ services:
       sh -c "sed -i 's/<\/body><\/html>/<script src=\"http:\/\/localhost:35729\/livereload.js\"><\/script><\/body><\/html>/g' /usr/share/grafana/public/views/index.html && /run.sh"
     ports:
       - "3000:3000"
+    depends_on:
+      - mimir
+      - loki
+      - pyroscope
+      - tempo
+      - ai-training-api
 
   db:
     image: mysql:8.0
@@ -44,6 +47,42 @@ services:
     depends_on:
       - db
 
+  mimir:
+    image: grafana/mimir:2.12.0
+    restart: on-failure
+    command:
+      - -config.file=/etc/mimir-config/mimir.yml
+    volumes:
+      - ./.config/mimir:/etc/mimir-config
+    ports:
+      - "9009:9009"
+
+  loki:
+    image: grafana/loki:3.0.0
+    restart: on-failure
+    ports:
+      - "3100:3100"
+
+  tempo:
+    image: grafana/tempo:2.4.1
+    restart: on-failure
+    command:
+      - "-storage.trace.backend=local"                  # tell tempo where to permanently put traces
+      - "-storage.trace.local.path=/tmp/tempo/traces"
+      - "-storage.trace.wal.path=/tmp/tempo/wal"        # tell tempo where to store the wal
+      - "-auth.enabled=false"                           # disables the requirement for the X-Scope-OrgID header
+      - "-server.http-listen-port=3200"
+    ports:
+      - "3200:3200"
+      - "4317:4317"
+
+  pyroscope:
+    image: grafana/pyroscope:1.5.0
+    restart: on-failure
+    ports:
+      - "4040:4040"
+
+
 networks:
   shared-network:
     name: my-shared-network