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 5b31881de3d..446288dd46f 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -88,6 +88,7 @@ Alpha features might be changed or removed without prior notice. | `editPanelCSVDragAndDrop` | Enables drag and drop for CSV and Excel files | | `logsContextDatasourceUi` | Allow datasource to provide custom UI for context view | | `lokiQuerySplitting` | Split large interval queries into subqueries with smaller time intervals | +| `lokiQuerySplittingConfig` | Give users the option to configure split durations for Loki queries | | `individualCookiePreferences` | Support overriding cookie preferences per user | | `drawerDataSourcePicker` | Changes the user experience for data source selection to a drawer. | | `traceqlSearch` | Enables the 'TraceQL Search' tab for the Tempo datasource which provides a UI to generate TraceQL queries | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index f2f2c56975c..19dc07f7488 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -78,6 +78,7 @@ export interface FeatureToggles { logsSampleInExplore?: boolean; logsContextDatasourceUi?: boolean; lokiQuerySplitting?: boolean; + lokiQuerySplittingConfig?: boolean; individualCookiePreferences?: boolean; drawerDataSourcePicker?: boolean; traceqlSearch?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index a4a9609de40..ed0e63fac1a 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -400,6 +400,13 @@ var ( FrontendOnly: true, Owner: grafanaObservabilityLogsSquad, }, + { + Name: "lokiQuerySplittingConfig", + Description: "Give users the option to configure split durations for Loki queries", + State: FeatureStateAlpha, + FrontendOnly: true, + Owner: grafanaObservabilityLogsSquad, + }, { Name: "individualCookiePreferences", Description: "Support overriding cookie preferences per user", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 42a5f3807a6..859f1682f0d 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -59,6 +59,7 @@ alertingNoNormalState,beta,@grafana/alerting-squad,false,false,false,false logsSampleInExplore,stable,@grafana/observability-logs,false,false,false,true logsContextDatasourceUi,alpha,@grafana/observability-logs,false,false,false,true lokiQuerySplitting,alpha,@grafana/observability-logs,false,false,false,true +lokiQuerySplittingConfig,alpha,@grafana/observability-logs,false,false,false,true individualCookiePreferences,alpha,@grafana/backend-platform,false,false,false,false drawerDataSourcePicker,alpha,@grafana/grafana-bi-squad,false,false,false,true traceqlSearch,alpha,@grafana/observability-traces-and-profiling,false,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 51b4e7bd441..032ec763204 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -247,6 +247,10 @@ const ( // Split large interval queries into subqueries with smaller time intervals FlagLokiQuerySplitting = "lokiQuerySplitting" + // FlagLokiQuerySplittingConfig + // Give users the option to configure split durations for Loki queries + FlagLokiQuerySplittingConfig = "lokiQuerySplittingConfig" + // FlagIndividualCookiePreferences // Support overriding cookie preferences per user FlagIndividualCookiePreferences = "individualCookiePreferences" diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx index 150ea3a11bb..99a9bd9c45a 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx @@ -110,7 +110,7 @@ export const LokiQueryBuilderOptions = React.memo( aria-label="Select resolution" /> - {config.featureToggles.lokiQuerySplitting && ( + {config.featureToggles.lokiQuerySplittingConfig && config.featureToggles.lokiQuerySplitting && (