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 1eddc8ff05b..515eaccdf66 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -32,7 +32,6 @@ Some features are enabled by default. You can disable these feature by setting t | `accessTokenExpirationCheck` | Enable OAuth access_token expiration check and token refresh using the refresh_token | | | `emptyDashboardPage` | Enable the redesigned user interface of a dashboard page that includes no panels | Yes | | `disablePrometheusExemplarSampling` | Disable Prometheus exemplar sampling | | -| `logsSampleInExplore` | Enables access to the logs sample feature in Explore | Yes | | `logsContextDatasourceUi` | Allow datasource to provide custom UI for context view | Yes | | `lokiQuerySplitting` | Split large interval queries into subqueries with smaller time intervals | Yes | | `prometheusMetricEncyclopedia` | Adds the metrics explorer component to the Prometheus query builder as an option in metric select | Yes | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index e3166e1b322..a4f7361fbef 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -60,7 +60,6 @@ export interface FeatureToggles { alertingBacktesting?: boolean; editPanelCSVDragAndDrop?: boolean; alertingNoNormalState?: boolean; - logsSampleInExplore?: boolean; logsContextDatasourceUi?: boolean; lokiQuerySplitting?: boolean; lokiQuerySplittingConfig?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 7131f8699f4..306fd313ac5 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -285,15 +285,6 @@ var ( RequiresRestart: false, Owner: grafanaAlertingSquad, }, - { - - Name: "logsSampleInExplore", - Description: "Enables access to the logs sample feature in Explore", - Stage: FeatureStageGeneralAvailability, - Expression: "true", // turned on by default - FrontendOnly: true, - Owner: grafanaObservabilityLogsSquad, - }, { Name: "logsContextDatasourceUi", Description: "Allow datasource to provide custom UI for context view", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 72e5973ea6d..8effd2e6b60 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -41,7 +41,6 @@ disablePrometheusExemplarSampling,GA,@grafana/observability-metrics,false,false, alertingBacktesting,experimental,@grafana/alerting-squad,false,false,false,false editPanelCSVDragAndDrop,experimental,@grafana/grafana-bi-squad,false,false,false,true alertingNoNormalState,preview,@grafana/alerting-squad,false,false,false,false -logsSampleInExplore,GA,@grafana/observability-logs,false,false,false,true logsContextDatasourceUi,GA,@grafana/observability-logs,false,false,false,true lokiQuerySplitting,GA,@grafana/observability-logs,false,false,false,true lokiQuerySplittingConfig,experimental,@grafana/observability-logs,false,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index cad80dbaee9..ea6033b3d8e 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -175,10 +175,6 @@ const ( // Stop maintaining state of alerts that are not firing FlagAlertingNoNormalState = "alertingNoNormalState" - // FlagLogsSampleInExplore - // Enables access to the logs sample feature in Explore - FlagLogsSampleInExplore = "logsSampleInExplore" - // FlagLogsContextDatasourceUi // Allow datasource to provide custom UI for context view FlagLogsContextDatasourceUi = "logsContextDatasourceUi" diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx index 47d9c7430c9..db0924b37fe 100644 --- a/public/app/features/explore/Explore.tsx +++ b/public/app/features/explore/Explore.tsx @@ -559,9 +559,7 @@ export class Explore extends React.PureComponent { {showNodeGraph && {this.renderNodeGraphPanel()}} {showFlameGraph && {this.renderFlameGraphPanel()}} {showTrace && {this.renderTraceViewPanel()}} - {config.featureToggles.logsSampleInExplore && showLogsSample && ( - {this.renderLogsSamplePanel()} - )} + {showLogsSample && {this.renderLogsSamplePanel()}} {showCustom && {this.renderCustom(width)}} {showNoData && {this.renderNoData()}}