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 4c76c953907..eed352e9df4 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -67,6 +67,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `cloudWatchNewLabelParsing` | Updates CloudWatch label parsing to be more accurate | Yes | | `newDashboardSharingComponent` | Enables the new sharing drawer design | Yes | | `pluginProxyPreserveTrailingSlash` | Preserve plugin proxy trailing slash. | | +| `azureMonitorPrometheusExemplars` | Allows configuration of Azure Monitor as a data source that can provide Prometheus exemplars | Yes | | `pinNavItems` | Enables pinning of nav items | Yes | | `alertingApiServer` | Register Alerting APIs with the K8s API server | Yes | | `cloudWatchRoundUpEndTime` | Round up end time for metric queries to the next minute to avoid missing data | Yes | @@ -110,7 +111,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `regressionTransformation` | Enables regression analysis transformation | | `onPremToCloudMigrations` | Enable the Grafana Migration Assistant, which helps you easily migrate on-prem resources, such as dashboards, folders, and data source configurations, to your Grafana Cloud stack. | | `alertingSaveStateCompressed` | Enables the compressed protobuf-based alert state storage | -| `azureMonitorPrometheusExemplars` | Allows configuration of Azure Monitor as a data source that can provide Prometheus exemplars | | `ssoSettingsLDAP` | Use the new SSO Settings API to configure LDAP | | `improvedExternalSessionHandling` | Enables improved support for OAuth external sessions. After enabling this feature, users might need to re-authenticate themselves. | | `elasticsearchCrossClusterSearch` | Enables cross cluster search in the Elasticsearch datasource | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 4ed992d0956..2b19dd128ac 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -686,6 +686,7 @@ export interface FeatureToggles { pluginProxyPreserveTrailingSlash?: boolean; /** * Allows configuration of Azure Monitor as a data source that can provide Prometheus exemplars + * @default true */ azureMonitorPrometheusExemplars?: boolean; /** diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index e651f09a6ee..12078b32efb 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1179,8 +1179,9 @@ var ( { Name: "azureMonitorPrometheusExemplars", Description: "Allows configuration of Azure Monitor as a data source that can provide Prometheus exemplars", - Stage: FeatureStagePublicPreview, + Stage: FeatureStageGeneralAvailability, Owner: grafanaPartnerPluginsSquad, + Expression: "true", // enabled by default }, { Name: "pinNavItems", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index a6c70e9389e..259222c048e 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -153,7 +153,7 @@ alertingDisableSendAlertsExternal,experimental,@grafana/alerting-squad,false,fal preserveDashboardStateWhenNavigating,experimental,@grafana/dashboards-squad,false,false,false alertingCentralAlertHistory,experimental,@grafana/alerting-squad,false,false,true pluginProxyPreserveTrailingSlash,GA,@grafana/plugins-platform-backend,false,false,false -azureMonitorPrometheusExemplars,preview,@grafana/partner-datasources,false,false,false +azureMonitorPrometheusExemplars,GA,@grafana/partner-datasources,false,false,false pinNavItems,GA,@grafana/grafana-frontend-platform,false,false,false authZGRPCServer,experimental,@grafana/identity-access-team,false,false,false ssoSettingsLDAP,preview,@grafana/identity-access-team,false,true,false diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 34c64774a3a..698a8cf68d7 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -904,16 +904,17 @@ { "metadata": { "name": "azureMonitorPrometheusExemplars", - "resourceVersion": "1723028568258", + "resourceVersion": "1739465911959", "creationTimestamp": "2024-06-06T16:53:17Z", "annotations": { - "grafana.app/updatedTimestamp": "2024-08-07 11:02:48.258776 +0000 UTC" + "grafana.app/updatedTimestamp": "2025-02-13 16:58:31.95981 +0000 UTC" } }, "spec": { "description": "Allows configuration of Azure Monitor as a data source that can provide Prometheus exemplars", - "stage": "preview", - "codeowner": "@grafana/partner-datasources" + "stage": "GA", + "codeowner": "@grafana/partner-datasources", + "expression": "true" } }, {