From 26ba7ab5986ceda89c5d926e7e7cf40ca1bd46eb Mon Sep 17 00:00:00 2001 From: Andrej Ocenas Date: Thu, 1 Oct 2020 15:41:05 +0200 Subject: [PATCH] Chore: Remove loki version hack in explore (#27966) --- packages/grafana-data/src/types/datasource.ts | 1 + public/app/core/utils/explore.ts | 2 +- .../app/features/explore/state/actionTypes.ts | 1 - public/app/features/explore/state/actions.ts | 2 - .../features/explore/state/reducers.test.ts | 2 - public/app/features/explore/state/reducers.ts | 49 +------------------ public/app/types/explore.ts | 3 -- 7 files changed, 4 insertions(+), 56 deletions(-) diff --git a/packages/grafana-data/src/types/datasource.ts b/packages/grafana-data/src/types/datasource.ts index dbac4ef74a4..4b7f6d529d6 100644 --- a/packages/grafana-data/src/types/datasource.ts +++ b/packages/grafana-data/src/types/datasource.ts @@ -331,6 +331,7 @@ export enum DataSourceStatus { Disconnected, } +// TODO: not really needed but used as type in some data sources and in DataQueryRequest export enum ExploreMode { Logs = 'Logs', Metrics = 'Metrics', diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts index 3022c9a4852..b801ba3453d 100644 --- a/public/app/core/utils/explore.ts +++ b/public/app/core/utils/explore.ts @@ -155,7 +155,7 @@ export function buildQueryTransaction( __interval_ms: { text: intervalMs, value: intervalMs }, }, maxDataPoints: queryOptions.maxDataPoints, - exploreMode: queryOptions.mode, + exploreMode: undefined, liveStreaming: queryOptions.liveStreaming, /** * @deprecated (external API) showingGraph and showingTable are always set to true and set to true diff --git a/public/app/features/explore/state/actionTypes.ts b/public/app/features/explore/state/actionTypes.ts index 0115e9e5f4c..dcdc6673f63 100644 --- a/public/app/features/explore/state/actionTypes.ts +++ b/public/app/features/explore/state/actionTypes.ts @@ -128,7 +128,6 @@ export interface SyncTimesPayload { export interface UpdateDatasourceInstancePayload { exploreId: ExploreId; datasourceInstance: DataSourceApi; - version?: string; } export interface ToggleLogLevelPayload { diff --git a/public/app/features/explore/state/actions.ts b/public/app/features/explore/state/actions.ts index a04a6349292..aa4f3e2dca6 100644 --- a/public/app/features/explore/state/actions.ts +++ b/public/app/features/explore/state/actions.ts @@ -123,13 +123,11 @@ export function changeDatasource( const currentDataSourceInstance = getState().explore[exploreId].datasourceInstance; const queries = getState().explore[exploreId].queries; const orgId = getState().user.orgId; - const datasourceVersion = newDataSourceInstance.getVersion && (await newDataSourceInstance.getVersion()); dispatch( updateDatasourceInstanceAction({ exploreId, datasourceInstance: newDataSourceInstance, - version: datasourceVersion, }) ); diff --git a/public/app/features/explore/state/reducers.test.ts b/public/app/features/explore/state/reducers.test.ts index 8a26485b8a0..af8b80bb551 100644 --- a/public/app/features/explore/state/reducers.test.ts +++ b/public/app/features/explore/state/reducers.test.ts @@ -2,7 +2,6 @@ import { DataQuery, DataSourceApi, dateTime, - ExploreMode, LoadingState, RawTimeRange, UrlQueryMap, @@ -99,7 +98,6 @@ describe('Explore item reducer', () => { graphResult: null, logsResult: null, tableResult: null, - supportedModes: [ExploreMode.Metrics, ExploreMode.Logs], latency: 0, loading: false, queryResponse: createEmptyQueryResponse(), diff --git a/public/app/features/explore/state/reducers.ts b/public/app/features/explore/state/reducers.ts index b34e5f3da1f..e1ec97a10d9 100644 --- a/public/app/features/explore/state/reducers.ts +++ b/public/app/features/explore/state/reducers.ts @@ -3,14 +3,12 @@ import { AnyAction } from 'redux'; import { PayloadAction } from '@reduxjs/toolkit'; import { DataQuery, - DataSourceApi, DefaultTimeRange, LoadingState, PanelData, PanelEvents, TimeZone, toLegacyResponseData, - ExploreMode, LogsDedupStrategy, sortLogsResult, DataQueryErrorType, @@ -107,7 +105,6 @@ export const makeExploreItemState = (): ExploreItemState => ({ urlState: null, update: makeInitialUpdateState(), latency: 0, - supportedModes: [], isLive: false, isPaused: false, urlReplaced: false, @@ -259,33 +256,14 @@ export const itemReducer = (state: ExploreItemState = makeExploreItemState(), ac } if (updateDatasourceInstanceAction.match(action)) { - const { datasourceInstance, version } = action.payload; + const { datasourceInstance } = action.payload; // Custom components stopQueryState(state.querySubscription); - let newMetadata = datasourceInstance.meta; - - // HACK: Temporary hack for Loki datasource. Can remove when plugin.json structure is changed. - if (version && version.length && datasourceInstance.meta.name === 'Loki') { - const lokiVersionMetadata: Record = { - v0: { - metrics: false, - }, - - v1: { - metrics: true, - }, - }; - newMetadata = { ...newMetadata, ...lokiVersionMetadata[version] }; - } - - const updatedDatasourceInstance = Object.assign(datasourceInstance, { meta: newMetadata }); - const supportedModes = getModesForDatasource(updatedDatasourceInstance); - return { ...state, - datasourceInstance: updatedDatasourceInstance, + datasourceInstance, graphResult: null, tableResult: null, logsResult: null, @@ -293,7 +271,6 @@ export const itemReducer = (state: ExploreItemState = makeExploreItemState(), ac queryResponse: createEmptyQueryResponse(), loading: false, queryKeys: [], - supportedModes, originPanelId: state.urlState && state.urlState.originPanelId, }; } @@ -588,28 +565,6 @@ export const updateChildRefreshState = ( }; }; -const getModesForDatasource = (dataSource: DataSourceApi): ExploreMode[] => { - const supportsGraph = dataSource.meta.metrics; - const supportsLogs = dataSource.meta.logs; - const supportsTracing = dataSource.meta.tracing; - - const supportedModes: ExploreMode[] = []; - - if (supportsGraph) { - supportedModes.push(ExploreMode.Metrics); - } - - if (supportsLogs) { - supportedModes.push(ExploreMode.Logs); - } - - if (supportsTracing) { - supportedModes.push(ExploreMode.Tracing); - } - - return supportedModes; -}; - /** * Global Explore reducer that handles multiple Explore areas (left and right). * Actions that have an `exploreId` get routed to the ExploreItemReducer. diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts index 940b837bdbe..92ecf1456a5 100644 --- a/public/app/types/explore.ts +++ b/public/app/types/explore.ts @@ -14,7 +14,6 @@ import { AbsoluteTimeRange, GraphSeriesXY, DataFrame, - ExploreMode, ExploreUrlState, } from '@grafana/data'; @@ -157,7 +156,6 @@ export interface ExploreItemState { update: ExploreUpdateState; latency: number; - supportedModes: ExploreMode[]; /** * If true, the view is in live tailing mode. @@ -197,7 +195,6 @@ export interface QueryOptions { minInterval?: string; maxDataPoints?: number; liveStreaming?: boolean; - mode?: ExploreMode; } export interface QueryTransaction {