From 14ad1dec3828e9b446fedbaf88d16061daecacea Mon Sep 17 00:00:00 2001 From: Carl Bergquist Date: Tue, 11 Mar 2025 10:12:58 +0100 Subject: [PATCH] conf: hides scope feature toggles from docs (#101913) Signed-off-by: bergquist --- .../feature-toggles/index.md | 1 - pkg/services/featuremgmt/registry.go | 24 +++++++++++-------- pkg/services/featuremgmt/toggles_gen.json | 15 ++++++++---- 3 files changed, 25 insertions(+), 15 deletions(-) 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 fbc2e986f46..66ca24087ad 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -60,7 +60,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `logRowsPopoverMenu` | Enable filtering menu displayed when text of a log line is selected | Yes | | `lokiQueryHints` | Enables query hints for Loki | Yes | | `alertingQueryOptimization` | Optimizes eligible queries in order to reduce load on datasources | | -| `promQLScope` | In-development feature that will allow injection of labels into prometheus queries. | 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 | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index dfb8405c2ea..45080db02f1 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -983,18 +983,22 @@ var ( Expression: "false", }, { - Name: "promQLScope", - Description: "In-development feature that will allow injection of labels into prometheus queries.", - Stage: FeatureStageGeneralAvailability, - Owner: grafanaOSSBigTent, - Expression: "true", + Name: "promQLScope", + Description: "In-development feature that will allow injection of labels into prometheus queries.", + Stage: FeatureStageGeneralAvailability, + Owner: grafanaOSSBigTent, + Expression: "true", + HideFromDocs: true, + HideFromAdminPage: true, }, { - Name: "logQLScope", - Description: "In-development feature that will allow injection of labels into loki queries.", - Stage: FeatureStagePrivatePreview, - Owner: grafanaObservabilityLogsSquad, - Expression: "false", + Name: "logQLScope", + Description: "In-development feature that will allow injection of labels into loki queries.", + Stage: FeatureStagePrivatePreview, + Owner: grafanaObservabilityLogsSquad, + Expression: "false", + HideFromDocs: true, + HideFromAdminPage: true, }, { Name: "sqlExpressions", diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index b42c54bc438..ac910ee0efd 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2417,13 +2417,18 @@ { "metadata": { "name": "logQLScope", - "resourceVersion": "1730842404843", - "creationTimestamp": "2024-11-11T11:53:24Z" + "resourceVersion": "1741643492217", + "creationTimestamp": "2024-11-11T11:53:24Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-03-10 21:51:32.217697 +0000 UTC" + } }, "spec": { "description": "In-development feature that will allow injection of labels into loki queries.", "stage": "privatePreview", "codeowner": "@grafana/observability-logs", + "hideFromAdminPage": true, + "hideFromDocs": true, "expression": "false" } }, @@ -3262,16 +3267,18 @@ { "metadata": { "name": "promQLScope", - "resourceVersion": "1735845919509", + "resourceVersion": "1741643492217", "creationTimestamp": "2024-01-29T20:22:17Z", "annotations": { - "grafana.app/updatedTimestamp": "2025-01-02 19:25:19.509884 +0000 UTC" + "grafana.app/updatedTimestamp": "2025-03-10 21:51:32.217697 +0000 UTC" } }, "spec": { "description": "In-development feature that will allow injection of labels into prometheus queries.", "stage": "GA", "codeowner": "@grafana/oss-big-tent", + "hideFromAdminPage": true, + "hideFromDocs": true, "expression": "true" } },