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: improve overrides configuration parameter section #1326

Merged
merged 2 commits into from
Mar 11, 2022

Conversation

KMiller-Grafana
Copy link
Contributor

@KMiller-Grafana KMiller-Grafana commented Mar 4, 2022

PR #1318 got merged in without a docs review. It had a typo. This PR was originally to fix that typo. Then I decided to correct the formatting and wording throughout the overrides section of the configuration documentation section.

A goal in injecting newlines into the definitions results in not needing a horizontal scroll bar when viewing this section's documentation.

Reviewers: please check that I corrected the definition of per_tenant_override_config correctly. I believe it had only the default value listed, but not in quote marks.

# - During search, traces will be skipped when they exceed this threshold.
# - During ingestion, traces that exceed this threshold will be refused.
# - During compaction, traces that exceed this threshold will be partially dropped.
# Exceeding the threshold results in errors like
Copy link
Member

Choose a reason for hiding this comment

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

The language "During ingestion" was there b/c that log line will only be logged when the threshold is exceeded during ingestion.

# Tenant-specific overrides settings configuration file. See the "Tenant-specific overrides" section for an example.
[per_tenant_override_config: /conf/overrides.yaml]
# Tenant-specific overrides settings configuration file.
[per_tenant_override_config: <string> | default = "/conf/overrides.yaml"]
Copy link
Member

Choose a reason for hiding this comment

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

This actually defaults to an empty string which disables the feature.

Copy link
Contributor

@annanay25 annanay25 left a comment

Choose a reason for hiding this comment

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

LGTM.

@joe-elliott joe-elliott merged commit a8ff976 into grafana:main Mar 11, 2022
@KMiller-Grafana KMiller-Grafana deleted the docs/fix-typo branch March 11, 2022 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants