From 0442a86400552f461f7c8a807a1f2fe609fd5e98 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Thu, 31 Jan 2019 19:22:25 +0100
Subject: [PATCH 1/2] tailing grafana logs and temporaily using an older build

---
 devenv/docker/blocks/loki/config.yaml         | 27 +++++++++++++++++++
 devenv/docker/blocks/loki/docker-compose.yaml |  6 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 devenv/docker/blocks/loki/config.yaml

diff --git a/devenv/docker/blocks/loki/config.yaml b/devenv/docker/blocks/loki/config.yaml
new file mode 100644
index 00000000000..9451b6ba79b
--- /dev/null
+++ b/devenv/docker/blocks/loki/config.yaml
@@ -0,0 +1,27 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+client:
+  url: http://loki:3100/api/prom/push
+
+scrape_configs:
+- job_name: system
+  entry_parser: raw
+  static_configs:
+  - targets:
+      - localhost
+    labels:
+      job: varlogs
+      __path__: /var/log/*log
+- job_name: grafana
+  entry_parser: raw
+  static_configs:
+  - targets:
+      - localhost
+    labels:
+      job: grafana
+      __path__: /var/log/grafana/*log
diff --git a/devenv/docker/blocks/loki/docker-compose.yaml b/devenv/docker/blocks/loki/docker-compose.yaml
index d6cf21f7856..c2fee15b0bb 100644
--- a/devenv/docker/blocks/loki/docker-compose.yaml
+++ b/devenv/docker/blocks/loki/docker-compose.yaml
@@ -5,7 +5,7 @@ networks:
 
 services:
   loki:
-    image: grafana/loki:master
+    image: grafana/loki:master-3e6a75e
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
@@ -13,9 +13,11 @@ services:
       - loki
 
   promtail:
-    image: grafana/promtail:master
+    image: grafana/promtail:master-3e6a75e
     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
     networks:

From fdd5ac1895e4ee7af5c9a060ba2c8fc8b4ef830d Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Mon, 4 Feb 2019 09:55:23 +0100
Subject: [PATCH 2/2] devenv: switching back using loki master plus various
 fixes

---
 devenv/docker/blocks/loki/docker-compose.yaml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/devenv/docker/blocks/loki/docker-compose.yaml b/devenv/docker/blocks/loki/docker-compose.yaml
index c2fee15b0bb..0ac5d439354 100644
--- a/devenv/docker/blocks/loki/docker-compose.yaml
+++ b/devenv/docker/blocks/loki/docker-compose.yaml
@@ -1,24 +1,14 @@
-version: "3"
-
-networks:
   loki:
-
-services:
-  loki:
-    image: grafana/loki:master-3e6a75e
+    image: grafana/loki:master
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
-    networks:
-      - loki
 
   promtail:
-    image: grafana/promtail:master-3e6a75e
+    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
-    networks:
-      - loki