update

docker-compose.yaml

@@ -43,7 +43,7 @@ services:
 
   tempo:
     image: grafana/tempo:2.3.1
-    command: [ "-config.file=/etc/tempo/config.yaml" ]
+    command: ["-config.file=/etc/tempo/config.yaml"]
     depends_on:
       - prometheus
     volumes:
@@ -79,47 +79,16 @@ services:
       GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_STRICT: "true"
     volumes:
       - grafana_data:/var/lib/grafana
+      - ./grafana/datasources.yaml:/etc/grafana/provisioning/datasources/ds.yaml
     ports:
       - ${GRAFANA_PORT}:3000
-    entrypoint:
-      - sh
-      - -euc
-      - |
-        mkdir -p /etc/grafana/provisioning/datasources
-        cat <<EOF > /etc/grafana/provisioning/datasources/ds.yaml
-        apiVersion: 1
-        datasources:
-        - name: Loki
-          type: loki
-          access: proxy 
-          orgId: 1
-          url: http://loki:3100
-          basicAuth: false
-          isDefault: false
-          version: 1
-          editable: false
-        - name: Prometheus
-          type: prometheus
-          access: proxy
-          orgId: 1
-          url: http://prometheus:9090
-          basicAuth: false
-          isDefault: false
-          version: 1
-          editable: false
-        - name: Tempo
-          type: tempo
-          access: proxy
-          orgId: 1
-          url: http://tempo:3200
-          basicAuth: false
-          isDefault: false
-          version: 1
-          editable: false
-          jsonData:
-            httpMethod: GET
-        EOF
-        /run.sh
+    networks:
+      - default
+      - www
+
+networks:
+  www:
+    external: true
 
 volumes:
   loki_data:

grafana/datasources.yaml

@@ -0,0 +1,31 @@
+apiVersion: 1
+datasources:
+  - name: Loki
+    type: loki
+    access: proxy
+    orgId: 1
+    url: http://loki:3100
+    basicAuth: false
+    isDefault: false
+    version: 1
+    editable: false
+  - name: Prometheus
+    type: prometheus
+    access: proxy
+    orgId: 1
+    url: http://prometheus:9090
+    basicAuth: false
+    isDefault: false
+    version: 1
+    editable: false
+  - name: Tempo
+    type: tempo
+    access: proxy
+    orgId: 1
+    url: http://tempo:3200
+    basicAuth: false
+    isDefault: false
+    version: 1
+    editable: false
+    jsonData:
+      httpMethod: GET