IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

devenv: switching back using loki master plus various fixes

Browse Source
This commit is contained in:
Marcus Efraimsson 2019-02-04 09:55:23 +01:00
parent 0442a86400
commit fdd5ac1895
No known key found for this signature in database
GPG Key ID: EBFE0FB04612DD4A
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devenv/docker/blocks/loki/docker-compose.yaml
View File

@ -1,24 +1,14 @@
version: "3"
networks:
loki: loki:
image: grafana/loki:master
services:
loki:
image: grafana/loki:master-3e6a75e
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-3e6a75e image: grafana/promtail:master
volumes: volumes:
- ./docker/blocks/loki/config.yaml:/etc/promtail/docker-config.yaml - ./docker/blocks/loki/config.yaml:/etc/promtail/docker-config.yaml
- /var/log:/var/log - /var/log:/var/log
- ../data/log:/var/log/grafana - ../data/log:/var/log/grafana
command: command:
-config.file=/etc/promtail/docker-config.yaml -config.file=/etc/promtail/docker-config.yaml
networks:
- loki