Skip to content

Commit c4db5d2

Browse files
authored
[release-2.17] cache: ignore non-SRV responses during service discovery (#13206)
When discovering cache servers using SRV queries, sometimes DNS servers return A or AAAA records. Change our resolver to match the behavior of the built-in go resolver and ignore any non-SRV responses. Fixes #12713 Pulls in grafana/dskit#777
1 parent b39c274 commit c4db5d2

File tree

7 files changed

+23
-8
lines changed

7 files changed

+23
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
## unreleased
44

5-
65
* [BUGFIX] Add a missing attribute to the list of default promoted OTel resource attributes in the docs: deployment.environment. #12181
76
* [BUGFIX] Ingest: Fix memory pool poisoning in Remote-Write 2.0/OTLP by not clearning created timestamp field before returning time series to the memory pool. #12735
87
* [BUGFIX] Distributor: Fix error when native histograms bucket limit is set then no NHCB passes validation. #12746
98
* [BUGFIX] Update Docker base images for tools from `alpine:3.22.1` to `alpine:3.22.2` to address [CVE-2025-9230](https://nvd.nist.gov/vuln/detail/CVE-2025-9230), [CVE-2025-9231](https://nvd.nist.gov/vuln/detail/CVE-2025-9231), [CVE-2025-2025-9232](https://nvd.nist.gov/vuln/detail/CVE-2025-9232). #12993
9+
* [BUGFIX] Memcached: Ignore invalid responses when discovering cache servers using `dnssrv+` or `dnssrvnoa+` service discovery prefixes. #13206
1010

1111
### Tools
1212

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/golang/snappy v1.0.0
1919
github.com/google/gopacket v1.1.19
2020
github.com/gorilla/mux v1.8.1
21-
github.com/grafana/dskit v0.0.0-20250805180558-d916df8a1fad
21+
github.com/grafana/dskit v0.0.0-20251028191123-0de50c403525
2222
github.com/grafana/e2e v0.1.2-0.20250428181430-708d63bcc673
2323
github.com/hashicorp/golang-lru v1.0.2 // indirect
2424
github.com/influxdata/influxdb/v2 v2.7.12

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,8 @@ github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc h1:PXZQA2WCxe85T
567567
github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
568568
github.com/grafana/alerting v0.0.0-20250711181610-8eef376f49f8 h1:XUfln7L8Lz1E+gWU3Zz9+H+qIIqsBEls57vZmokoQog=
569569
github.com/grafana/alerting v0.0.0-20250711181610-8eef376f49f8/go.mod h1:gtR7agmxVfJOmNKV/n2ZULgOYTYNL+PDKYB5N48tQ7Q=
570-
github.com/grafana/dskit v0.0.0-20250805180558-d916df8a1fad h1:4M3+4bFppP28BmA0y42QSQB2cdNm/YSyNLLUr8m0Uqw=
571-
github.com/grafana/dskit v0.0.0-20250805180558-d916df8a1fad/go.mod h1:gVg14WngG7SMnJ/5mZGNFAs31+7BhspoWfmZ/U4rb90=
570+
github.com/grafana/dskit v0.0.0-20251028191123-0de50c403525 h1:jRWQt+3uA10AxFrdhDk1u8yE6rJNpQBLBVtYivaB0B0=
571+
github.com/grafana/dskit v0.0.0-20251028191123-0de50c403525/go.mod h1:gVg14WngG7SMnJ/5mZGNFAs31+7BhspoWfmZ/U4rb90=
572572
github.com/grafana/e2e v0.1.2-0.20250428181430-708d63bcc673 h1:Va04sDlP33f1SFUHRTho4QJfDlGTz+/HnBIpYwlqV9Q=
573573
github.com/grafana/e2e v0.1.2-0.20250428181430-708d63bcc673/go.mod h1:JVmqPBe8A/pZWwRoJW5ZjyALeY5OXMzPl7LrVXOdZAI=
574574
github.com/grafana/goautoneg v0.0.0-20240607115440-f335c04c58ce h1:WI1olbgS+sEl77qxEYbmt9TgRUz7iLqmjh8lYPpGlKQ=

vendor/github.com/grafana/dskit/dns/miekgdns/resolver.go

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/grafana/dskit/dns/miekgdns2/resolver.go

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/grafana/dskit/dns/provider.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)