diff --git a/.betterer.results b/.betterer.results index 21a1127350f..02f138aeec2 100644 --- a/.betterer.results +++ b/.betterer.results @@ -431,9 +431,6 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "1"], [0, 0, 0, "Do not use any type assertions.", "2"] ], - "packages/grafana-data/src/types/logsVolume.ts:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"] - ], "packages/grafana-data/src/types/options.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"] diff --git a/packages/grafana-data/src/types/index.ts b/packages/grafana-data/src/types/index.ts index 6bf12f650b8..67657309dd6 100644 --- a/packages/grafana-data/src/types/index.ts +++ b/packages/grafana-data/src/types/index.ts @@ -7,7 +7,6 @@ export * from './dashboard'; export * from './query'; export * from './annotations'; export * from './logs'; -export * from './logsVolume'; export * from './navModel'; export * from './select'; export * from './time'; diff --git a/packages/grafana-data/src/types/logsVolume.ts b/packages/grafana-data/src/types/logsVolume.ts deleted file mode 100644 index 273a53e91ce..00000000000 --- a/packages/grafana-data/src/types/logsVolume.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { Observable } from 'rxjs'; - -import { DataQueryRequest, DataQueryResponse } from './datasource'; -import { DataQuery } from './query'; - -/** - * Support for DataSourceWithLogsVolumeSupport is deprecated and will be removed in the next major version. - * Use DataSourceWithSupplementaryQueriesSupport instead. - * - * @deprecated - */ -export interface DataSourceWithLogsVolumeSupport { - getLogsVolumeDataProvider(request: DataQueryRequest): Observable | undefined; -} - -/** - * Support for hasLogsVolumeSupport is deprecated and will be removed in the next major version. - * Use DataSourceWithSupplementaryQueriesSupport and hasSupplementaryQuerySupport instead. - * - * @deprecated - */ -export const hasLogsVolumeSupport = ( - datasource: unknown -): datasource is DataSourceWithLogsVolumeSupport => { - return (datasource as DataSourceWithLogsVolumeSupport).getLogsVolumeDataProvider !== undefined; -}; diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts index 961eb74c0c3..ce92375a47d 100644 --- a/public/app/features/explore/state/query.ts +++ b/public/app/features/explore/state/query.ts @@ -10,7 +10,6 @@ import { DataQueryErrorType, DataQueryResponse, DataSourceApi, - hasLogsVolumeSupport, hasQueryExportSupport, hasQueryImportSupport, HistoryItem, @@ -630,27 +629,6 @@ export const runQueries = ( }) ); - if (!canReuseSupplementaryQueryData(supplementaryQueries[type].data, queries, absoluteRange)) { - dispatch(cleanSupplementaryQueryAction({ exploreId, type })); - if (supplementaryQueries[type].enabled) { - dispatch(loadSupplementaryQueryData(exploreId, type)); - } - } - // Code below (else if scenario) is for backward compatibility with data sources that don't support supplementary queries - // TODO: Remove in next major version - v10 (https://github.com/grafana/grafana/issues/61845) - } else if (hasLogsVolumeSupport(datasourceInstance) && type === SupplementaryQueryType.LogsVolume) { - const dataProvider = datasourceInstance.getLogsVolumeDataProvider({ - ...transaction.request, - requestId: `${transaction.request.requestId}_${snakeCase(type)}`, - }); - dispatch( - storeSupplementaryQueryDataProviderAction({ - exploreId, - type, - dataProvider, - }) - ); - if (!canReuseSupplementaryQueryData(supplementaryQueries[type].data, queries, absoluteRange)) { dispatch(cleanSupplementaryQueryAction({ exploreId, type })); if (supplementaryQueries[type].enabled) {