From 2508dc16c4c9bb567eb687efebe0f07618b6321c Mon Sep 17 00:00:00 2001 From: Alexander Danilov <SmilingNavern@users.noreply.github.com> Date: Wed, 11 Sep 2019 15:55:05 +0300 Subject: [PATCH] Fix links to correct doc (#1005) Co-authored-by: Alexander Danilov <smilingnavern@joom.com> --- README.md | 2 +- cmd/docker-driver/README.md | 2 +- production/README.md | 8 ++++---- production/helm/README.md | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a3103df8..e045a0d5 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Loki differs from Prometheus by focussing on logs instead of metrics, and delive The [getting started docs](./production/README.md) have instructions on how to install Loki via Docker images, Helm charts, Jsonnet, or from source. -Once you have promtail, Loki, and Grafana running, continue with [our usage docs](./docs/usage.md) on how to query your logs. +Once you have promtail, Loki, and Grafana running, continue with [our usage docs](./docs/querying.md) on how to query your logs. ### Documentation diff --git a/cmd/docker-driver/README.md b/cmd/docker-driver/README.md index 815a71b8..fb2dba29 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/usage.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/querying.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 50e51780..55fb7031 100644 --- a/production/README.md +++ b/production/README.md @@ -37,12 +37,12 @@ It will start containers for promtail, Loki, and Grafana. 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/usage.md), 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/querying.md#grafana), 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/usage.md). +For instructions on how to query Loki, see [our usage docs](../docs/querying.md). ## Using Helm to deploy on Kubernetes @@ -107,9 +107,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/usage.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/querying.md) and set the URL field to `http://host.docker.internal:3100`. -For instructions on how to use loki, see [our usage docs](../docs/usage.md). +For instructions on how to use loki, see [our usage docs](../docs/querying.md). ## Get inspired by our production setup diff --git a/production/helm/README.md b/production/helm/README.md index 44442718..cf77f9aa 100644 --- a/production/helm/README.md +++ b/production/helm/README.md @@ -69,7 +69,7 @@ $ kubectl port-forward --namespace <YOUR-NAMESPACE> service/loki-grafana 3000:80 ``` Navigate to http://localhost:3000 and login with `admin` and the password output above. -Then follow the [instructions for adding the loki datasource](/docs/usage.md), using the URL `http://loki:3100/`. +Then follow the [instructions for adding the loki datasource](/docs/querying.md#grafana), using the URL `http://loki:3100/`. ## Run Loki behind https ingress -- GitLab