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.

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

Doc fixes: remove typos and long sentence #2586

Merged
merged 1 commit into from
Sep 1, 2020

Conversation

ms42Q
Copy link
Contributor

@ms42Q ms42Q commented Sep 1, 2020

What this PR does / why we need it:
Minor fix in the docs

@CLAassistant
Copy link

CLAassistant commented Sep 1, 2020

CLA assistant check
All committers have signed the CLA.

@codecov-commenter
Copy link

codecov-commenter commented Sep 1, 2020

Codecov Report

Merging #2586 into master will increase coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2586      +/-   ##
==========================================
+ Coverage   63.01%   63.07%   +0.05%     
==========================================
  Files         169      169              
  Lines       15005    15005              
==========================================
+ Hits         9456     9464       +8     
+ Misses       4796     4791       -5     
+ Partials      753      750       -3     
Impacted Files Coverage Δ
pkg/logql/evaluator.go 92.47% <0.00%> (-0.41%) ⬇️
pkg/querier/queryrange/downstreamer.go 97.93% <0.00%> (+2.06%) ⬆️
pkg/promtail/targets/file/tailer.go 79.16% <0.00%> (+8.33%) ⬆️

@@ -336,10 +336,9 @@ kubernetes_sd_configs:

### pipeline_stages

The [pipeline](../pipelines/) stages (`pipeline_stages`) is used to transform
log entries and their labels after discovery and consists of a list of any of the items listed below.
[Pipeline](../pipelines/) stages are used to transform log entries and their labels. The pipline is executed after the discovery process finishes. The `pipeline_stages` object consists of a list of stages which correspond to the items listed below.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
[Pipeline](../pipelines/) stages are used to transform log entries and their labels. The pipline is executed after the discovery process finishes. The `pipeline_stages` object consists of a list of stages which correspond to the items listed below.
[Pipeline](../pipelines/) stages are used to transform log entries and their labels. The pipeline is executed after the discovery process finishes. The `pipeline_stages` object consists of a list of stages which correspond to the items listed below.


Stages serve several purposes, more detail can be found [here](../pipelines/), however generally you extract data with `regex` or `json` stages into a temporary map which can then be use as `labels` or `output` or any of the other stages aside from `docker` and `cri` which are explained in more detail below.
Stages serve several purposes, more detail can be found [here](../pipelines/). However in most cases you extract data from logs with `regex` or `json` stages. The extracted data is transformed into a temporary map object. The data can then be used by promtail e.g. as values for `labels` or as an `output`. Additionally any other stage aside from `docker` and `cri` can access the extracted data.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Stages serve several purposes, more detail can be found [here](../pipelines/). However in most cases you extract data from logs with `regex` or `json` stages. The extracted data is transformed into a temporary map object. The data can then be used by promtail e.g. as values for `labels` or as an `output`. Additionally any other stage aside from `docker` and `cri` can access the extracted data.
Stages serve several purposes, more detail can be found [here](../pipelines/).
In most cases, you extract data from logs with `regex` or `json` stages. The extracted data is transformed into a temporary map object. The data can then be used by promtail, e.g. as values for `labels` or as an `output`. Additionally any other stage aside from `docker` and `cri` can access the extracted data.

Copy link
Contributor

Choose a reason for hiding this comment

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

Best practice is to keep paragraphs to three sentences or left when writing for online viewing.

@ms42Q
Copy link
Contributor Author

ms42Q commented Sep 1, 2020

Thanks for your review @oddlittlebird !

I applied your suggestions and rebased

Copy link
Contributor

@oddlittlebird oddlittlebird left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Member

@owen-d owen-d left a comment

Choose a reason for hiding this comment

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

lgtm

@owen-d owen-d merged commit cd63a53 into grafana:master Sep 1, 2020
@oddlittlebird
Copy link
Contributor

Thanks for contributing to the Loki docs!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants