Merge pull request #15178 from marefr/loki_blocks_fixes

devenv: various fixes for Loki docker block

devenv/docker/blocks/loki/config.yaml

+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

devenv/docker/blocks/loki/docker-compose.yaml

-version: "3"
-
-networks:
-  loki:
-
-services:
   loki:
   loki:
     image: grafana/loki:master
     image: grafana/loki:master
     ports:
     ports:
       - "3100:3100"
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
     command: -config.file=/etc/loki/local-config.yaml
-    networks:
-      - loki
 
 
   promtail:
   promtail:
     image: grafana/promtail:master
     image: grafana/promtail:master
     volumes:
     volumes:
+      - ./docker/blocks/loki/config.yaml:/etc/promtail/docker-config.yaml
       - /var/log:/var/log
       - /var/log:/var/log
+      - ../data/log:/var/log/grafana
     command:
     command:
       -config.file=/etc/promtail/docker-config.yaml
       -config.file=/etc/promtail/docker-config.yaml
-    networks:
-      - loki