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: Fix documentation with correct default values and add missing options #4792

Merged
merged 16 commits into from
Jan 12, 2022

Conversation

AndreZiviani
Copy link
Contributor

Signed-off-by: Andre Ziviani andrepziviani@gmail.com

What this PR does / why we need it:
Some of the default values were wrong in the documentation, I've updated some of them based on what I could find through the source code.
Also some options were missing.

Checklist

  • Documentation added
  • Tests updated
  • Add an entry in the CHANGELOG.md about the changes.

Signed-off-by: Andre Ziviani <andrepziviani@gmail.com>
Signed-off-by: Andre Ziviani <andrepziviani@gmail.com>
@CLAassistant
Copy link

CLAassistant commented Nov 19, 2021

CLA assistant check
All committers have signed the CLA.

Signed-off-by: Andre Ziviani <andrepziviani@gmail.com>
Signed-off-by: Andre Ziviani <andrepziviani@gmail.com>
docs/sources/configuration/_index.md Outdated Show resolved Hide resolved
docs/sources/configuration/_index.md Outdated Show resolved Hide resolved
docs/sources/configuration/_index.md Outdated Show resolved Hide resolved
docs/sources/configuration/_index.md Outdated Show resolved Hide resolved
docs/sources/configuration/_index.md Outdated Show resolved Hide resolved
AndreZiviani and others added 7 commits November 24, 2021 20:25
Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>
Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>
Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>
docs/sources/configuration/_index.md Outdated Show resolved Hide resolved
docs/sources/configuration/_index.md Outdated Show resolved Hide resolved
AndreZiviani and others added 2 commits November 30, 2021 16:23
Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>
Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>
@KMiller-Grafana KMiller-Grafana self-requested a review December 1, 2021 17:11
Copy link
Contributor

@KMiller-Grafana KMiller-Grafana left a comment

Choose a reason for hiding this comment

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

Docs look good to me now.

@AndreZiviani
Copy link
Contributor Author

is there something pending? can we merge this?

@AndreZiviani
Copy link
Contributor Author

@KMiller-Grafana friendly bump

@AndreZiviani
Copy link
Contributor Author

hi @slim-bean @dannykopping @owen-d, sorry to tag you directly but can you help here? This PR was already approved 16 days ago but not merged, I think theres some really important changes here. Thanks!

@AndreZiviani
Copy link
Contributor Author

friendly bump again 🙏

# a querier disconnects because of a crash and when the crashed querier is actually removed
# from the tenant's shard.
# CLI flag: -query-frontend.querier-forget-delay
[querier_forget_delay: <duration> | default = 0s]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Loki doesn't have support for querier shuffle sharding yet, I wonder if we should keep this configuration removed until it does?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't see a problem leaving as is because its not only related to shuffle sharding but I can remove it no problem

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@trevorwhitney any input here?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't have as much context as @slim-bean, are you saying this value isn't even used by loki yet because tenants don't have shards? If so I can see the point that adding this field to the docs because changing it won't actually do anything. At the same time it is a setting we have that will appear when someone hits the /config endpoint or prints the config to stderr, so I don't think there's too much harm in documenting it to help explain how that value got there.

@trevorwhitney trevorwhitney mentioned this pull request Jan 7, 2022
3 tasks
Copy link
Collaborator

@trevorwhitney trevorwhitney left a comment

Choose a reason for hiding this comment

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

Thanks for the fixes! Takes a village to keep these up to date!

Just a few suggestions. I did a pass to make sure none of the dynamic configuration we do in config_wrapper.go as a part of the common configuration would change any of these defaults and it looks like we're good there. There are however a few defaults you put in that can be change dynamically in other sections, so I think we should leave defaults off those for now.

docs/sources/configuration/_index.md Outdated Show resolved Hide resolved
docs/sources/configuration/_index.md Outdated Show resolved Hide resolved
docs/sources/configuration/_index.md Outdated Show resolved Hide resolved
docs/sources/configuration/_index.md Outdated Show resolved Hide resolved
docs/sources/configuration/_index.md Outdated Show resolved Hide resolved
@pull-request-size pull-request-size bot added size/L and removed size/M labels Jan 7, 2022
Copy link
Collaborator

@trevorwhitney trevorwhitney left a comment

Choose a reason for hiding this comment

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

Thanks for those updates! LGTM

Copy link
Contributor

@ssncferreira ssncferreira left a comment

Choose a reason for hiding this comment

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

LGTM
Great work 🎉

@dannykopping dannykopping merged commit 40f56c6 into grafana:main Jan 12, 2022
ssncferreira pushed a commit that referenced this pull request Jan 12, 2022
…ptions (#4792)

* update docs with correct default values and add missing options

Signed-off-by: Andre Ziviani <andrepziviani@gmail.com>

* fix typo

Signed-off-by: Andre Ziviani <andrepziviani@gmail.com>

* fix typo

Signed-off-by: Andre Ziviani <andrepziviani@gmail.com>

* add another missing option

Signed-off-by: Andre Ziviani <andrepziviani@gmail.com>

* Update docs/sources/configuration/_index.md

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>

* Update docs/sources/configuration/_index.md

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>

* Update docs/sources/configuration/_index.md

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>

* rephrase querier_forget_delay option

* remove duplicated option

* rephrase max_streams_per_user option

* fix typo

* Update docs/sources/configuration/_index.md

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>

* Update docs/sources/configuration/_index.md

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>

* fix wrong values

* standardize boolean naming

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>
ssncferreira added a commit that referenced this pull request Jan 12, 2022
…ptions (#4792) (#5115)

* update docs with correct default values and add missing options

Signed-off-by: Andre Ziviani <andrepziviani@gmail.com>

* fix typo

Signed-off-by: Andre Ziviani <andrepziviani@gmail.com>

* fix typo

Signed-off-by: Andre Ziviani <andrepziviani@gmail.com>

* add another missing option

Signed-off-by: Andre Ziviani <andrepziviani@gmail.com>

* Update docs/sources/configuration/_index.md

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>

* Update docs/sources/configuration/_index.md

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>

* Update docs/sources/configuration/_index.md

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>

* rephrase querier_forget_delay option

* remove duplicated option

* rephrase max_streams_per_user option

* fix typo

* Update docs/sources/configuration/_index.md

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>

* Update docs/sources/configuration/_index.md

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>

* fix wrong values

* standardize boolean naming

Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>

Co-authored-by: Andre Ziviani <7469258+AndreZiviani@users.noreply.github.com>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants