diff --git a/devenv/datasources.yaml b/devenv/datasources.yaml
index a264bb503bd..d4457faaebf 100644
--- a/devenv/datasources.yaml
+++ b/devenv/datasources.yaml
@@ -152,4 +152,10 @@ datasources:
       authType: credentials
       defaultRegion: eu-west-2
 
+  - name: gdev-loki
+    type: loki
+    access: proxy
+    url: http://localhost:3100
+    editable: false
+
 
diff --git a/devenv/docker/blocks/loki/docker-compose.yaml b/devenv/docker/blocks/loki/docker-compose.yaml
new file mode 100644
index 00000000000..d6cf21f7856
--- /dev/null
+++ b/devenv/docker/blocks/loki/docker-compose.yaml
@@ -0,0 +1,22 @@
+version: "3"
+
+networks:
+  loki:
+
+services:
+  loki:
+    image: grafana/loki:master
+    ports:
+      - "3100:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+    networks:
+      - loki
+
+  promtail:
+    image: grafana/promtail:master
+    volumes:
+      - /var/log:/var/log
+    command:
+      -config.file=/etc/promtail/docker-config.yaml
+    networks:
+      - loki