diff --git a/docker/compose/grafana/datasources/Loki.json b/docker/compose/grafana/datasources/Loki.json
new file mode 100644
index 00000000..f7fd35b0
--- /dev/null
+++ b/docker/compose/grafana/datasources/Loki.json
@@ -0,0 +1,7 @@
+{   
+    "name":"Loki",
+    "type":"loki",
+    "url":"http://loki:3100",
+    "access":"proxy",
+    "basicAuth":false
+  }
diff --git a/docker/compose/loki/loki-conf.yml b/docker/compose/loki/loki-conf.yml
new file mode 100644
index 00000000..2b0f5ac4
--- /dev/null
+++ b/docker/compose/loki/loki-conf.yml
@@ -0,0 +1,32 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+
+ingester:
+  lifecycler:
+    address: 0.0.0.0
+    ring:
+      store: inmemory
+      replication_factor: 1
+  chunk_idle_period: 15m
+
+schema_config:
+  configs:
+  - from: 0
+    store: boltdb
+    object_store: filesystem
+    schema: v9
+    index:
+      prefix: index_
+      period: 168h
+
+storage_config:
+  boltdb:
+    directory: /tmp/loki/index
+
+  filesystem:
+    directory: /tmp/loki/chunks
+
+limits_config:
+  enforce_metric_name: false
\ No newline at end of file
diff --git a/docker/compose/mon.yml b/docker/compose/mon.yml
index 40ddc2eb..aab48155 100644
--- a/docker/compose/mon.yml
+++ b/docker/compose/mon.yml
@@ -73,7 +73,7 @@ services:
       org.label-schema.group: "monitoring"
   
   grafana:
-    image: grafana/grafana:4.6.3
+    image: grafana/grafana:master
     container_name: grafana
     volumes:
       - grafana_data:/var/lib/grafana
@@ -95,3 +95,28 @@ services:
       - monitor-net
     labels:
       org.label-schema.group: "monitoring"
+  
+  loki:
+    image: grafana/loki:master
+    container_name: loki
+    volumes:
+      - ./loki/loki-conf.yml:/etc/loki/local-config.yaml
+    expose:
+      - 3100
+    networks:
+      - monitor-net
+    labels:
+      org.label-schema.group: "monitoring"
+    command: -config.file=/etc/loki/local-config.yaml
+
+  promtail:
+    image: grafana/promtail:master
+    container_name: promtail
+    volumes:
+      - ./promtail/promtail-conf.yml:/etc/promtail/docker-config.yaml
+      - /var/lib/docker/volumes/remme_logs/_data:/var/log/_data
+    networks:
+      - monitor-net
+    labels:
+      org.label-schema.group: "monitoring"
+    command: -config.file=/etc/promtail/docker-config.yaml
diff --git a/docker/compose/promtail/promtail-conf.yml b/docker/compose/promtail/promtail-conf.yml
new file mode 100644
index 00000000..a63f7c0e
--- /dev/null
+++ b/docker/compose/promtail/promtail-conf.yml
@@ -0,0 +1,23 @@
+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: remme_log
+    entry_parser: raw
+    static_configs:
+    - targets:
+        - localhost
+      labels:
+        job: remme_log
+        __path__: /var/log/_data/*
\ No newline at end of file