From dcf05941c61a2b77f5aca1b966daecf51cc067ee Mon Sep 17 00:00:00 2001 From: Takayuki WATANABE Date: Wed, 30 Oct 2019 15:21:59 +0900 Subject: [PATCH] Correct wrong document paths about querying --- cmd/docker-driver/README.md | 2 +- production/README.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/docker-driver/README.md b/cmd/docker-driver/README.md index 101618c0b919..1cb2c1da9b1a 100644 --- a/cmd/docker-driver/README.md +++ b/cmd/docker-driver/README.md @@ -105,7 +105,7 @@ Once deployed the Grafana service will be sending logs automatically to Loki. ## Labels -Loki can received a set of labels along with log line. These labels are used to index log entries and query back logs using [LogQL stream selector](../../docs/querying.md#log-stream-selector). +Loki can received a set of labels along with log line. These labels are used to index log entries and query back logs using [LogQL stream selector](../../docs/logql.md#log-stream-selector). By default the Docker driver will add the `filename` where the log is written, the `host` where the log has been generated as well as the `container_name`. Additionally `swarm_stack` and `swarm_service` are added for Docker Swarm deployments. diff --git a/production/README.md b/production/README.md index 26612f97e71e..db15eaae95f3 100644 --- a/production/README.md +++ b/production/README.md @@ -36,12 +36,12 @@ To test locally, we recommend using the `docker-compose.yaml` file in this direc docker-compose up ``` -1. Grafana should now be available at http://localhost:3000/. Log in with `admin` / `admin` and follow the [steps for configuring the datasource in Grafana](../docs/querying.md#grafana), using `http://loki:3100` for the URL field. +1. Grafana should now be available at http://localhost:3000/. Log in with `admin` / `admin` and follow the [steps for configuring the datasource in Grafana](../docs/getting-started/grafana.md), using `http://loki:3100` for the URL field. **Note:** When running locally, Promtail starts before Loki is ready. This can lead to the error message "Data source connected, but no labels received." After a couple seconds, Promtail will forward all newly created log messages correctly. Until this is fixed we recommend [building and running from source](#build-and-run-from-source). -For instructions on how to query Loki, see [our usage docs](../docs/querying.md). +For instructions on how to query Loki, see [our usage docs](../docs/logql.md). ## Using Helm to deploy on Kubernetes @@ -106,9 +106,9 @@ Grafana is Loki's UI. To query your logs you need to start Grafana as well: $ docker run -ti -p 3000:3000 grafana/grafana:master ``` -Grafana should now be available at http://localhost:3000/. Follow the [steps for configuring the datasource in Grafana](../docs/querying.md) and set the URL field to `http://host.docker.internal:3100`. +Grafana should now be available at http://localhost:3000/. Follow the [steps for configuring the datasource in Grafana](../docs/getting-started/grafana.md) and set the URL field to `http://host.docker.internal:3100`. -For instructions on how to use Loki, see [our usage docs](../docs/querying.md). +For instructions on how to use Loki, see [our usage docs](../docs/logql.md). ## Get inspired by our production setup