diff --git a/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md b/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md index a1971ab40f0..f3f7daebbe4 100644 --- a/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md +++ b/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md @@ -178,6 +178,10 @@ Name of the TrueType font file with bold style. Name of the TrueType font file with italic style. +### max_retries_per_panel + +Maximum number of panel rendering request retries before returning an error. To disable the retry feature, enter `0`. This is available in public preview and requires the 'reportingRetries' feature toggle. + ## [auditing] [Auditing]({{< relref "../../configure-security/audit-grafana" >}}) allows you to track important changes to your Grafana instance. By default, audit logs are logged to file but the auditing feature also supports sending logs directly to Loki. 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 a11d99a80a9..7f4892e18a2 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -71,6 +71,7 @@ Some features are enabled by default. You can disable these feature by setting t | `dataSourcePageHeader` | Apply new pageHeader UI in data source edit page | | `sqlDatasourceDatabaseSelection` | Enables previous SQL data source dataset dropdown behavior | | `splitScopes` | Support faster dashboard and folder search by splitting permission scopes into parts | +| `reportingRetries` | Enables rendering retries for the reporting feature | ## Experimental feature toggles diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 262ba06b3a0..808cb78f427 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -122,4 +122,5 @@ export interface FeatureToggles { alertingNoDataErrorExecution?: boolean; angularDeprecationUI?: boolean; dashgpt?: boolean; + reportingRetries?: boolean; } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 2e967527795..284e56eaab8 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -722,5 +722,13 @@ var ( FrontendOnly: true, Owner: grafanaDashboardsSquad, }, + { + Name: "reportingRetries", + Description: "Enables rendering retries for the reporting feature", + Stage: FeatureStagePublicPreview, + FrontendOnly: false, + Owner: grafanaSharingSquad, + RequiresRestart: true, + }, } ) diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 7708284437e..9a45b1ef7ba 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -103,3 +103,4 @@ noBasicRole,experimental,@grafana/grafana-authnz-team,false,false,true,true alertingNoDataErrorExecution,privatePreview,@grafana/alerting-squad,false,false,true,false angularDeprecationUI,experimental,@grafana/plugins-platform-backend,false,false,false,true dashgpt,experimental,@grafana/dashboards-squad,false,false,false,true +reportingRetries,preview,@grafana/sharing-squad,false,false,true,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 806d81b39f8..5ef6bdb8949 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -422,4 +422,8 @@ const ( // FlagDashgpt // Enable AI powered features in dashboards FlagDashgpt = "dashgpt" + + // FlagReportingRetries + // Enables rendering retries for the reporting feature + FlagReportingRetries = "reportingRetries" )