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.

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

Upgrade DSKit #10821

Merged
merged 1 commit into from
Mar 6, 2025
Merged

Upgrade DSKit #10821

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
40 changes: 20 additions & 20 deletions cmd/mimir/config-descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6597,12 +6597,12 @@
},
{
"kind": "field",
"name": "dns_initialization_enabled",
"name": "dns_ignore_startup_failures",
"required": false,
"desc": "Enable initial DNS lookup and background resolution on memcached client creation.",
"desc": "Allow client creation even if initial DNS resolution fails.",
"fieldValue": null,
"fieldDefaultValue": true,
"fieldFlag": "query-frontend.results-cache.memcached.dns-initialization-enabled",
"fieldDefaultValue": false,
"fieldFlag": "query-frontend.results-cache.memcached.dns-ignore-startup-failures",
"fieldType": "boolean",
"fieldCategory": "experimental"
}
Expand Down Expand Up @@ -8752,12 +8752,12 @@
},
{
"kind": "field",
"name": "dns_initialization_enabled",
"name": "dns_ignore_startup_failures",
"required": false,
"desc": "Enable initial DNS lookup and background resolution on memcached client creation.",
"desc": "Allow client creation even if initial DNS resolution fails.",
"fieldValue": null,
"fieldDefaultValue": true,
"fieldFlag": "blocks-storage.bucket-store.index-cache.memcached.dns-initialization-enabled",
"fieldDefaultValue": false,
"fieldFlag": "blocks-storage.bucket-store.index-cache.memcached.dns-ignore-startup-failures",
"fieldType": "boolean",
"fieldCategory": "experimental"
}
Expand Down Expand Up @@ -9326,12 +9326,12 @@
},
{
"kind": "field",
"name": "dns_initialization_enabled",
"name": "dns_ignore_startup_failures",
"required": false,
"desc": "Enable initial DNS lookup and background resolution on memcached client creation.",
"desc": "Allow client creation even if initial DNS resolution fails.",
"fieldValue": null,
"fieldDefaultValue": true,
"fieldFlag": "blocks-storage.bucket-store.chunks-cache.memcached.dns-initialization-enabled",
"fieldDefaultValue": false,
"fieldFlag": "blocks-storage.bucket-store.chunks-cache.memcached.dns-ignore-startup-failures",
"fieldType": "boolean",
"fieldCategory": "experimental"
}
Expand Down Expand Up @@ -9924,12 +9924,12 @@
},
{
"kind": "field",
"name": "dns_initialization_enabled",
"name": "dns_ignore_startup_failures",
"required": false,
"desc": "Enable initial DNS lookup and background resolution on memcached client creation.",
"desc": "Allow client creation even if initial DNS resolution fails.",
"fieldValue": null,
"fieldDefaultValue": true,
"fieldFlag": "blocks-storage.bucket-store.metadata-cache.memcached.dns-initialization-enabled",
"fieldDefaultValue": false,
"fieldFlag": "blocks-storage.bucket-store.metadata-cache.memcached.dns-ignore-startup-failures",
"fieldType": "boolean",
"fieldCategory": "experimental"
}
Expand Down Expand Up @@ -15244,12 +15244,12 @@
},
{
"kind": "field",
"name": "dns_initialization_enabled",
"name": "dns_ignore_startup_failures",
"required": false,
"desc": "Enable initial DNS lookup and background resolution on memcached client creation.",
"desc": "Allow client creation even if initial DNS resolution fails.",
"fieldValue": null,
"fieldDefaultValue": true,
"fieldFlag": "ruler-storage.cache.memcached.dns-initialization-enabled",
"fieldDefaultValue": false,
"fieldFlag": "ruler-storage.cache.memcached.dns-ignore-startup-failures",
"fieldType": "boolean",
"fieldCategory": "experimental"
}
Expand Down
20 changes: 10 additions & 10 deletions cmd/mimir/help-all.txt.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,8 @@ Usage of ./cmd/mimir/mimir:
Comma-separated list of memcached addresses. Each address can be an IP address, hostname, or an entry specified in the DNS Service Discovery format.
-blocks-storage.bucket-store.chunks-cache.memcached.connect-timeout duration
The connection timeout. (default 200ms)
-blocks-storage.bucket-store.chunks-cache.memcached.dns-initialization-enabled
[experimental] Enable initial DNS lookup and background resolution on memcached client creation. (default true)
-blocks-storage.bucket-store.chunks-cache.memcached.dns-ignore-startup-failures
[experimental] Allow client creation even if initial DNS resolution fails.
-blocks-storage.bucket-store.chunks-cache.memcached.max-async-buffer-size int
The maximum number of enqueued asynchronous operations allowed. (default 25000)
-blocks-storage.bucket-store.chunks-cache.memcached.max-async-concurrency int
Expand Down Expand Up @@ -545,8 +545,8 @@ Usage of ./cmd/mimir/mimir:
Comma-separated list of memcached addresses. Each address can be an IP address, hostname, or an entry specified in the DNS Service Discovery format.
-blocks-storage.bucket-store.index-cache.memcached.connect-timeout duration
The connection timeout. (default 200ms)
-blocks-storage.bucket-store.index-cache.memcached.dns-initialization-enabled
[experimental] Enable initial DNS lookup and background resolution on memcached client creation. (default true)
-blocks-storage.bucket-store.index-cache.memcached.dns-ignore-startup-failures
[experimental] Allow client creation even if initial DNS resolution fails.
-blocks-storage.bucket-store.index-cache.memcached.max-async-buffer-size int
The maximum number of enqueued asynchronous operations allowed. (default 25000)
-blocks-storage.bucket-store.index-cache.memcached.max-async-concurrency int
Expand Down Expand Up @@ -669,8 +669,8 @@ Usage of ./cmd/mimir/mimir:
Comma-separated list of memcached addresses. Each address can be an IP address, hostname, or an entry specified in the DNS Service Discovery format.
-blocks-storage.bucket-store.metadata-cache.memcached.connect-timeout duration
The connection timeout. (default 200ms)
-blocks-storage.bucket-store.metadata-cache.memcached.dns-initialization-enabled
[experimental] Enable initial DNS lookup and background resolution on memcached client creation. (default true)
-blocks-storage.bucket-store.metadata-cache.memcached.dns-ignore-startup-failures
[experimental] Allow client creation even if initial DNS resolution fails.
-blocks-storage.bucket-store.metadata-cache.memcached.max-async-buffer-size int
The maximum number of enqueued asynchronous operations allowed. (default 25000)
-blocks-storage.bucket-store.metadata-cache.memcached.max-async-concurrency int
Expand Down Expand Up @@ -2407,8 +2407,8 @@ Usage of ./cmd/mimir/mimir:
Comma-separated list of memcached addresses. Each address can be an IP address, hostname, or an entry specified in the DNS Service Discovery format.
-query-frontend.results-cache.memcached.connect-timeout duration
The connection timeout. (default 200ms)
-query-frontend.results-cache.memcached.dns-initialization-enabled
[experimental] Enable initial DNS lookup and background resolution on memcached client creation. (default true)
-query-frontend.results-cache.memcached.dns-ignore-startup-failures
[experimental] Allow client creation even if initial DNS resolution fails.
-query-frontend.results-cache.memcached.max-async-buffer-size int
The maximum number of enqueued asynchronous operations allowed. (default 25000)
-query-frontend.results-cache.memcached.max-async-concurrency int
Expand Down Expand Up @@ -2675,8 +2675,8 @@ Usage of ./cmd/mimir/mimir:
Comma-separated list of memcached addresses. Each address can be an IP address, hostname, or an entry specified in the DNS Service Discovery format.
-ruler-storage.cache.memcached.connect-timeout duration
The connection timeout. (default 200ms)
-ruler-storage.cache.memcached.dns-initialization-enabled
[experimental] Enable initial DNS lookup and background resolution on memcached client creation. (default true)
-ruler-storage.cache.memcached.dns-ignore-startup-failures
[experimental] Allow client creation even if initial DNS resolution fails.
-ruler-storage.cache.memcached.max-async-buffer-size int
The maximum number of enqueued asynchronous operations allowed. (default 25000)
-ruler-storage.cache.memcached.max-async-concurrency int
Expand Down
7 changes: 3 additions & 4 deletions docs/sources/mimir/configure/configuration-parameters/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5271,10 +5271,9 @@ The `memcached` block configures the Memcached-based caching backend. The suppor
# CLI flag: -<prefix>.memcached.tls-min-version
[tls_min_version: <string> | default = ""]

