Skip to content

Ruler: remove trailing period from SRV records returned by discovery dnsnosrva lookups #7494

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Ruler: remove trailing period from SRV records returned by discovery dnsnosrva lookups #7494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re

### Changed

- [#7494](https://github.com/thanos-io/thanos/pull/7494) Ruler: remove trailing period from SRV records returned by discovery `dnsnosrva` lookups

### Removed

## [v0.36.0](https://github.com/thanos-io/thanos/tree/release-0.36) - in progress
Expand Down
4 changes: 3 additions & 1 deletion pkg/discovery/dns/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ func (s *dnsSD) Resolve(ctx context.Context, name string, qtype QType) ([]string
}

if qtype == SRVNoA {
res = append(res, appendScheme(scheme, net.JoinHostPort(rec.Target, resPort)))
// Remove the final dot from rooted DNS names (this is for compatibility with Prometheus)
target := strings.TrimRight(rec.Target, ".")
res = append(res, appendScheme(scheme, net.JoinHostPort(target, resPort)))
continue
}
// Do A lookup for the domain in SRV answer.
Expand Down