mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
devenv: loki: remove unused devenv-config (#55752)
* devenv: jaeger: add it's own copy of promtail-config * devenv: removed unused loki config
This commit is contained in:
parent
85c26ea908
commit
d1375d31cd
@ -25,7 +25,7 @@
|
||||
promtail:
|
||||
image: grafana/promtail:master
|
||||
volumes:
|
||||
- ./docker/blocks/loki-promtail/promtail-config.yaml:/etc/promtail/docker-config.yaml
|
||||
- ./docker/blocks/jaeger/promtail-config.yaml:/etc/promtail/docker-config.yaml
|
||||
- /var/log:/var/log
|
||||
- ../data/log:/var/log/grafana
|
||||
command:
|
||||
|
@ -1,18 +0,0 @@
|
||||
By default this block is setup to scrape logs from /var/logs. If you need to log some service from the docker-compse you can add:
|
||||
```
|
||||
# For this to work you need to install the logging driver see https://github.com/grafana/loki/tree/master/cmd/docker-driver#plugin-installation
|
||||
logging:
|
||||
driver: loki
|
||||
options:
|
||||
loki-url: "http://loki:3100/loki/api/v1/push"
|
||||
```
|
||||
|
||||
This also works for self logging Loki logs if you use `http://localhost:3100/loki/api/v1/push`. This is useful together with
|
||||
```
|
||||
environment:
|
||||
- JAEGER_AGENT_HOST=tempo
|
||||
- JAEGER_AGENT_PORT=6831
|
||||
- JAEGER_SAMPLER_TYPE=const
|
||||
- JAEGER_SAMPLER_PARAM=1
|
||||
```
|
||||
which sets up a tracing and so you will have logs with traceIDs to test linking between logs and traces.
|
@ -1,14 +0,0 @@
|
||||
# datasource URL: http://localhost:3100/
|
||||
loki:
|
||||
image: grafana/loki:latest
|
||||
ports:
|
||||
- "3100:3100"
|
||||
command: -config.file=/etc/loki/local-config.yaml
|
||||
promtail:
|
||||
image: grafana/promtail:latest
|
||||
volumes:
|
||||
- ./docker/blocks/loki-promtail/promtail-config.yaml:/etc/promtail/docker-config.yaml
|
||||
- /var/log:/var/log
|
||||
- ../data/log:/var/log/grafana
|
||||
command:
|
||||
-config.file=/etc/promtail/docker-config.yaml
|
Loading…
Reference in New Issue
Block a user