From 35d127491912428075dba6f08a2c945adda17561 Mon Sep 17 00:00:00 2001 From: Carl Bergquist Date: Thu, 21 Nov 2024 16:12:00 +0100 Subject: [PATCH] Logging: Enables unified error logging by default (#96512) enables unified error logging by default Signed-off-by: bergquist --- .../configure-grafana/feature-toggles/index.md | 2 +- pkg/services/featuremgmt/registry.go | 10 ++++++---- pkg/services/featuremgmt/toggles_gen.csv | 2 +- pkg/services/featuremgmt/toggles_gen.json | 13 +++++++++---- 4 files changed, 17 insertions(+), 10 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 80eb722167b..789beb9a939 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -36,6 +36,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `influxdbBackendMigration` | Query InfluxDB InfluxQL without the proxy | Yes | | `lokiMetricDataplane` | Changes metric responses from Loki to be compliant with the dataplane specification. | Yes | | `dataplaneFrontendFallback` | Support dataplane contract field name change for transformations and field name matchers where the name is different | Yes | +| `unifiedRequestLog` | Writes error logs to the request logger | Yes | | `recordedQueriesMulti` | Enables writing multiple items from a single query within Recorded Queries | Yes | | `logsExploreTableVisualisation` | A table visualisation for logs in Explore | Yes | | `transformationsRedesign` | Enables the transformations redesign | Yes | @@ -147,7 +148,6 @@ Experimental features might be changed or removed without prior notice. | `alertStateHistoryLokiSecondary` | Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations. | | `alertStateHistoryLokiPrimary` | Enable a remote Loki instance as the primary source for state history reads. | | `alertStateHistoryLokiOnly` | Disable Grafana alerts from emitting annotations when a remote Loki instance is available. | -| `unifiedRequestLog` | Writes error logs to the request logger | | `extraThemes` | Enables extra themes | | `lokiPredefinedOperations` | Adds predefined query operations to Loki query editor | | `pluginsFrontendSandbox` | Enables the plugins frontend sandbox | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index e0479cf21d8..3c3823981c8 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -364,10 +364,12 @@ var ( Owner: grafanaAlertingSquad, }, { - Name: "unifiedRequestLog", - Description: "Writes error logs to the request logger", - Stage: FeatureStageExperimental, - Owner: grafanaBackendGroup, + Name: "unifiedRequestLog", + Description: "Writes error logs to the request logger", + Stage: FeatureStageGeneralAvailability, + Owner: grafanaBackendGroup, + Expression: "true", + HideFromAdminPage: true, }, { Name: "renderAuthJWT", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index bf16af29d46..bd6982ee039 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -47,7 +47,7 @@ disableSSEDataplane,experimental,@grafana/observability-metrics,false,false,fals alertStateHistoryLokiSecondary,experimental,@grafana/alerting-squad,false,false,false alertStateHistoryLokiPrimary,experimental,@grafana/alerting-squad,false,false,false alertStateHistoryLokiOnly,experimental,@grafana/alerting-squad,false,false,false -unifiedRequestLog,experimental,@grafana/grafana-backend-group,false,false,false +unifiedRequestLog,GA,@grafana/grafana-backend-group,false,false,false renderAuthJWT,preview,@grafana/grafana-as-code,false,false,false refactorVariablesTimeRange,preview,@grafana/dashboards-squad,false,false,false faroDatasourceSelector,preview,@grafana/app-o11y,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index f1f7a7cd6d4..8d71e0d3bf5 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -3374,13 +3374,18 @@ { "metadata": { "name": "unifiedRequestLog", - "resourceVersion": "1718727528075", - "creationTimestamp": "2023-03-31T13:38:09Z" + "resourceVersion": "1731688509416", + "creationTimestamp": "2023-03-31T13:38:09Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-11-15 16:35:09.416681 +0000 UTC" + } }, "spec": { "description": "Writes error logs to the request logger", - "stage": "experimental", - "codeowner": "@grafana/grafana-backend-group" + "stage": "GA", + "codeowner": "@grafana/grafana-backend-group", + "hideFromAdminPage": true, + "expression": "true" } }, {