# (experimental) Enable initial DNS lookup and background resolution on
# memcached client creation.
# CLI flag: -<prefix>.memcached.dns-initialization-enabled
[dns_initialization_enabled: <boolean> | default = true]
# (experimental) Allow client creation even if initial DNS resolution fails.
# CLI flag: -<prefix>.memcached.dns-ignore-startup-failures
[dns_ignore_startup_failures: <boolean> | default = false]
```

### redis
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/golang/snappy v0.0.4
github.com/google/gopacket v1.1.19
github.com/gorilla/mux v1.8.1
github.com/grafana/dskit v0.0.0-20250303172748-fd4441b85237
github.com/grafana/dskit v0.0.0-20250306085730-ce8a4c05c652
github.com/grafana/e2e v0.1.2-0.20250306030804-b80b212be908
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/influxdata/influxdb/v2 v2.7.11
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,8 +1272,8 @@ github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc h1:PXZQA2WCxe85T
github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
github.com/grafana/alerting v0.0.0-20250225150117-15e285d78df2 h1:kESrzm0FcRVLmGIQCgl1MCwDGLH4sLzWphr7mcFdbfI=
github.com/grafana/alerting v0.0.0-20250225150117-15e285d78df2/go.mod h1:hdGB3dSl8Ma9Rjo2YiAEAjMkZ5HiNJbNDqRKDefRZrM=
github.com/grafana/dskit v0.0.0-20250303172748-fd4441b85237 h1:VZagYtPcmjgazfPAuWN7lER6mprG20r51+1eYPpATkw=
github.com/grafana/dskit v0.0.0-20250303172748-fd4441b85237/go.mod h1:cu2zIOHhAgRaIDuECsERftSp1l7KHq1aX1jgihQCu0c=
github.com/grafana/dskit v0.0.0-20250306085730-ce8a4c05c652 h1:2qPaT8hBXloPWB1CtYYpgGeEESsAh+VoBGgL1UpbOUc=
github.com/grafana/dskit v0.0.0-20250306085730-ce8a4c05c652/go.mod h1:cu2zIOHhAgRaIDuECsERftSp1l7KHq1aX1jgihQCu0c=
github.com/grafana/e2e v0.1.2-0.20250306030804-b80b212be908 h1:l3pFNUs4heAhiXnMo0thaJQrNWeE4SgLqUOEUmZtC6A=
github.com/grafana/e2e v0.1.2-0.20250306030804-b80b212be908/go.mod h1:JVmqPBe8A/pZWwRoJW5ZjyALeY5OXMzPl7LrVXOdZAI=
github.com/grafana/franz-go v0.0.0-20241009100846-782ba1442937 h1:fwwnG/NcygoS6XbAaEyK2QzMXI/BZIEJvQ3CD+7XZm8=
Expand Down
29 changes: 11 additions & 18 deletions vendor/github.com/grafana/dskit/cache/memcached_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions vendor/github.com/grafana/dskit/flagext/secret.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading