From 8c6c201ea563fc2aa21b30e46c797d4ee635ad60 Mon Sep 17 00:00:00 2001 From: philnichol Date: Mon, 28 Sep 2020 19:03:16 +0100 Subject: [PATCH 1/3] Corrected incorrect instances of (setup|set up) --- docs/sources/architecture/_index.md | 2 +- docs/sources/clients/aws/eks/_index.md | 4 ++-- docs/sources/clients/promtail/pipelines.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/sources/architecture/_index.md b/docs/sources/architecture/_index.md index b1fce256be52..6e331749216e 100644 --- a/docs/sources/architecture/_index.md +++ b/docs/sources/architecture/_index.md @@ -88,7 +88,7 @@ value is larger than the hash of the stream. When the replication factor is larger than 1, the next subsequent tokens (clockwise in the ring) that belong to different ingesters will also be included in the result. -The effect of this hash set up is that each token that an ingester owns is +The effect of this hash setup is that each token that an ingester owns is responsible for a range of hashes. If there are three tokens with values 0, 25, and 50, then a hash of 3 would be given to the ingester that owns the token 25; the ingester owning token 25 is responsible for the hash range of 1-25. diff --git a/docs/sources/clients/aws/eks/_index.md b/docs/sources/clients/aws/eks/_index.md index b7ccad4a9f10..8c91e308acf2 100644 --- a/docs/sources/clients/aws/eks/_index.md +++ b/docs/sources/clients/aws/eks/_index.md @@ -3,7 +3,7 @@ title: EKS --- # Sending logs from EKS with Promtail -In this tutorial we'll see how setup promtail on [EKS][eks]. Amazon Elastic Kubernetes Service (Amazon [EKS][eks]) is a fully managed Kubernetes service, using Promtail we'll get full visibility into our cluster logs. We'll start by forwarding pods logs then nodes services and finally Kubernetes events. +In this tutorial we'll see how set up promtail on [EKS][eks]. Amazon Elastic Kubernetes Service (Amazon [EKS][eks]) is a fully managed Kubernetes service, using Promtail we'll get full visibility into our cluster logs. We'll start by forwarding pods logs then nodes services and finally Kubernetes events. After this tutorial you will able to query all your logs in one place using Grafana. @@ -51,7 +51,7 @@ Server Version: version.Info{Major:"1", Minor:"16+", GitVersion:"v1.16.8-eks-fd1 ## Adding Promtail DaemonSet -To ship all your pods logs we're going to setup [Promtail](../../promtail/) as a DaemonSet in our cluster. This means it will run on each nodes of the cluster, we will then configure it to find the logs of your containers on the host. +To ship all your pods logs we're going to set up [Promtail](../../promtail/) as a DaemonSet in our cluster. This means it will run on each nodes of the cluster, we will then configure it to find the logs of your containers on the host. What's nice about Promtail is that it uses the same [service discovery as Prometheus][prometheus conf], you should make sure the `scrape_configs` of Promtail matches the Prometheus one. Not only this is simpler to configure, but this also means Metrics and Logs will have the same metadata (labels) attached by the Prometheus service discovery. When querying Grafana you will be able to correlate metrics and logs very quickly, you can read more about this on our [blogpost][correlate]. diff --git a/docs/sources/clients/promtail/pipelines.md b/docs/sources/clients/promtail/pipelines.md index 00d0f05711cd..87119dc378ea 100644 --- a/docs/sources/clients/promtail/pipelines.md +++ b/docs/sources/clients/promtail/pipelines.md @@ -3,7 +3,7 @@ title: Pipelines --- # Pipelines -A detailed look at how to setup Promtail to process your log lines, including +A detailed look at how to set up Promtail to process your log lines, including extracting metrics and labels. ## Pipeline From 5db46ef358b61d3776a614e0384584bdbc22dc10 Mon Sep 17 00:00:00 2001 From: Phil Nichol <35630607+philnichol@users.noreply.github.com> Date: Mon, 28 Sep 2020 19:13:14 +0100 Subject: [PATCH 2/3] Update docs/sources/clients/aws/eks/_index.md Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> --- docs/sources/clients/aws/eks/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/clients/aws/eks/_index.md b/docs/sources/clients/aws/eks/_index.md index 8c91e308acf2..bafd4520ce97 100644 --- a/docs/sources/clients/aws/eks/_index.md +++ b/docs/sources/clients/aws/eks/_index.md @@ -3,7 +3,7 @@ title: EKS --- # Sending logs from EKS with Promtail -In this tutorial we'll see how set up promtail on [EKS][eks]. Amazon Elastic Kubernetes Service (Amazon [EKS][eks]) is a fully managed Kubernetes service, using Promtail we'll get full visibility into our cluster logs. We'll start by forwarding pods logs then nodes services and finally Kubernetes events. +In this tutorial we'll see how to set up Promtail on [EKS][eks]. Amazon Elastic Kubernetes Service (Amazon [EKS][eks]) is a fully managed Kubernetes service, using Promtail we'll get full visibility into our cluster logs. We'll start by forwarding pods logs then nodes services and finally Kubernetes events. After this tutorial you will able to query all your logs in one place using Grafana. From 3b7e3a8e566f34d629ed83bb66cf1600083abc3d Mon Sep 17 00:00:00 2001 From: philnichol Date: Mon, 28 Sep 2020 19:49:28 +0100 Subject: [PATCH 3/3] revert incorrect change --- docs/sources/architecture/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/architecture/_index.md b/docs/sources/architecture/_index.md index 6e331749216e..b1fce256be52 100644 --- a/docs/sources/architecture/_index.md +++ b/docs/sources/architecture/_index.md @@ -88,7 +88,7 @@ value is larger than the hash of the stream. When the replication factor is larger than 1, the next subsequent tokens (clockwise in the ring) that belong to different ingesters will also be included in the result. -The effect of this hash setup is that each token that an ingester owns is +The effect of this hash set up is that each token that an ingester owns is responsible for a range of hashes. If there are three tokens with values 0, 25, and 50, then a hash of 3 would be given to the ingester that owns the token 25; the ingester owning token 25 is responsible for the hash range of 1-25.