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 de2c40008d3..2d0289f9e20 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -174,7 +174,7 @@ Experimental features might be changed or removed without prior notice. | `promQLScope` | In-development feature that will allow injection of labels into prometheus queries. | | `sqlExpressions` | Enables using SQL and DuckDB functions as Expressions. | | `nodeGraphDotLayout` | Changed the layout algorithm for the node graph | -| `kubernetesAggregator` | Enable grafana aggregator | +| `kubernetesAggregator` | Enable grafana's embedded kube-aggregator | | `expressionParser` | Enable new expression parser | | `accessActionSets` | Introduces action sets for resource permissions | | `disableNumericMetricsSortingInExpressions` | In server-side expressions, disable the sorting of numeric-kind metrics by their metric name or labels. | @@ -191,6 +191,7 @@ Experimental features might be changed or removed without prior notice. | `databaseReadReplica` | Use a read replica for some database queries. | | `alertingApiServer` | Register Alerting APIs with the K8s API server | | `dashboardRestoreUI` | Enables the frontend to be able to restore a recently deleted dashboard | +| `dataplaneAggregator` | Enable grafana dataplane aggregator | ## Development feature toggles diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index f491717d4d9..80f49756040 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -199,4 +199,5 @@ export interface FeatureToggles { bodyScrolling?: boolean; cloudwatchMetricInsightsCrossAccount?: boolean; prometheusAzureOverrideAudience?: boolean; + dataplaneAggregator?: boolean; } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 7cb260cfd7d..ad9f3c66109 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1082,7 +1082,7 @@ var ( }, { Name: "kubernetesAggregator", - Description: "Enable grafana aggregator", + Description: "Enable grafana's embedded kube-aggregator", Stage: FeatureStageExperimental, Owner: grafanaAppPlatformSquad, RequiresRestart: true, @@ -1372,6 +1372,13 @@ var ( Owner: grafanaPartnerPluginsSquad, Expression: "true", // Enabled by default for now }, + { + Name: "dataplaneAggregator", + Description: "Enable grafana dataplane aggregator", + Stage: FeatureStageExperimental, + Owner: grafanaAppPlatformSquad, + RequiresRestart: true, + }, } ) diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 812254ceed7..cfc84346101 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -180,3 +180,4 @@ cloudWatchRoundUpEndTime,GA,@grafana/aws-datasources,false,false,false bodyScrolling,preview,@grafana/grafana-frontend-platform,false,false,true cloudwatchMetricInsightsCrossAccount,preview,@grafana/aws-datasources,false,false,true prometheusAzureOverrideAudience,deprecated,@grafana/partner-datasources,false,false,false +dataplaneAggregator,experimental,@grafana/grafana-app-platform-squad,false,true,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 67f61520a6b..4d61160b851 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -580,7 +580,7 @@ const ( FlagTlsMemcached = "tlsMemcached" // FlagKubernetesAggregator - // Enable grafana aggregator + // Enable grafana's embedded kube-aggregator FlagKubernetesAggregator = "kubernetesAggregator" // FlagExpressionParser @@ -730,4 +730,8 @@ const ( // FlagPrometheusAzureOverrideAudience // Deprecated. Allow override default AAD audience for Azure Prometheus endpoint. Enabled by default. This feature should no longer be used and will be removed in the future. FlagPrometheusAzureOverrideAudience = "prometheusAzureOverrideAudience" + + // FlagDataplaneAggregator + // Enable grafana dataplane aggregator + FlagDataplaneAggregator = "dataplaneAggregator" ) diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index d4085a1015a..2ab830e5681 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -803,6 +803,19 @@ "expression": "false" } }, + { + "metadata": { + "name": "dataplaneAggregator", + "resourceVersion": "1723151074613", + "creationTimestamp": "2024-08-08T21:04:34Z" + }, + "spec": { + "description": "Enable grafana dataplane aggregator", + "stage": "experimental", + "codeowner": "@grafana/grafana-app-platform-squad", + "requiresRestart": true + } + }, { "metadata": { "name": "dataplaneFrontendFallback", @@ -1352,11 +1365,14 @@ { "metadata": { "name": "kubernetesAggregator", - "resourceVersion": "1718727528075", - "creationTimestamp": "2024-02-12T20:59:35Z" + "resourceVersion": "1723151074613", + "creationTimestamp": "2024-02-12T20:59:35Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-08-08 21:04:34.613161685 +0000 UTC" + } }, "spec": { - "description": "Enable grafana aggregator", + "description": "Enable grafana's embedded kube-aggregator", "stage": "experimental", "codeowner": "@grafana/grafana-app-platform-squad", "requiresRestart": true