From 012dc0696a9ed8b4c7077a3983a9bdba5ccec20c Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Fri, 20 Sep 2019 10:16:46 -0400 Subject: [PATCH] docs: clarify promtail configuration and scraping --- docs/clients/promtail/configuration.md | 2 +- docs/clients/promtail/scraping.md | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/clients/promtail/configuration.md b/docs/clients/promtail/configuration.md index 65f6a87e94d6..9aba37cab155 100644 --- a/docs/clients/promtail/configuration.md +++ b/docs/clients/promtail/configuration.md @@ -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: diff --git a/docs/clients/promtail/scraping.md b/docs/clients/promtail/scraping.md index 7ef05c559a8f..b15fddf0962f 100644 --- a/docs/clients/promtail/scraping.md +++ b/docs/clients/promtail/scraping.md @@ -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 @@ -135,7 +135,9 @@ client: [ ] 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]://:/api/prom/push # Sets the `Authorization` header on every promtail request with the