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 c09e1f083bd..bb465070ae7 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -60,6 +60,7 @@ Some features are enabled by default. You can disable these feature by setting t | `lokiQueryHints` | Enables query hints for Loki | Yes | | `alertingQueryOptimization` | Optimizes eligible queries in order to reduce load on datasources | | | `betterPageScrolling` | Removes CustomScrollbar from the UI, relying on native browser scrollbars | Yes | +| `usePrometheusFrontendPackage` | Use the @grafana/prometheus frontend package in core Prometheus. | | | `cloudWatchNewLabelParsing` | Updates CloudWatch label parsing to be more accurate | Yes | ## Preview feature toggles @@ -174,7 +175,6 @@ Experimental features might be changed or removed without prior notice. | `nodeGraphDotLayout` | Changed the layout algorithm for the node graph | | `kubernetesAggregator` | Enable grafana aggregator | | `expressionParser` | Enable new expression parser | -| `usePrometheusFrontendPackage` | Use the @grafana/prometheus frontend package in core Prometheus. | ## Development feature toggles diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index eef709e022c..a18e4772436 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1175,7 +1175,7 @@ var ( { Name: "usePrometheusFrontendPackage", Description: "Use the @grafana/prometheus frontend package in core Prometheus.", - Stage: FeatureStageExperimental, + Stage: FeatureStageGeneralAvailability, FrontendOnly: true, Owner: grafanaObservabilityMetricsSquad, }, diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 68d481cedcd..1e51ca4ab1d 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -156,7 +156,7 @@ betterPageScrolling,GA,@grafana/grafana-frontend-platform,false,false,true authAPIAccessTokenAuth,experimental,@grafana/identity-access-team,false,false,false scopeFilters,experimental,@grafana/dashboards-squad,false,false,false ssoSettingsSAML,experimental,@grafana/identity-access-team,false,false,false -usePrometheusFrontendPackage,experimental,@grafana/observability-metrics,false,false,true +usePrometheusFrontendPackage,GA,@grafana/observability-metrics,false,false,true oauthRequireSubClaim,experimental,@grafana/identity-access-team,false,false,false newDashboardWithFiltersAndGroupBy,experimental,@grafana/dashboards-squad,false,false,false cloudWatchNewLabelParsing,GA,@grafana/aws-datasources,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 74669ba004b..4922e109530 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1465,12 +1465,15 @@ { "metadata": { "name": "usePrometheusFrontendPackage", - "resourceVersion": "1712639261786", - "creationTimestamp": "2024-04-09T05:07:41Z" + "resourceVersion": "1712841379965", + "creationTimestamp": "2024-04-09T05:07:41Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-04-11 13:16:19.965312 +0000 UTC" + } }, "spec": { "description": "Use the @grafana/prometheus frontend package in core Prometheus.", - "stage": "experimental", + "stage": "GA", "codeowner": "@grafana/observability-metrics", "frontend": true }