From e422309bc4475e1ab790788665ee26abcf1464af Mon Sep 17 00:00:00 2001 From: Sven Grossmann Date: Wed, 14 Feb 2024 17:24:56 +0100 Subject: [PATCH] Loki: Enable `lokiStructuredMetadata` feature flag by default (#82325) --- .../configure-grafana/feature-toggles/index.md | 2 +- pkg/services/featuremgmt/registry.go | 3 ++- pkg/services/featuremgmt/toggles_gen.csv | 2 +- pkg/services/featuremgmt/toggles_gen.json | 9 ++++++--- 4 files changed, 10 insertions(+), 6 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 2e1a47552db..b55db718cfc 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -51,6 +51,7 @@ Some features are enabled by default. You can disable these feature by setting t | `alertingInsights` | Show the new alerting insights landing page | Yes | | `cloudWatchWildCardDimensionValues` | Fetches dimension values from CloudWatch to correctly label wildcard dimensions | Yes | | `recoveryThreshold` | Enables feature recovery threshold (aka hysteresis) for threshold server-side expression | Yes | +| `lokiStructuredMetadata` | Enables the loki data source to request structured metadata from the Loki server | Yes | | `logRowsPopoverMenu` | Enable filtering menu displayed when text of a log line is selected | Yes | | `displayAnonymousStats` | Enables anonymous stats to be shown in the UI for Grafana | Yes | | `lokiQueryHints` | Enables query hints for Loki | Yes | @@ -152,7 +153,6 @@ Experimental features might be changed or removed without prior notice. | `enableNativeHTTPHistogram` | Enables native HTTP Histograms | | `kubernetesPlaylists` | Use the kubernetes API in the frontend for playlists, and route /api/playlist requests to k8s | | `kubernetesSnapshots` | Routes snapshot requests from /api to the /apis endpoint | -| `lokiStructuredMetadata` | Enables the loki data source to request structured metadata from the Loki server | | `teamHttpHeaders` | Enables datasources to apply team headers to the client requests | | `cachingOptimizeSerializationMemoryUsage` | If enabled, the caching backend gradually serializes query responses for the cache, comparing against the configured `[caching]max_value_mb` value as it goes. This can can help prevent Grafana from running out of memory while attempting to cache very large query responses. | | `pluginsInstrumentationStatusSource` | Include a status source label for plugin request metrics and logs | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 63338b3a313..8a0c634fa0b 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -878,9 +878,10 @@ var ( { Name: "lokiStructuredMetadata", Description: "Enables the loki data source to request structured metadata from the Loki server", - Stage: FeatureStageExperimental, + Stage: FeatureStageGeneralAvailability, FrontendOnly: false, Owner: grafanaObservabilityLogsSquad, + Expression: "true", }, { Name: "teamHttpHeaders", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index d9afdaddd8f..311805fac1d 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -116,7 +116,7 @@ kubernetesSnapshots,experimental,@grafana/grafana-app-platform-squad,false,true, kubernetesQueryServiceRewrite,experimental,@grafana/grafana-app-platform-squad,true,true,false cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false recoveryThreshold,GA,@grafana/alerting-squad,false,true,false -lokiStructuredMetadata,experimental,@grafana/observability-logs,false,false,false +lokiStructuredMetadata,GA,@grafana/observability-logs,false,false,false teamHttpHeaders,experimental,@grafana/identity-access-team,false,false,false awsDatasourcesNewFormStyling,preview,@grafana/aws-datasources,false,false,true cachingOptimizeSerializationMemoryUsage,experimental,@grafana/grafana-operator-experience-squad,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index a28c68c5842..28f3c3ed3b7 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1468,12 +1468,15 @@ { "metadata": { "name": "lokiStructuredMetadata", - "resourceVersion": "1700136000000", - "creationTimestamp": "2023-11-16T12:00:00Z" + "resourceVersion": "1707755676105", + "creationTimestamp": "2023-11-16T12:00:00Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-02-12 16:34:36.105725 +0000 UTC" + } }, "spec": { "description": "Enables the loki data source to request structured metadata from the Loki server", - "stage": "experimental", + "stage": "GA", "codeowner": "@grafana/observability-logs" } },