Skip to content

Commit

Permalink
docs: clarify promtail configuration and scraping
Browse files Browse the repository at this point in the history
  • Loading branch information
rfratto committed Sep 25, 2019
1 parent 7a447f9 commit 012dc06
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/clients/promtail/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Loki:

```yaml
# The URL where Loki is listening, denoted in Loki as http_listen_host and
# http_listen_port. If Loki is running in microservices mode, this be the HTTP
# http_listen_port. If Loki is running in microservices mode, this is the HTTP
# URL for the Distributor.
url: <string>
Expand Down
8 changes: 5 additions & 3 deletions docs/clients/promtail/scraping.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ There are different types of labels present in Promtail:
### Kubernetes Discovery

Note that while promtail can utilize the Kubernetes API to discover pods as
targets, it can only use pods that are running on the same hostname of the
machine that promtail is running on.
targets, it can only use pods that are running on the same machine/node that
promtail is running on, validated using the hostname.

This means that any time Kubernetes service discovery is used, there must be a
`relabel_config` that creates the intermediate label `__host__` from
Expand Down Expand Up @@ -135,7 +135,9 @@ client: [ <client_option> ]
Reference for `client_option`:

```yaml
# Sets the `url` of loki api push endpoint
# The endpoint to push to Loki, specified in the Loki configuration as
# http_listen_host and http_listen_port. If Loki is running in microservices
# mode, this is the HTTP URL for the Distributor.
url: http[s]://<host>:<port>/api/prom/push
# Sets the `Authorization` header on every promtail request with the
Expand Down

0 comments on commit 012dc06

Please sign in to comment.