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 3899a8dbd8f..d983bab54c1 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -136,7 +136,6 @@ Experimental features might be changed or removed without prior notice. | `dashboardEmbed` | Allow embedding dashboard for external use in Code editors | | `frontendSandboxMonitorOnly` | Enables monitor only in the plugin frontend sandbox (if enabled) | | `lokiFormatQuery` | Enables the ability to format Loki queries | -| `exploreScrollableLogsContainer` | Improves the scrolling behavior of logs in Explore | | `pluginsDynamicAngularDetectionPatterns` | Enables fetching Angular detection patterns for plugins from GCOM and fallback to hardcoded ones | | `vizAndWidgetSplit` | Split panels between visualizations and widgets | | `prometheusIncrementalQueryInstrumentation` | Adds RudderStack events to incremental queries | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index ed7e458f448..a5fd29e7768 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -88,7 +88,6 @@ export interface FeatureToggles { sqlDatasourceDatabaseSelection?: boolean; lokiFormatQuery?: boolean; cloudWatchLogsMonacoEditor?: boolean; - exploreScrollableLogsContainer?: boolean; recordedQueriesMulti?: boolean; pluginsDynamicAngularDetectionPatterns?: boolean; vizAndWidgetSplit?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index c3a0c32a4d8..be7308d1c47 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -523,13 +523,6 @@ var ( Owner: awsDatasourcesSquad, AllowSelfServe: true, }, - { - Name: "exploreScrollableLogsContainer", - Description: "Improves the scrolling behavior of logs in Explore", - Stage: FeatureStageExperimental, - FrontendOnly: true, - Owner: grafanaObservabilityLogsSquad, - }, { Name: "recordedQueriesMulti", Description: "Enables writing multiple items from a single query within Recorded Queries", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index a40f33824f7..9b224b77b81 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -69,7 +69,6 @@ frontendSandboxMonitorOnly,experimental,@grafana/plugins-platform-backend,false, sqlDatasourceDatabaseSelection,preview,@grafana/dataviz-squad,false,false,true lokiFormatQuery,experimental,@grafana/observability-logs,false,false,true cloudWatchLogsMonacoEditor,GA,@grafana/aws-datasources,false,false,true -exploreScrollableLogsContainer,experimental,@grafana/observability-logs,false,false,true recordedQueriesMulti,GA,@grafana/observability-metrics,false,false,false pluginsDynamicAngularDetectionPatterns,experimental,@grafana/plugins-platform-backend,false,false,false vizAndWidgetSplit,experimental,@grafana/dashboards-squad,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 0c297b42220..2e18559919f 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -287,10 +287,6 @@ const ( // Enables the Monaco editor for CloudWatch Logs queries FlagCloudWatchLogsMonacoEditor = "cloudWatchLogsMonacoEditor" - // FlagExploreScrollableLogsContainer - // Improves the scrolling behavior of logs in Explore - FlagExploreScrollableLogsContainer = "exploreScrollableLogsContainer" - // FlagRecordedQueriesMulti // Enables writing multiple items from a single query within Recorded Queries FlagRecordedQueriesMulti = "recordedQueriesMulti" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index e4724adb8a0..ea61f7f6bb5 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1420,7 +1420,8 @@ "metadata": { "name": "exploreScrollableLogsContainer", "resourceVersion": "1709648236447", - "creationTimestamp": "2024-03-05T14:17:16Z" + "creationTimestamp": "2024-03-05T14:17:16Z", + "deletionTimestamp": "2024-03-12T14:02:07Z" }, "spec": { "description": "Improves the scrolling behavior of logs in Explore", diff --git a/public/app/features/explore/Logs/LogsNavigation.tsx b/public/app/features/explore/Logs/LogsNavigation.tsx index 6257569baa7..b605f284a99 100644 --- a/public/app/features/explore/Logs/LogsNavigation.tsx +++ b/public/app/features/explore/Logs/LogsNavigation.tsx @@ -173,6 +173,11 @@ function LogsNavigation({ [changeTime, scrollToTopLogs] ); + const onScrollToTopClick = useCallback(() => { + reportInteraction('grafana_explore_logs_scroll_top_clicked'); + scrollToTopLogs(); + }, [scrollToTopLogs]); + return (
{!config.featureToggles.logsInfiniteScrolling && ( @@ -193,7 +198,7 @@ function LogsNavigation({ data-testid="scrollToTop" className={styles.scrollToTopButton} variant="secondary" - onClick={scrollToTopLogs} + onClick={onScrollToTopClick} title="Scroll to top" >