Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs: fix Promtail / Loki capitalization #1130

Merged
merged 2 commits into from
Oct 8, 2019
Merged

docs: fix Promtail / Loki capitalization #1130

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9a1f73
docs: fixed Promtail capitalization
pracucci Oct 8, 2019
cdd4cdc
docs: fixed Loki capitalization
pracucci Oct 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
docs: fixed Loki capitalization
  • Loading branch information
@pracucci
pracucci committed Oct 8, 2019
commit cdd4cdc21bcf2db030a08ed30bfd0a7b4cfd4dcf
2 changes: 1 addition & 1 deletion cmd/docker-driver/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The Docker daemon on each Docker host has a default logging driver; each contain

When you start a container, you can configure it to use a different logging driver than the Docker daemon’s default, using the `--log-driver` flag. If the logging driver has configurable options, you can set them using one or more instances of the `--log-opt <NAME>=<VALUE>` flag. Even if the container uses the default logging driver, it can use different configurable options.

The following command configure the container `grafana` to start with the loki drivers which will send logs to `logs-us-west1.grafana.net` Loki instance, using a batch size of 400 entries and will retry maximum 5 times if it fails.
The following command configure the container `grafana` to start with the Loki drivers which will send logs to `logs-us-west1.grafana.net` Loki instance, using a batch size of 400 entries and will retry maximum 5 times if it fails.

```bash
docker run --log-driver=loki \
Expand Down
4 changes: 2 additions & 2 deletions debug/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ promtail + {
}
```

change the `some_cluster_name` to anything meaningful to help find your logs in loki
change the `some_cluster_name` to anything meaningful to help find your logs in Loki

also update the `hostname`, `username`, and `password` for your loki instance.
also update the `hostname`, `username`, and `password` for your Loki instance.

## Loki in kubernetes

Expand Down
4 changes: 2 additions & 2 deletions production/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ To test locally, we recommend using the `docker-compose.yaml` file in this direc

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.
**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).
Expand Down Expand Up @@ -108,7 +108,7 @@ $ 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`.

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/querying.md).

## Get inspired by our production setup

Expand Down