diff --git a/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md b/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md index 82eec98249a..601a258764f 100644 --- a/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md +++ b/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md @@ -555,10 +555,6 @@ A space-separated list of memcached servers. Example: `memcached-server-1:11211 The default is `"localhost:11211"`. -{{< admonition type="note" >}} -The following memcached configuration requires the `tlsMemcached` feature toggle. -{{< /admonition >}} - ### tls_enabled Enables TLS authentication for memcached. Defaults to `false`. diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md index 3dc9644a371..a060cc4f750 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -52,7 +52,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `onPremToCloudMigrations` | Enable the Grafana Migration Assistant, which helps you easily migrate various on-prem resources to your Grafana Cloud stack. | Yes | | `groupToNestedTableTransformation` | Enables the group to nested table transformation | Yes | | `newPDFRendering` | New implementation for the dashboard-to-PDF rendering | Yes | -| `tlsMemcached` | Use TLS-enabled memcached in the enterprise caching feature | Yes | | `cloudWatchNewLabelParsing` | Updates CloudWatch label parsing to be more accurate | Yes | | `pluginProxyPreserveTrailingSlash` | Preserve plugin proxy trailing slash. | | | `azureMonitorPrometheusExemplars` | Allows configuration of Azure Monitor as a data source that can provide Prometheus exemplars | Yes | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index ca060edf289..003915fdf0b 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -501,11 +501,6 @@ export interface FeatureToggles { */ newPDFRendering?: boolean; /** - * Use TLS-enabled memcached in the enterprise caching feature - * @default true - */ - tlsMemcached?: boolean; - /** * Enable grafana's embedded kube-aggregator */ kubernetesAggregator?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index e36d0a179b7..4e9ae6ad99b 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -846,14 +846,6 @@ var ( Owner: grafanaOperatorExperienceSquad, Expression: "true", // enabled by default, }, - { - Name: "tlsMemcached", - Description: "Use TLS-enabled memcached in the enterprise caching feature", - Stage: FeatureStageGeneralAvailability, - Owner: grafanaOperatorExperienceSquad, - Expression: "true", - AllowSelfServe: false, // the non-tls implementation is slated for removal - }, { Name: "kubernetesAggregator", Description: "Enable grafana's embedded kube-aggregator", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 5af160f478d..c9feefaf19c 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -111,7 +111,6 @@ sqlExpressions,preview,@grafana/grafana-datasources-core-services,false,false,fa sqlExpressionsColumnAutoComplete,experimental,@grafana/datapro,false,false,true groupToNestedTableTransformation,GA,@grafana/datapro,false,false,true newPDFRendering,GA,@grafana/grafana-operator-experience-squad,false,false,false -tlsMemcached,GA,@grafana/grafana-operator-experience-squad,false,false,false kubernetesAggregator,experimental,@grafana/grafana-app-platform-squad,false,true,false kubernetesAggregatorCapTokenAuth,experimental,@grafana/grafana-app-platform-squad,false,true,false groupByVariable,experimental,@grafana/dashboards-squad,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 805e9e25f7b..1e09c590853 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -455,10 +455,6 @@ const ( // New implementation for the dashboard-to-PDF rendering FlagNewPDFRendering = "newPDFRendering" - // FlagTlsMemcached - // Use TLS-enabled memcached in the enterprise caching feature - FlagTlsMemcached = "tlsMemcached" - // FlagKubernetesAggregator // Enable grafana's embedded kube-aggregator FlagKubernetesAggregator = "kubernetesAggregator" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 66991f3e102..d6131bfe044 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -4047,7 +4047,8 @@ "metadata": { "name": "tlsMemcached", "resourceVersion": "1753448760331", - "creationTimestamp": "2024-05-09T19:12:08Z" + "creationTimestamp": "2024-05-09T19:12:08Z", + "deletionTimestamp": "2025-11-11T13:50:51Z" }, "spec": { "description": "Use TLS-enabled memcached in the enterprise caching feature",