Skip to content

Commit

Permalink
Correct wrong document paths about querying (#1214)
Browse files Browse the repository at this point in the history
  • Loading branch information
takanabe authored and rfratto committed Oct 30, 2019
1 parent d5758e3 commit d080e46
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmd/docker-driver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
8 changes: 4 additions & 4 deletions production/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d080e46

Please sign in to comment.