From 3fff17af6383f52ddc40835d19fa9c3e281285ff Mon Sep 17 00:00:00 2001 From: Connor Lindsey Date: Wed, 1 Jun 2022 11:32:10 -0600 Subject: [PATCH] Tempo: Consider tempo search out of beta and remove beta badge and feature flags (#50030) * Tempo: Remove beta notice and feature flag for search * remove unused imports --- docs/sources/datasources/tempo.md | 8 ++----- .../src/types/featureToggles.gen.ts | 2 -- pkg/services/featuremgmt/registry.go | 11 ---------- pkg/services/featuremgmt/toggles_gen.go | 8 ------- .../tempo/QueryEditor/QueryField.tsx | 21 +++---------------- .../tempo/configuration/ConfigEditor.tsx | 8 +++---- .../plugins/datasource/tempo/datasource.ts | 5 +---- 7 files changed, 9 insertions(+), 54 deletions(-) diff --git a/docs/sources/datasources/tempo.md b/docs/sources/datasources/tempo.md index dec1bcea2f0..9344f3a80dd 100644 --- a/docs/sources/datasources/tempo.md +++ b/docs/sources/datasources/tempo.md @@ -96,15 +96,11 @@ Tempo search is an experimental feature behind a feature toggle. Use this to sea #### Search recent traces -Tempo allows you to search recent traces held in the ingesters. By default, ingesters store the last 15 minutes of tracing data, and this search is disabled. Enable this search capability by setting the `tempoSearch` feature toggle. - -You must also configure your Tempo data source to use this feature. Refer to the [Tempo documentation](https://grafana.com/docs/tempo/latest/getting-started/tempo-in-grafana/#search-of-recent-traces). +Tempo allows you to search recent traces held in the ingesters. By default, ingesters store the last 15 minutes of tracing data. You must configure your Tempo data source to use this feature. Refer to the [Tempo documentation](https://grafana.com/docs/tempo/latest/getting-started/tempo-in-grafana/#search-of-recent-traces). #### Search backend datastore -Tempo includes the ability to search the entire backend datastore. You can enable this capability by setting the `tempoSearch` and `tempoBackendSearch` feature toggles. - -You must also configure your Tempo data source to use this feature.Refer to the [Tempo documentation](https://grafana.com/docs/tempo/latest/getting-started/tempo-in-grafana/#search-of-the-backend-datastore). +Tempo includes the ability to search the entire backend datastore. You must configure your Tempo data source to use this feature. Refer to the [Tempo documentation](https://grafana.com/docs/tempo/latest/getting-started/tempo-in-grafana/#search-of-the-backend-datastore). ### Loki search diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 04852a1e3a8..50c39817538 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -27,8 +27,6 @@ export interface FeatureToggles { ['live-service-web-worker']?: boolean; queryOverLive?: boolean; panelTitleSearch?: boolean; - tempoSearch?: boolean; - tempoBackendSearch?: boolean; tempoServiceGraph?: boolean; lokiBackendMode?: boolean; prometheus_azure_auth?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 087229fec4a..e3884fd22f6 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -66,17 +66,6 @@ var ( Description: "Search for dashboards using panel title", State: FeatureStateAlpha, }, - { - Name: "tempoSearch", - Description: "Enable searching in tempo datasources", - State: FeatureStateBeta, - FrontendOnly: true, - }, - { - Name: "tempoBackendSearch", - Description: "Use backend for tempo search", - State: FeatureStateBeta, - }, { Name: "tempoServiceGraph", Description: "show service", diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 32defa0202f..6a995bf56d9 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -51,14 +51,6 @@ const ( // Search for dashboards using panel title FlagPanelTitleSearch = "panelTitleSearch" - // FlagTempoSearch - // Enable searching in tempo datasources - FlagTempoSearch = "tempoSearch" - - // FlagTempoBackendSearch - // Use backend for tempo search - FlagTempoBackendSearch = "tempoBackendSearch" - // FlagTempoServiceGraph // show service FlagTempoServiceGraph = "tempoServiceGraph" diff --git a/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx b/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx index fe226fcb6ff..54dca766bc9 100644 --- a/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx +++ b/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx @@ -5,7 +5,6 @@ import useAsync from 'react-use/lib/useAsync'; import { QueryEditorProps, SelectableValue } from '@grafana/data'; import { config, reportInteraction } from '@grafana/runtime'; import { - Badge, FileDropzone, InlineField, InlineFieldRow, @@ -82,12 +81,12 @@ class TempoQueryFieldComponent extends React.PureComponent { queryTypeOptions.push({ value: 'serviceMap', label: 'Service Graph' }); } - if (config.featureToggles.tempoSearch && !datasource?.search?.hide) { - queryTypeOptions.unshift({ value: 'nativeSearch', label: 'Search - Beta' }); + if (!datasource?.search?.hide) { + queryTypeOptions.unshift({ value: 'nativeSearch', label: 'Search' }); } if (logsDatasourceUid) { - if (!config.featureToggles.tempoSearch) { + if (datasource?.search?.hide) { // Place at beginning as Search if no native search queryTypeOptions.unshift({ value: 'search', label: 'Search' }); } else { @@ -122,20 +121,6 @@ class TempoQueryFieldComponent extends React.PureComponent { /> - {query.queryType === 'nativeSearch' && ( -
- - {config.featureToggles.tempoBackendSearch ? ( - <> Tempo search is currently in beta. - ) : ( - <> -  Tempo search is currently in beta and is designed to return recent traces only. It ignores the - time range picker. We are actively working on full backend search. Look for improvements in the near - future! - - )} -
- )} {query.queryType === 'search' && ( = ({ options, onOptionsChange }) => { )} - {config.featureToggles.tempoSearch && ( -
- -
- )} +
+ +
diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts index 2ee50f259bf..9d65db82183 100644 --- a/public/app/plugins/datasource/tempo/datasource.ts +++ b/public/app/plugins/datasource/tempo/datasource.ts @@ -14,7 +14,6 @@ import { ScopedVars, } from '@grafana/data'; import { - config, BackendSrvRequest, DataSourceWithBackend, getBackendSrv, @@ -169,9 +168,7 @@ export class TempoDatasource extends DataSourceWithBackend