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 277e85dbc7c..eabcc7b9a1d 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 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `logsContextDatasourceUi` | Allow datasource to provide custom UI for context view | Yes | | `lokiQuerySplitting` | Split large interval queries into subqueries with smaller time intervals | Yes | | `influxdbBackendMigration` | Query InfluxDB InfluxQL without the proxy | Yes | -| `dataplaneFrontendFallback` | Support dataplane contract field name change for transformations and field name matchers where the name is different | Yes | | `unifiedRequestLog` | Writes error logs to the request logger | Yes | | `logsExploreTableVisualisation` | A table visualisation for logs in Explore | Yes | | `awsDatasourcesTempCredentials` | Support temporary security credentials in AWS plugins for Grafana Cloud customers | Yes | diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts b/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts index a8259b226d9..9b0342fef40 100644 --- a/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts +++ b/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts @@ -1,19 +1,10 @@ import { toDataFrame } from '../../dataframe/processDataFrame'; -import { BootData } from '../../types/config'; import { DataFrame, FieldType } from '../../types/dataFrame'; import { getFieldMatcher } from '../matchers'; import { FieldMatcherID } from './ids'; import { ByNamesMatcherMode } from './nameMatcher'; -window.grafanaBootData = { - settings: { - featureToggles: { - dataplaneFrontendFallback: true, - }, - }, -} as BootData; - describe('Field Name by Regexp Matcher', () => { it('Match all with wildcard regex', () => { const seriesWithNames = toDataFrame({ diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts b/packages/grafana-data/src/transformations/matchers/nameMatcher.ts index 5a344ed4abd..142c8090e7a 100644 --- a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts +++ b/packages/grafana-data/src/transformations/matchers/nameMatcher.ts @@ -107,22 +107,17 @@ const multipleFieldNamesMatcher: FieldMatcherInfo = { export function fieldNameFallback(fields: Set) { let fallback: FieldMatcher | undefined = undefined; - // grafana-data does not have access to runtime so we are accessing the window object - // to get access to the feature toggle - const useMatcherFallback = window.grafanaBootData?.settings?.featureToggles?.dataplaneFrontendFallback; - if (useMatcherFallback) { - if (fields.has(TIME_SERIES_VALUE_FIELD_NAME)) { - fallback = (field: Field, frame: DataFrame) => { - return ( - Boolean(field.labels) && // Value was reasonable when the name was set in labels or on the frame - field.labels?.__name__ === field.name - ); - }; - } else if (fields.has('Time') || fields.has('time')) { - fallback = (field: Field, frame: DataFrame) => { - return frame.meta?.typeVersion == null && field.type === FieldType.time; - }; - } + if (fields.has(TIME_SERIES_VALUE_FIELD_NAME)) { + fallback = (field: Field, frame: DataFrame) => { + return ( + Boolean(field.labels) && // Value was reasonable when the name was set in labels or on the frame + field.labels?.__name__ === field.name + ); + }; + } else if (fields.has('Time') || fields.has('time')) { + fallback = (field: Field, frame: DataFrame) => { + return frame.meta?.typeVersion == null && field.type === FieldType.time; + }; } return fallback; diff --git a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts index 4e388bf3257..8281ecc46aa 100644 --- a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts +++ b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts @@ -1,6 +1,5 @@ import { map } from 'rxjs/operators'; -import { getFieldDisplayName } from '../../field/fieldState'; import { DataFrame, Field, FieldType } from '../../types/dataFrame'; import { SpecialValue, @@ -26,10 +25,6 @@ const DEFAULT_ROW_FIELD = 'Time'; const DEFAULT_VALUE_FIELD = 'Value'; const DEFAULT_EMPTY_VALUE = SpecialValue.Empty; -// grafana-data does not have access to runtime so we are accessing the window object -// to get access to the feature toggle -const supportDataplaneFallback = window.grafanaBootData?.settings?.featureToggles?.dataplaneFrontendFallback; - export const groupingToMatrixTransformer: DataTransformerInfo = { id: DataTransformerID.groupingToMatrix, name: 'Grouping to Matrix', @@ -125,7 +120,7 @@ export const groupingToMatrixTransformer: DataTransformerInfo