From 16ab9f237f5c7d3640da9a24fd5c2cc3eb74ba00 Mon Sep 17 00:00:00 2001 From: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> Date: Mon, 2 Mar 2026 16:50:40 -0800 Subject: [PATCH] Graduate memcached DNS-based service discovery from experimental Remove experimental markers for memcached DNS-based service discovery: - Remove "EXPERIMENTAL:" prefix from the addresses flag description - Remove WarnExperimentalUse call - Remove unused util_log import - Remove from experimental features list in v1-guarantees.md Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> --- docs/configuration/config-file-reference.md | 2 +- docs/configuration/v1-guarantees.md | 1 - pkg/chunk/cache/memcached_client.go | 5 +---- schemas/cortex-config-schema.json | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/docs/configuration/config-file-reference.md b/docs/configuration/config-file-reference.md index e8578744bd0..40fe5041a15 100644 --- a/docs/configuration/config-file-reference.md +++ b/docs/configuration/config-file-reference.md @@ -4656,7 +4656,7 @@ The `memcached_client_config` configures the client used to connect to Memcached # CLI flag: -frontend.memcached.service [service: | default = "memcached"] -# EXPERIMENTAL: Comma separated addresses list in DNS Service Discovery format: +# Comma separated addresses list in DNS Service Discovery format: # https://cortexmetrics.io/docs/configuration/arguments/#dns-service-discovery # CLI flag: -frontend.memcached.addresses [addresses: | default = ""] diff --git a/docs/configuration/v1-guarantees.md b/docs/configuration/v1-guarantees.md index a7d9a8ded7c..0cbb0777d2a 100644 --- a/docs/configuration/v1-guarantees.md +++ b/docs/configuration/v1-guarantees.md @@ -46,7 +46,6 @@ Currently experimental features are: - API (enabled via `-experimental.alertmanager.enable-api`) - Sharding of tenants across multiple instances (enabled via `-alertmanager.sharding-enabled`) - Receiver integrations firewall (configured via `-alertmanager.receivers-firewall.*`) -- Memcached client DNS-based service discovery. - In-memory (FIFO) and Redis cache. - gRPC Store. - TLS configuration in gRPC and HTTP clients. diff --git a/pkg/chunk/cache/memcached_client.go b/pkg/chunk/cache/memcached_client.go index 49c3edd4d79..cc9890734c1 100644 --- a/pkg/chunk/cache/memcached_client.go +++ b/pkg/chunk/cache/memcached_client.go @@ -18,8 +18,6 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/sony/gobreaker" "github.com/thanos-io/thanos/pkg/discovery/dns" - - util_log "github.com/cortexproject/cortex/pkg/util/log" ) // MemcachedClient interface exists for mocking memcacheClient. @@ -82,7 +80,7 @@ type MemcachedClientConfig struct { func (cfg *MemcachedClientConfig) RegisterFlagsWithPrefix(prefix, description string, f *flag.FlagSet) { f.StringVar(&cfg.Host, prefix+"memcached.hostname", "", description+"Hostname for memcached service to use. If empty and if addresses is unset, no memcached will be used.") f.StringVar(&cfg.Service, prefix+"memcached.service", "memcached", description+"SRV service used to discover memcache servers.") - f.StringVar(&cfg.Addresses, prefix+"memcached.addresses", "", description+"EXPERIMENTAL: Comma separated addresses list in DNS Service Discovery format: https://cortexmetrics.io/docs/configuration/arguments/#dns-service-discovery") + f.StringVar(&cfg.Addresses, prefix+"memcached.addresses", "", description+"Comma separated addresses list in DNS Service Discovery format: https://cortexmetrics.io/docs/configuration/arguments/#dns-service-discovery") f.IntVar(&cfg.MaxIdleConns, prefix+"memcached.max-idle-conns", 16, description+"Maximum number of idle connections in pool.") f.DurationVar(&cfg.Timeout, prefix+"memcached.timeout", 100*time.Millisecond, description+"Maximum time to wait before giving up on memcached requests.") f.DurationVar(&cfg.UpdateInterval, prefix+"memcached.update-interval", 1*time.Minute, description+"Period with which to poll DNS for memcache servers.") @@ -145,7 +143,6 @@ func NewMemcachedClient(cfg MemcachedClientConfig, name string, r prometheus.Reg } if len(cfg.Addresses) > 0 { - util_log.WarnExperimentalUse("DNS-based memcached service discovery") newClient.addresses = strings.Split(cfg.Addresses, ",") } diff --git a/schemas/cortex-config-schema.json b/schemas/cortex-config-schema.json index bb6a328ba9d..79543138665 100644 --- a/schemas/cortex-config-schema.json +++ b/schemas/cortex-config-schema.json @@ -5753,7 +5753,7 @@ "description": "The memcached_client_config configures the client used to connect to Memcached.", "properties": { "addresses": { - "description": "EXPERIMENTAL: Comma separated addresses list in DNS Service Discovery format: https://cortexmetrics.io/docs/configuration/arguments/#dns-service-discovery", + "description": "Comma separated addresses list in DNS Service Discovery format: https://cortexmetrics.io/docs/configuration/arguments/#dns-service-discovery", "type": "string", "x-cli-flag": "frontend.memcached.addresses" },