From 4b7479bd8ead10b42af0e66de5d474cb43d9e153 Mon Sep 17 00:00:00 2001 From: Matias Chomicki Date: Fri, 27 Oct 2023 11:54:01 +0200 Subject: [PATCH] toggleLabelsInLogsUI: remove flag --- .../feature-toggles/index.md | 1 - .../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 ---- public/app/features/explore/Explore.tsx | 7 ++----- .../logs/components/LogDetailsRow.tsx | 20 +++++++------------ 7 files changed, 9 insertions(+), 33 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 7e091a115e2..8ccd3dbb81e 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -48,7 +48,6 @@ Some features are enabled by default. You can disable these feature by setting t | `cloudWatchLogsMonacoEditor` | Enables the Monaco editor for CloudWatch Logs queries | Yes | | `recordedQueriesMulti` | Enables writing multiple items from a single query within Recorded Queries | Yes | | `transformationsRedesign` | Enables the transformations redesign | Yes | -| `toggleLabelsInLogsUI` | Enable toggleable filters in log details view | Yes | | `azureMonitorDataplane` | Adds dataplane compliant frame metadata in the Azure Monitor datasource | Yes | | `prometheusConfigOverhaulAuth` | Update the Prometheus configuration page with the new auth component | Yes | | `dashgpt` | Enable AI powered features in dashboards | Yes | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 8d905e8bfc1..1290d6503bb 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -103,7 +103,6 @@ export interface FeatureToggles { logsExploreTableVisualisation?: boolean; awsDatasourcesTempCredentials?: boolean; transformationsRedesign?: boolean; - toggleLabelsInLogsUI?: boolean; mlExpressions?: boolean; traceQLStreaming?: boolean; metricsSummary?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index d12d46d9dfe..89341a7077d 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -589,14 +589,6 @@ var ( Expression: "true", // enabled by default Owner: grafanaObservabilityMetricsSquad, }, - { - Name: "toggleLabelsInLogsUI", - Description: "Enable toggleable filters in log details view", - Stage: FeatureStageGeneralAvailability, - FrontendOnly: true, - Expression: "true", // enabled by default - Owner: grafanaObservabilityLogsSquad, - }, { Name: "mlExpressions", Description: "Enable support for Machine Learning in server-side expressions", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index d94647febe3..00a269375c3 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -84,7 +84,6 @@ prometheusIncrementalQueryInstrumentation,experimental,@grafana/observability-me logsExploreTableVisualisation,experimental,@grafana/observability-logs,false,false,false,true awsDatasourcesTempCredentials,experimental,@grafana/aws-datasources,false,false,false,false transformationsRedesign,GA,@grafana/observability-metrics,false,false,false,true -toggleLabelsInLogsUI,GA,@grafana/observability-logs,false,false,false,true mlExpressions,experimental,@grafana/alerting-squad,false,false,false,false traceQLStreaming,experimental,@grafana/observability-traces-and-profiling,false,false,false,true metricsSummary,experimental,@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 7cdc48e682a..304b9a8dfe1 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -347,10 +347,6 @@ const ( // Enables the transformations redesign FlagTransformationsRedesign = "transformationsRedesign" - // FlagToggleLabelsInLogsUI - // Enable toggleable filters in log details view - FlagToggleLabelsInLogsUI = "toggleLabelsInLogsUI" - // FlagMlExpressions // Enable support for Machine Learning in server-side expressions FlagMlExpressions = "mlExpressions" diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx index 1fca13ba665..158f03d030d 100644 --- a/public/app/features/explore/Explore.tsx +++ b/public/app/features/explore/Explore.tsx @@ -205,10 +205,7 @@ export class Explore extends React.PureComponent { * TODO: In the future, we would like to return active filters based the query that produced the log line. * @alpha */ - isFilterLabelActive = async (key: string, value: string, refId?: string) => { - if (!config.featureToggles.toggleLabelsInLogsUI) { - return false; - } + isFilterLabelActive = async (key: string, value: string, refId: string) => { const query = this.props.queries.find((q) => q.refId === refId); if (!query) { return false; @@ -254,7 +251,7 @@ export class Explore extends React.PureComponent { return query; } const ds = await getDataSourceSrv().get(datasource); - if (hasToggleableQueryFiltersSupport(ds) && config.featureToggles.toggleLabelsInLogsUI) { + if (hasToggleableQueryFiltersSupport(ds)) { return ds.toggleQueryFilter(query, { type: modification.type === 'ADD_FILTER' ? 'FILTER_FOR' : 'FILTER_OUT', options: modification.options ?? {}, diff --git a/public/app/features/logs/components/LogDetailsRow.tsx b/public/app/features/logs/components/LogDetailsRow.tsx index 210b1fc71d3..5c4ac1aae8b 100644 --- a/public/app/features/logs/components/LogDetailsRow.tsx +++ b/public/app/features/logs/components/LogDetailsRow.tsx @@ -257,8 +257,7 @@ class UnThemedLogDetailsRow extends PureComponent { const singleKey = parsedKeys == null ? false : parsedKeys.length === 1; const singleVal = parsedValues == null ? false : parsedValues.length === 1; const hasFilteringFunctionality = !disableActions && onClickFilterLabel && onClickFilterOutLabel; - const refIdTooltip = - config.featureToggles.toggleLabelsInLogsUI && row.dataFrame?.refId ? ` in query ${row.dataFrame?.refId}` : ''; + const refIdTooltip = ` in query ${row.dataFrame?.refId}`; const isMultiParsedValueWithNoContent = !singleVal && parsedValues != null && !parsedValues.every((val) => val === ''); @@ -277,17 +276,12 @@ class UnThemedLogDetailsRow extends PureComponent {
{hasFilteringFunctionality && ( <> - {config.featureToggles.toggleLabelsInLogsUI ? ( - // If we are using the new label toggling, we want to use the async icon button - - ) : ( - - )} +