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

feat(ingest-limits): Add instance ring for service discovery #15819

Merged
merged 11 commits into from
Jan 20, 2025

Conversation

periklis
Copy link
Collaborator

@periklis periklis commented Jan 17, 2025

What this PR does / why we need it:
Adds a new ring for ingest-limits service instances to be used by the frontend's service discovery.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@periklis periklis self-assigned this Jan 17, 2025
@periklis periklis requested a review from a team as a code owner January 17, 2025 14:35
@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Jan 17, 2025
Copy link
Contributor

github-actions bot commented Jan 17, 2025

💻 Deploy preview deleted.

[join_after: <duration> | default = 0s]

# Minimum duration to wait after the internal readiness checks have passed
# but before succeeding the readiness endpoint. This is used to slowdown
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
# but before succeeding the readiness endpoint. This is used to slowdown
# but before succeeding the readiness endpoint. This is used to slow down

# CLI flag: -ingest-limits.lifecycler.addr
[address: <string> | default = ""]

# port to advertise in consul (defaults to server.grpc-listen-port).
Copy link
Contributor

Choose a reason for hiding this comment

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

If this defaults to server.grpc-listen-port, shouldn't we list the default for that port here rather than 0?

return nil, nil
}

reg := prometheus.WrapRegistererWithPrefix(t.Cfg.MetricsNamespace+"_", prometheus.DefaultRegisterer)
Copy link
Contributor

@grobinson-grafana grobinson-grafana Jan 20, 2025

Choose a reason for hiding this comment

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

Will we get duplicate metrics registration panics here, as the prefix is the same as initRing?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

🤔 not sure we have been using the registerer with prefix call multiple times in modules.go so I thought it is a no-op here. OTH you are right if we ever call this method twice which is is not the case for distinct targets like ingest-limits, however in all it is something to investigate

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Follow up this not even a problem with target all because we don't start multiple rings in the same binary there.

@periklis periklis merged commit 03909a9 into feat/usage-tracker Jan 20, 2025
61 checks passed
@periklis periklis deleted the ingest-limits-ring branch January 20, 2025 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/L type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants