From d18e0d518affc98c95473d63e8163258803834ea Mon Sep 17 00:00:00 2001 From: Isabella Siu Date: Tue, 30 Dec 2025 15:05:44 -0500 Subject: [PATCH] Cloudwatch: make cloudwatchBatchQueries GA --- .../configure-grafana/feature-toggles/index.md | 2 +- .../grafana-data/src/types/featureToggles.gen.ts | 1 + pkg/services/featuremgmt/registry.go | 3 ++- pkg/services/featuremgmt/toggles_gen.csv | 2 +- pkg/services/featuremgmt/toggles_gen.json | 12 ++++++++---- 5 files changed, 13 insertions(+), 7 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 16c97f6d10a..751d9d57d52 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- | `awsAsyncQueryCaching` | Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled | Yes | | `dashgpt` | Enable AI powered features in dashboards | Yes | | `kubernetesDashboards` | Use the kubernetes API in the frontend for dashboards | Yes | +| `cloudWatchBatchQueries` | Runs CloudWatch metrics queries as separate batches | Yes | | `annotationPermissionUpdate` | Change the way annotation permissions work by scoping them to folders and dashboards. | Yes | | `dashboardSceneForViewers` | Enables dashboard rendering using Scenes for viewer roles | Yes | | `dashboardSceneSolo` | Enables rendering dashboards using scenes for solo panels | Yes | @@ -83,7 +84,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `enableDatagridEditing` | Enables the edit functionality in the datagrid panel | | `reportingRetries` | Enables rendering retries for the reporting feature | | `externalServiceAccounts` | Automatic service account and token setup for plugins | -| `cloudWatchBatchQueries` | Runs CloudWatch metrics queries as separate batches | | `pdfTables` | Enables generating table data as PDF in reporting | | `canvasPanelPanZoom` | Allow pan and zoom in canvas panel | | `alertingSaveStateCompressed` | Enables the compressed protobuf-based alert state storage. Default is enabled. | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index aebbab8c6f9..61ef25aa55d 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -305,6 +305,7 @@ export interface FeatureToggles { queryServiceFromUI?: boolean; /** * Runs CloudWatch metrics queries as separate batches + * @default true */ cloudWatchBatchQueries?: boolean; /** diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 3748db8e6b4..ed592b57554 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -490,8 +490,9 @@ var ( { Name: "cloudWatchBatchQueries", Description: "Runs CloudWatch metrics queries as separate batches", - Stage: FeatureStagePublicPreview, + Stage: FeatureStageGeneralAvailability, Owner: awsDatasourcesSquad, + Expression: "true", }, { Name: "cachingOptimizeSerializationMemoryUsage", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 0c85021cff8..a7c538b4055 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -67,7 +67,7 @@ queryService,experimental,@grafana/grafana-datasources-core-services,false,true, queryServiceWithConnections,experimental,@grafana/grafana-datasources-core-services,false,true,false queryServiceRewrite,experimental,@grafana/grafana-datasources-core-services,false,true,false queryServiceFromUI,experimental,@grafana/grafana-datasources-core-services,false,false,true -cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false +cloudWatchBatchQueries,GA,@grafana/aws-datasources,false,false,false cachingOptimizeSerializationMemoryUsage,experimental,@grafana/grafana-operator-experience-squad,false,false,false alertmanagerRemoteSecondary,experimental,@grafana/alerting-squad,false,false,false alertingProvenanceLockWrites,experimental,@grafana/alerting-squad,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 6d55a6ca617..9c6295be62e 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -874,13 +874,17 @@ { "metadata": { "name": "cloudWatchBatchQueries", - "resourceVersion": "1764664939750", - "creationTimestamp": "2023-10-20T19:09:41Z" + "resourceVersion": "1767124751522", + "creationTimestamp": "2023-10-20T19:09:41Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-12-30 19:59:11.522773 +0000 UTC" + } }, "spec": { "description": "Runs CloudWatch metrics queries as separate batches", - "stage": "preview", - "codeowner": "@grafana/aws-datasources" + "stage": "GA", + "codeowner": "@grafana/aws-datasources", + "expression": "true" } }, {