From 0139ac205d0182795ad6fa403ed35205c3481791 Mon Sep 17 00:00:00 2001 From: ismail simsek Date: Tue, 30 Jan 2024 17:00:04 +0100 Subject: [PATCH] Chore: Remove disablePrometheusExemplarSampling feature toggle (#81579) remove disablePrometheusExemplarSampling ft --- .../configure-grafana/feature-toggles/index.md | 1 - packages/grafana-data/src/types/featureToggles.gen.ts | 1 - pkg/services/featuremgmt/registry.go | 8 -------- pkg/services/featuremgmt/toggles_gen.csv | 1 - pkg/services/featuremgmt/toggles_gen.go | 4 ---- pkg/tsdb/prometheus/querydata/request.go | 6 +----- 6 files changed, 1 insertion(+), 20 deletions(-) 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 7e07af8be3c..0de434db4c1 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -31,7 +31,6 @@ Some features are enabled by default. You can disable these feature by setting t | `redshiftAsyncQueryDataSupport` | Enable async query data support for Redshift | Yes | | `athenaAsyncQueryDataSupport` | Enable async query data support for Athena | Yes | | `nestedFolderPicker` | Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle | Yes | -| `disablePrometheusExemplarSampling` | Disable Prometheus exemplar sampling | | | `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 37a910f6516..563c7c5c022 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -53,7 +53,6 @@ export interface FeatureToggles { accessControlOnCall?: boolean; nestedFolders?: boolean; nestedFolderPicker?: boolean; - disablePrometheusExemplarSampling?: boolean; alertingBacktesting?: boolean; editPanelCSVDragAndDrop?: boolean; alertingNoNormalState?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 592b63be015..4d1708ccae9 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -303,14 +303,6 @@ var ( AllowSelfServe: true, Created: time.Date(2023, time.July, 24, 12, 0, 0, 0, time.UTC), }, - { - Name: "disablePrometheusExemplarSampling", - Description: "Disable Prometheus exemplar sampling", - Stage: FeatureStageGeneralAvailability, - Owner: grafanaObservabilityMetricsSquad, - AllowSelfServe: true, - Created: time.Date(2022, time.December, 19, 12, 0, 0, 0, time.UTC), - }, { Name: "alertingBacktesting", Description: "Rule backtesting API for alerting", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 1eca0f60d70..ba6ec154042 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -34,7 +34,6 @@ mysqlAnsiQuotes,experimental,@grafana/backend-platform,2022-10-12,false,false,fa accessControlOnCall,preview,@grafana/identity-access-team,2022-10-19,false,false,false nestedFolders,preview,@grafana/backend-platform,2022-10-22,false,false,false nestedFolderPicker,GA,@grafana/grafana-frontend-platform,2023-07-24,false,false,true -disablePrometheusExemplarSampling,GA,@grafana/observability-metrics,2022-12-19,false,false,false alertingBacktesting,experimental,@grafana/alerting-squad,2022-10-20,false,false,false editPanelCSVDragAndDrop,experimental,@grafana/grafana-bi-squad,2022-12-20,false,false,true alertingNoNormalState,preview,@grafana/alerting-squad,2023-01-14,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index a216b07f23a..d39f724b71c 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -147,10 +147,6 @@ const ( // Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle FlagNestedFolderPicker = "nestedFolderPicker" - // FlagDisablePrometheusExemplarSampling - // Disable Prometheus exemplar sampling - FlagDisablePrometheusExemplarSampling = "disablePrometheusExemplarSampling" - // FlagAlertingBacktesting // Rule backtesting API for alerting FlagAlertingBacktesting = "alertingBacktesting" diff --git a/pkg/tsdb/prometheus/querydata/request.go b/pkg/tsdb/prometheus/querydata/request.go index 455fdbb6bed..c35bede0815 100644 --- a/pkg/tsdb/prometheus/querydata/request.go +++ b/pkg/tsdb/prometheus/querydata/request.go @@ -75,10 +75,6 @@ func New( // standard deviation sampler is the default for backwards compatibility exemplarSampler := exemplar.NewStandardDeviationSampler - if features.IsEnabledGlobally(featuremgmt.FlagDisablePrometheusExemplarSampling) { - exemplarSampler = exemplar.NewNoOpSampler - } - return &QueryData{ intervalCalculator: intervalv2.NewCalculator(), tracer: tracing.DefaultTracer(), @@ -87,8 +83,8 @@ func New( TimeInterval: timeInterval, ID: settings.ID, URL: settings.URL, - enableDataplane: features.IsEnabledGlobally(featuremgmt.FlagPrometheusDataplane), exemplarSampler: exemplarSampler, + enableDataplane: features.IsEnabledGlobally(featuremgmt.FlagPrometheusDataplane), enableScope: features.IsEnabledGlobally(featuremgmt.FlagPromQLScope), }, nil }