From 36ff6d8635f9d298281018d33680be050f3b0968 Mon Sep 17 00:00:00 2001
From: David <david.kaltschmidt@gmail.com>
Date: Mon, 9 Dec 2019 15:29:47 +0100
Subject: [PATCH] Devenv: Fix loki block (#20967)

---
 .../docker/blocks/jaeger/docker-compose.yaml  | 21 +++++++++++++++++++
 devenv/docker/blocks/loki/docker-compose.yaml |  6 ------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/devenv/docker/blocks/jaeger/docker-compose.yaml b/devenv/docker/blocks/jaeger/docker-compose.yaml
index a5f5cc03b58..f3f9f9252f2 100644
--- a/devenv/docker/blocks/jaeger/docker-compose.yaml
+++ b/devenv/docker/blocks/jaeger/docker-compose.yaml
@@ -3,4 +3,25 @@
     ports:
       - "6831:6831"
       - "16686:16686"
+  # Additional loki to generate some traces
+  # datasource URL: http://localhost:3100/
+  loki:
+    image: grafana/loki:master
+    ports:
+      - "3100:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+    # Optional jaeger tracing
+    environment:
+      - JAEGER_AGENT_HOST=jaeger
+      - JAEGER_AGENT_PORT=6831
+      - JAEGER_SAMPLER_TYPE=const
+      - JAEGER_SAMPLER_PARAM=1
+  promtail:
+    image: grafana/promtail:master
+    volumes:
+      - ./docker/blocks/loki/config.yaml:/etc/promtail/docker-config.yaml
+      - /var/log:/var/log
+      - ../data/log:/var/log/grafana
+    command:
+      -config.file=/etc/promtail/docker-config.yaml
 
diff --git a/devenv/docker/blocks/loki/docker-compose.yaml b/devenv/docker/blocks/loki/docker-compose.yaml
index 0ba080b3739..de348df17a0 100644
--- a/devenv/docker/blocks/loki/docker-compose.yaml
+++ b/devenv/docker/blocks/loki/docker-compose.yaml
@@ -4,12 +4,6 @@
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
-    # Optional jaeger tracing
-    environment:
-      - JAEGER_AGENT_HOST=jaeger
-      - JAEGER_AGENT_PORT=6831
-      - JAEGER_SAMPLER_TYPE=const
-      - JAEGER_SAMPLER_PARAM=1
   promtail:
     image: grafana/promtail:master
     volumes: