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

Docs: Corrected incorrect instances of (setup|set up) #2692

Merged
merged 3 commits into from
Sep 28, 2020
Merged

Docs: Corrected incorrect instances of (setup|set up) #2692

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c6c201
Corrected incorrect instances of (setup|set up)
philnichol Sep 28, 2020
5db46ef
Update docs/sources/clients/aws/eks/_index.md
philnichol Sep 28, 2020
3b7e3a8
revert incorrect change
philnichol Sep 28, 2020
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
2 changes: 1 addition & 1 deletion docs/sources/architecture/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This version of "setup" is a noun. Please revert this change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Obviously happy to revert this, but shouldn't it be a noun?
Or should it be "The effect of this hash being set up is that..."?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Setup" is the noun version of the word. If you revert it and change nothing else, then it is correct.

Your version is also correct, but would require more words. I suggest going with the reversion.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gotcha, apologies! Cheers for the feedback, I've reverted that change

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you are ready for another review, I suggest clicking "Re-request review." People don't always notice comments, but the request for review sends a separate (and more visible) notification.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, didn't know that!

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.
Expand Down
4 changes: 2 additions & 2 deletions docs/sources/clients/aws/eks/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
philnichol marked this conversation as resolved.
Show resolved Hide resolved

After this tutorial you will able to query all your logs in one place using Grafana.

Expand Down Expand Up @@ -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].

Expand Down
2 changes: 1 addition & 1 deletion docs/sources/clients/promtail/pipelines.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down