Skip to content

Commit

Permalink
Sets the default sd-dns-resolver for ruler miekgdns (thanos-io#5997)
Browse files Browse the repository at this point in the history
Related to issue: thanos-io#4204

Problem: in the PR thanos-io#4519 the
default sd-dns-resolver for querier was set to miekgdns but this change
was never ported to ruler

Solution: this PR brings this default to ruler as well to make it
consistent

Signed-off-by: JoaoBraveCoding <jmarcal@redhat.com>

Signed-off-by: JoaoBraveCoding <jmarcal@redhat.com>
  • Loading branch information
JoaoBraveCoding authored and Nathaniel Graham committed Apr 17, 2023
1 parent 1b39852 commit 5d55951
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
- [#5230](https://github.com/thanos-io/thanos/pull/5230) Rule: Stateless ruler support restoring `for` state from query API servers. The query API servers should be able to access the remote write storage.
- [#5880](https://github.com/thanos-io/thanos/pull/5880) Query Frontend: Fixes some edge cases of query sharding analysis.
- [#5893](https://github.com/thanos-io/thanos/pull/5893) Cache: Fixed redis client not respecting `SetMultiBatchSize` config value.
- [#5966](https://github.com/thanos-io/thanos/pull/5966) Query: Stop relying on non-existent hints for mint and maxt when selecting series for the `api/v1/series` HTTP endpoint.
- [#5948](https://github.com/thanos-io/thanos/pull/5948) Store: `chunks_fetched_duration` wrong calculation.
- [#5910](https://github.com/thanos-io/thanos/pull/5910): Receive: Fixed ketama quorum bug that was could cause success response for failed replication. This also optimize heavily receiver CPU use.
- [#5966](https://github.com/thanos-io/thanos/pull/5966) Query: Fixed mint and maxt when selecting series for the `api/v1/series` HTTP endpoint.
- [#5997](https://github.com/thanos-io/thanos/pull/5997) Rule: switch to miekgdns DNS resolver as the default one.

### Added

Expand Down
2 changes: 1 addition & 1 deletion cmd/thanos/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ func (qc *queryConfig) registerFlag(cmd extkingpin.FlagClause) *queryConfig {
cmd.Flag("query.http-method", "HTTP method to use when sending queries. Possible options: [GET, POST]").
Default("POST").EnumVar(&qc.httpMethod, "GET", "POST")
cmd.Flag("query.sd-dns-resolver", "Resolver to use. Possible options: [golang, miekgdns]").
Default("golang").Hidden().StringVar(&qc.dnsSDResolver)
Default("miekgdns").Hidden().StringVar(&qc.dnsSDResolver)
cmd.Flag("query.default-step", "Default range query step to use. This is only used in stateless Ruler and alert state restoration.").
Default("1s").DurationVar(&qc.step)
return qc
Expand Down

0 comments on commit 5d55951

Please sign in to comment.