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

Docs: Document Promtail global rate limiting #5737

Merged
merged 4 commits into from
Apr 5, 2022

Conversation

KMiller-Grafana
Copy link
Contributor

Addresses issue #5730.

Reviewers: what have I missed or gotten wrong in this addition of documentation?

Copy link
Contributor

@09jvilla 09jvilla left a comment

Choose a reason for hiding this comment

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

Made one small suggestion - realize its a tad vague because I don't actually know the logic for how long it holds the lines back.

docs/sources/clients/promtail/configuration.md Outdated Show resolved Hide resolved
Co-authored-by: Jennifer Villa <jvilla2013@gmail.com>
@@ -1756,6 +1759,26 @@ scrape_configs:
target_label: 'container'
```

## limit_config
Copy link
Contributor

Choose a reason for hiding this comment

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

This looks good @KMiller-Grafana, and we should align this with the flags registered here:
https://github.com/grafana/loki/blob/main/clients/pkg/promtail/limit/config.go#L14-L19

@pull-request-size pull-request-size bot added size/M and removed size/S labels Apr 1, 2022
Copy link
Contributor

@dannykopping dannykopping left a comment

Choose a reason for hiding this comment

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

LGTM! Congrats on your first code change Karen :)

@@ -95,6 +95,9 @@ clients:
scrape_configs:
- [<scrape_config>]

# Configures global limits for this instance of Promtail
[limit_config: <limit_config>]
Copy link
Contributor

Choose a reason for hiding this comment

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

hi, thank you very much for the exquisite documentation, this PR changed the limit_config name

#5707
Promtail: Rename config name limit_config to limits_config #5707

Copy link
Contributor

@09jvilla 09jvilla left a comment

Choose a reason for hiding this comment

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

Looks good to me - I think all that's needed is making "limits" plural (revise from "limit")

docs/sources/clients/promtail/configuration.md Outdated Show resolved Hide resolved
docs/sources/clients/promtail/configuration.md Outdated Show resolved Hide resolved
docs/sources/clients/promtail/configuration.md Outdated Show resolved Hide resolved
Copy link
Contributor

@09jvilla 09jvilla left a comment

Choose a reason for hiding this comment

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

LGTM!

@slim-bean slim-bean merged commit c860fc6 into grafana:main Apr 5, 2022
@KMiller-Grafana KMiller-Grafana deleted the docs/rate-limits branch April 5, 2022 22:06
@MasslessParticle MasslessParticle added the backport release-2.5.x Tag a PR with this label to create a PR which cherry pics it into the release-2.5.x branch label Apr 7, 2022
grafanabot pushed a commit that referenced this pull request Apr 7, 2022
* Docs: Document Promtail global rate limiting

* Update docs/sources/clients/promtail/configuration.md

Co-authored-by: Jennifer Villa <jvilla2013@gmail.com>

* Revise strings that explain the new configuration parameters

* For rate limiting, limit_config becomes limits_config

Co-authored-by: Jennifer Villa <jvilla2013@gmail.com>
(cherry picked from commit c860fc6)
MasslessParticle pushed a commit that referenced this pull request Apr 7, 2022
* Docs: Document Promtail global rate limiting

* Update docs/sources/clients/promtail/configuration.md

Co-authored-by: Jennifer Villa <jvilla2013@gmail.com>

* Revise strings that explain the new configuration parameters

* For rate limiting, limit_config becomes limits_config

Co-authored-by: Jennifer Villa <jvilla2013@gmail.com>
(cherry picked from commit c860fc6)

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>
splitice pushed a commit to X4BNet/loki that referenced this pull request May 21, 2022
…5814)

* Docs: Document Promtail global rate limiting

* Update docs/sources/clients/promtail/configuration.md

Co-authored-by: Jennifer Villa <jvilla2013@gmail.com>

* Revise strings that explain the new configuration parameters

* For rate limiting, limit_config becomes limits_config

Co-authored-by: Jennifer Villa <jvilla2013@gmail.com>
(cherry picked from commit c860fc6)

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-2.5.x Tag a PR with this label to create a PR which cherry pics it into the release-2.5.x branch size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants